map background fix

Author: sirmmo

src/app/Services/API/Requests/index.ts

@@ -182,12 +182,10 @@ export class RequestApi extends Http {
         // @ts-ignore
         lastCities = JSON.parse(localStorage.getItem('lastCities'));
       }
-      console.log(cities, lastCities);
       let fcities = cities.filter(city => {
         let found = false;
         for (let c of lastCities) {
           if (c) {
-            console.log(c);
             //@ts-ignore
             if (c.label === city.label) found = true;
           }
@@ -468,11 +466,14 @@ export class RequestApi extends Http {
       } else {
         // Fetch only the main data configuration
         return this.instance.get<any>(conf.url).then(response => {
-          //@ts-ignore
-          response.wms_main_layer_name = conf.wms_main_layer_name;
-          //@ts-ignore
-          response.wms_secondary_layer_name = conf.wms_secondary_layer_name;
-
+          if (conf.wms_main_layer_name) {
+            //@ts-ignore
+            response.wms_main_layer_name = conf.wms_main_layer_name;
+          }
+          if (conf.wms_secondary_layer_name) {
+            //@ts-ignore
+            response.wms_secondary_layer_name = conf.wms_secondary_layer_name;
+          }
           localStorage.setItem(conf.url, JSON.stringify(response));
           console.log('getLayerConf: Fetched only main data');
           console.log(response);

src/app/components/Map/index.tsx

@@ -158,29 +158,29 @@ const Map = (props: MapProps) => {
     setShowUncertainty(true);
     console.log('getting capabilities for ', currentLayer);
 
-    if (layerConf.wms_secondary_layer_name) {
-      if (layerConf.wms_secondary_layer_name.indexOf('{')) {
-        for (let j of Object.keys(currentMap)) {
-          layerConf.wms_secondary_layer_name =
-            layerConf.wms_secondary_layer_name.replaceAll(
-              '{' + j + '}',
-              currentMap[j],
-            );
-        }
-      }
-    }
-
-    if (layerConf.wms_main_layer_name) {
-      if (layerConf.wms_main_layer_name.indexOf('{')) {
-        for (let j of Object.keys(currentMap)) {
-          layerConf.wms_main_layer_name =
-            layerConf.wms_main_layer_name.replaceAll(
-              '{' + j + '}',
-              currentMap[j],
-            );
-        }
-      }
-    }
+    //if (layerConf.wms_secondary_layer_name) {
+    //  if (layerConf.wms_secondary_layer_name.indexOf('{')) {
+    //    for (let j of Object.keys(currentMap)) {
+    //      layerConf.wms_secondary_layer_name =
+    //        layerConf.wms_secondary_layer_name.replaceAll(
+    //          '{' + j + '}',
+    //          currentMap[j],
+    //        );
+    //    }
+    //  }
+    //}
+    //
+    //if (layerConf.wms_main_layer_name) {
+    //  if (layerConf.wms_main_layer_name.indexOf('{')) {
+    //    for (let j of Object.keys(currentMap)) {
+    //      layerConf.wms_main_layer_name =
+    //        layerConf.wms_main_layer_name.replaceAll(
+    //          '{' + j + '}',
+    //          currentMap[j],
+    //        );
+    //    }
+    //  }
+    //}
 
     api.getCapabilities(currentLayer).then((x: string) => {
       let xml = x;
@@ -386,7 +386,7 @@ const Map = (props: MapProps) => {
         layer={layerConf.wms_base_url}
         opacity={opacity}
         show={
-          showUncertainty
+          showUncertainty || data !== 'forecast'
             ? layerConf.wms_main_layer_name
             : layerConf.wms_secondary_layer_name
         }

src/app/index.tsx

@@ -43,6 +43,7 @@ withTolgee(i18n, tolgee)
   .init({
     //lng: 'en', // or use i18next language detector
     supportedLngs: ['it', 'en'],
+    debug: false,
   });
 
 export function App() {