Merge pull request #6 from Ebubeker/main

feat: changed the filtering endpoint to the one we have online
goat-community · Sep 14, 2023 · a3f7453 · a3f7453
2 parents 0f15911 + a0790af
commit a3f7453
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/apps/goat/app/api/map/filtering/layer/get-feature-keys/[layer_id]/route.ts b/apps/goat/app/api/map/filtering/layer/get-feature-keys/[layer_id]/route.ts
@@ -1,12 +1,11 @@
 import { NextResponse } from "next/server";
-
-const url = "http://127.0.0.1:8080";
+import { GET_FEATURE_PROPERTY_KEYS } from "@/lib/api/apiConstants";
 
 export async function GET(request: Request) {
   const layer_id = request.url.slice(request.url.lastIndexOf("/") + 1);
-  console.log(layer_id);
+
   try {
-    const res = await fetch(`${url}/collections/${layer_id}/queryables`);
+    const res = await fetch(GET_FEATURE_PROPERTY_KEYS(layer_id));
 
     const keys = await res.json();
 

diff --git a/apps/goat/components/map/Layers.tsx b/apps/goat/components/map/Layers.tsx
@@ -7,6 +7,7 @@ import { FILTERING } from "@/lib/api/apiConstants";
 import { and_operator, or_operator } from "@/lib/utils/filtering_cql";
 import type { LayerProps } from "react-map-gl";
 import { v4 } from "uuid";
+import { GET_NON_FILTERED_LAYER } from "@/lib/api/apiConstants";
 
 interface LayersProps {
   layers: XYZ_Layer[];
@@ -49,8 +50,7 @@ const Layers = (props: LayersProps) => {
       addLayer([
         {
           id: "layer1",
-          sourceUrl:
-            "http://127.0.0.1:8080/collections/user_data.8c4ad0c86a2d4e60b42ad6fb8760a76e/tiles/{z}/{x}/{y}",
+          sourceUrl: GET_NON_FILTERED_LAYER(sampleLayerID),
           color: "#FF0000",
         },
       ]);

diff --git a/apps/goat/lib/api/apiConstants.ts b/apps/goat/lib/api/apiConstants.ts
@@ -8,4 +8,6 @@ export const API = {
   project: "api/v2/content/project",
 };
 // export const FILTERING = "http://localhost:3000/api/map/filtering/layer/";
-export const FILTERING = (layer_id: string) => `http://127.0.0.1:8080/collections/${layer_id}/tiles/{z}/{x}/{y}`;
+export const FILTERING = (layer_id: string) => `https://geoapi.goat.dev.plan4better.de/collections/${layer_id}/tiles/{z}/{x}/{y}`;
+export const GET_FEATURE_PROPERTY_KEYS = (layer_id: string) => `https://geoapi.goat.dev.plan4better.de/collections/${layer_id}/queryables`
+export const GET_NON_FILTERED_LAYER = (layer_id: string) => `https://geoapi.goat.dev.plan4better.de/collections/${layer_id}/tiles/{z}/{x}/{y}`