Merge pull request #158 from openkfw/157-geodata-route

157 geodata route
openkfw · Oct 11, 2022 · 32dd16b · 32dd16b
2 parents 20044c5 + 1e1ccff
commit 32dd16b
Show file tree

Hide file tree

Showing 27 changed files with 356 additions and 125 deletions.
diff --git a/api/src/actions/isochrones.ts b/api/src/actions/isochrones.ts
@@ -13,17 +13,19 @@ export const getIsochronesByPointsSource = async (pointsSource: string, bottomLe
     // const pointStrings = points.map((point) => JSON.stringify(point));
     const isochrones = await getIsochronesByCoordinates(true);
     const isochroneFeatures = [];
-    isochrones.forEach((item) => {
-      item.features.forEach((feature) => {
-        const enhancedFeature = {
-          type: feature.type,
-          geometry: feature.geometry,
-          properties: feature.properties,
-          id: `${item._id}-${feature.properties.value}`,
-        };
-        isochroneFeatures.push(enhancedFeature);
+    if (isochrones && isochrones.length) {
+      isochrones.forEach((item) => {
+        item.features.forEach((feature) => {
+          const enhancedFeature = {
+            type: feature.type,
+            geometry: feature.geometry,
+            properties: feature.properties,
+            id: `${item._id}-${feature.properties.value}`,
+          };
+          isochroneFeatures.push(enhancedFeature);
+        });
       });
-    });
+    }
     return isochroneFeatures;
   }
   throw new APIError(`pointsSource ${pointsSource} is not valid.`, 400, true);

diff --git a/api/src/database/postgis/filters.ts b/api/src/database/postgis/filters.ts
@@ -1,5 +1,7 @@
 import { getDb } from './index';
 import APIError from '../../helpers/APIError';
+import config from '../../config/config';
+import logger from '../../config/winston';
 
 /**
  * Return bounding box in GeoJSON format used for filtering
@@ -35,23 +37,23 @@ export const getBoundingBox = (bottomLeft: string, topRight: string) => {
 export const getProjectionFilter = async (proj, tableName, db = getDb()) => {
   // projection in query must correspond to SRID in geometry column
   if (proj) {
-    const SRIDarr = await db.distinct(db.raw(`ST_SRID(${tableName}.geometry)`)).from(tableName);
+    try {
+      const tableSRID = await db.select(db.raw(`Find_SRID('${config.postgresDb}', '${tableName}', 'geometry')`));
 
-    if (!SRIDarr.length) {
-      return;
-    }
-    const SRID = SRIDarr[0].st_srid;
-    const projNum = parseInt(proj.split(':')[1], 10);
+      const projNum = parseInt(proj.split(':')[1], 10);
 
-    if (SRID === projNum) {
-      return projNum;
+      if (tableSRID === projNum) {
+        return projNum;
+      }
+      throw new APIError(
+        `Projection SRID ${projNum} doesn't correspond to geometry column SRID ${tableSRID}`,
+        400,
+        true,
+        undefined,
+      );
+    } catch (err) {
+      logger.error(`Table ${tableName} is missing SRID`);
     }
-    throw new APIError(
-      `Projection SRID ${projNum} doesn't correspond to geometry column SRID ${SRID}`,
-      400,
-      true,
-      undefined,
-    );
   }
 };
 

diff --git a/api/src/database/postgis/models/geoDataModel.ts b/api/src/database/postgis/models/geoDataModel.ts
@@ -34,6 +34,10 @@ const getGeoData = async (
             JSON.stringify(filter.geometry),
           ]),
         );
+      } else if (filter.geometry) {
+        qb.andWhere(
+          db.raw(`ST_Intersects(geometry, ST_SetSRID(ST_GeomFromGeoJSON(?), 0))`, [JSON.stringify(filter.geometry)]),
+        );
       }
       if (Object.keys(properties).length) {
         Object.keys(properties).forEach((key) => {

diff --git a/api/src/database/postgis/models/layerModel.ts b/api/src/database/postgis/models/layerModel.ts
@@ -30,8 +30,8 @@ const getMapLayersWithGeoData = async (db = getDb()): Promise<Array<MapLayerWith
     .innerJoin(LAYER_GEO_DATA_TABLE, function () {
       this.on(`${MAP_LAYERS_TABLE}.geo_reference_id`, '=', `${LAYER_GEO_DATA_TABLE}.reference_id`);
     })
-    .innerJoin(ATTRIBUTES_TABLE, function () {
-      this.on(`${MAP_LAYERS_TABLE}.geo_reference_id`, '=', db.raw(`${ATTRIBUTES_TABLE}.geo_data->>'referenceId'`));
+    .leftJoin(ATTRIBUTES_TABLE, function () {
+      this.on(`${MAP_LAYERS_TABLE}.attribute_id`, '=', `${ATTRIBUTES_TABLE}.attribute_id`);
     })
     .distinct(`${MAP_LAYERS_TABLE}.reference_id`);