Get map layers with or without geodata (#77)

* Get map layers with or without geodata * Fix get map layers * Fix yarn audit * Fix test error * Fix frozen lockfile error * Fix test * Fix audit * Fix test * Fix undefined should not be argument for axios request * files clean up * fixed tests & group map layers Co-authored-by: Daniela Barborova <daniela.barborova@accenture.com>
openkfw · Nov 24, 2021 · de37234 · de37234
1 parent 6fad219
commit de37234
Show file tree

Hide file tree

Showing 9 changed files with 478 additions and 435 deletions.
diff --git a/api/src/actions/mapLayersActions.js b/api/src/actions/mapLayersActions.js
@@ -1,6 +1,9 @@
 const model = require('../models/mapLayerModel');
 const { getLayerGeoDataWithUrl } = require('../models/layerGeoDataModel');
 
+/**
+ * Returns map layers from mapLayers collection with link to GeoJson file from layerGeoData collection
+ */
 const getMapLayersWithGeoData = async () => {
   // find all available geoData
   const haveGeoData = await getLayerGeoDataWithUrl();
@@ -34,7 +37,7 @@ const getMapLayersWithGeoData = async () => {
   const layersWithGeoDataUrl = layers.map((layer) => {
     if (layer.layerType === 'group') {
       const sublayers = layer.layers.map((lr) => {
-        if (geoData[lr.geoDataUrl]) {
+        if (geoData[lr.geoReferenceId]) {
           return {
             ...lr,
             geoDataUrl: geoData[lr.geoReferenceId].geoDataUrl,

diff --git a/api/src/tests/staticLayers.js b/api/src/tests/staticLayers.js
@@ -31,7 +31,7 @@ describe('GET /api/staticLayers', () => {
     expect(res.body[0].geoReferenceId).toEqual(undefined);
   });
 
-  it.only('should return all layers in db sorted by title with data from layerGeoData collection', async () => {
+  it('should return all layers in db sorted by title with data from layerGeoData collection', async () => {
     await LayerGeoData.create(layerGeoDataInDb);
     // saved in reverse order to check the sorting
     await MapLayer.create(mapLayersInDb[1]);
@@ -54,10 +54,10 @@ describe('GET /api/staticLayers', () => {
     expect(res.status).toEqual(200);
     expect(res.body).toHaveLength(1);
     expect(res.body[0].referenceId).toEqual(mapLayersInDb[2].referenceId);
-    expect(res.body[0].metadata.geoMetadata).toEqual(layerGeoDataInDb.metadata);
     res.body[0].layers.forEach((layer) => {
       expect(layer.geoDataUrl).toEqual(layerGeoDataInDb.geoDataUrl);
       expect(layer.format).toEqual(layerGeoDataInDb.format);
+      expect(layer.metadata.geoMetadata).toEqual(layerGeoDataInDb.metadata);
     });
   });
 });
diff --git a/api/yarn.lock b/api/yarn.lock
diff --git a/frontend/src/axiosRequests.js b/frontend/src/axiosRequests.js
@@ -90,7 +90,10 @@ export const getAttributesData = async (searchParams) => {
 
 export const getGeoData = async (url) => {
   const response = await axios.get(url);
-  return response.data;
+  if (response && response.data) {
+    return response.data;
+  }
+  return [];
 };
 
 export const checkAuthorization = async () => {

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
diff --git a/initial-data-load/package.json b/initial-data-load/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@azure/storage-queue": "^12.2.0",
     "@hapi/joi": "^17.1.1",
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "azure-storage": "^2.10.3",
     "bottleneck": "^2.19.5",
     "csvtojson": "^2.0.10",

diff --git a/initial-data-load/yarn.lock b/initial-data-load/yarn.lock
diff --git a/url-loader/package.json b/url-loader/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "azure-storage": "^2.10.1",
     "bottleneck": "^2.19.5",
     "dotenv": "^6.0.0",

diff --git a/url-loader/yarn.lock b/url-loader/yarn.lock