Merge pull request #2472 from eurodatacube/ui-panels-cat

Removing of GTIF SH instance other minor fixes

app/src/components/IndicatorFiltersPanel.vue

@@ -274,6 +274,9 @@ export default {
            form#itemfilter{
              overflow: auto;
            }
+           * {
+            font-family: 'NotesESA' !important;
+           }
         `;
       });
     },

app/src/components/map/Map.vue

@@ -971,6 +971,7 @@ export default {
           const createdLayer = createLayerFromConfig(l, map);
           return createdLayer;
         });
+      baseLayers.forEach((l) => l.set('layerControlExclusive', true));
 
       this.updateLayers(backgroundGroupCollection, baseLayers);
     },

app/src/config/gtif.js

@@ -207,7 +207,7 @@ export const darkOverlayLayers = [{
 }];
 
 export const defaultLayersDisplay = {
-  baseUrl: `https://services.sentinel-hub.com/ogc/wms/${shConfig.shInstanceIdGtif}`,
+  baseUrl: `https://services.sentinel-hub.com/ogc/wms/${shConfig.shInstanceId}`,
   protocol: 'WMS',
   format: 'image/png',
   tileSize: 512,
@@ -755,7 +755,6 @@ function createREP1Config(indicatorCode, rasterFileUrl) {
           layerName: 'geodb_debd884d-92f9-4979-87b6-eadef1139394:GTIF_AT_Zaehlsprengel_3857',
           protocol: 'geoserverTileLayer',
           name: 'Census Track (Zählsprengel)',
-          layerAdditionalDescription: 'A counting district (abbreviated <a href="https://geometadatensuche.inspire.gv.at/metadatensuche/inspire/api/records/7767c333-302c-11e3-beb4-0000c1ab0db6">ZSP</a>) is the smallest area in official Austrian statistics for which statistical data is collected separately.',
           visible: true,
           minZoom: 12,
           selection: {
@@ -1232,7 +1231,6 @@ function createSOL1Config(indicatorCode, selectedVariable) {
           dateFormatFunction: () => '2023-01-01',
         }, {
           ...nutsStyle,
-          layerAdditionalDescription: 'A counting district (abbreviated <a href="https://geometadatensuche.inspire.gv.at/metadatensuche/inspire/api/records/7767c333-302c-11e3-beb4-0000c1ab0db6">ZSP</a>) is the smallest area in official Austrian statistics for which statistical data is collected separately.',
           layerName: 'geodb_debd884d-92f9-4979-87b6-eadef1139394:GTIF_AT_Zaehlsprengel_3857',
           protocol: 'geoserverTileLayer',
           name: 'Census Track (Zählsprengel)',
@@ -1301,7 +1299,6 @@ function createSOL2Config(indicatorCode, selectedVariable) {
           layerName: 'geodb_debd884d-92f9-4979-87b6-eadef1139394:GTIF_AT_Zaehlsprengel_3857',
           protocol: 'geoserverTileLayer',
           name: 'Census Track (Zählsprengel)',
-          layerAdditionalDescription: 'A counting district (abbreviated <a href="https://geometadatensuche.inspire.gv.at/metadatensuche/inspire/api/records/7767c333-302c-11e3-beb4-0000c1ab0db6">ZSP</a>) is the smallest area in official Austrian statistics for which statistical data is collected separately.',
           visible: true,
           minZoom: 13,
           selection: {
@@ -1425,7 +1422,7 @@ export const globalIndicators = [
             .toFormat('yyyy-MM-dd')}/${DateTime.fromISO(date).set({ days: 1 }).plus({ months: 1 }).minus({ days: 1 })
             .toFormat('yyyy-MM-dd')}`,
           name: 'Monthly Aggregated Truck Traffic 10km',
-          layers: 'TRUCK_REPROCESSING_MOTORWAY',
+          layers: 'VIS_TRUCK_DETECTION_MOTORWAYS_NEW',
           maxZoom: 14,
           opacity: 0.7,
         }],
@@ -1456,7 +1453,7 @@ export const globalIndicators = [
             .toFormat('yyyy-MM-dd')}/${DateTime.fromISO(date).set({ days: 1 }).plus({ months: 1 }).minus({ days: 1 })
             .toFormat('yyyy-MM-dd')}`,
           name: 'Monthly Aggregated Truck Traffic 10km',
-          layers: 'TRUCK_REPROCESSING_PRIMARY',
+          layers: 'VIS_TRUCK_DETECTION_PRIMARY_NEW',
           minZoom: 7,
           maxZoom: 14,
           opacity: 0.7,

app/src/config/layers.js

@@ -43,7 +43,7 @@ export const baseLayers = Object.freeze({
     protocol: 'xyz',
   },
   // S2GLC: {
-  //   baseUrl: `https://shservices.mundiwebservices.com/ogc/wms/${shConfig.shInstanceIdGtif}`,
+  //   baseUrl: `https://shservices.mundiwebservices.com/ogc/wms/${shConfig.shInstanceId}`,
   //   protocol: 'WMS',
   //   format: 'image/png',
   //   tileSize: 512,
@@ -105,7 +105,7 @@ export const baseLayers = Object.freeze({
     protocol: 'vectortile',
   },
   CORINE_LAND_COVER: {
-    baseUrl: `https://creodias.sentinel-hub.com/ogc/wms/${shConfig.shInstanceIdGtif}`,
+    baseUrl: `https://creodias.sentinel-hub.com/ogc/wms/${shConfig.shInstanceId}`,
     protocol: 'WMS',
     format: 'image/png',
     tileSize: 512,
@@ -116,7 +116,7 @@ export const baseLayers = Object.freeze({
     minZoom: 7,
   },
   ESA_WORLD_COVER: {
-    baseUrl: `https://services.sentinel-hub.com/ogc/wms/${shConfig.shInstanceIdGtif}`,
+    baseUrl: `https://services.sentinel-hub.com/ogc/wms/${shConfig.shInstanceId}`,
     protocol: 'WMS',
     format: 'image/png',
     tileSize: 512,
@@ -218,7 +218,7 @@ export const overlayLayers = Object.freeze({
     visible: false,
     styleFile: {
       version: 8,
-      sprite: `${window.location.protocol}//${window.location.hostname}${window.location.port === '' ? '' : `:${window.location.port}`}/data/gtif/data/openinframap/sprite`,
+      sprite: './data/gtif/data/openinframap/sprite',
       glyphs: 'https://demotiles.maplibre.org/font/{fontstack}/{range}.pbf',
       id: 'openinframap',
       name: 'OpenInfraMap',

app/src/views/Dashboard.vue

@@ -38,7 +38,7 @@
                     :titleProperty.prop="'name'"
                     :tools.prop="['info', 'config', 'opacity', 'sort']"
                     :styleOverride.prop="appConfig.id === 'gtif' ?`button.icon[slot=opacity-icon]::before {content: url(${require('../../public/img/gtif/icons/circle-opacity.svg')}) !important;}
-                    button.icon[slot=info-icon]::before {content: url(${require('../../public/img/gtif/icons/drop-icon.svg')}) !important;} [data-type=vector] .title::before { content: ''!important; width: 0px!important; height: 0px!important; min-width: 0px!important; margin-right: 0px!important; } [data-type=raster] .title::before {content: ''!important; width: 0px!important; height: 0px!important; min-width: 0px!important; margin-right: 0px!important;}` :''"
+                    button.icon[slot=info-icon]::before {content: url(${require('../../public/img/gtif/icons/drop-icon.svg')}) !important;} [data-type=vector] .title::before { content: ''!important; width: 0px!important; height: 0px!important; min-width: 0px!important; margin-right: 0px!important; } [data-type=raster] .title::before {content: ''!important; width: 0px!important; height: 0px!important; min-width: 0px!important; margin-right: 0px!important;}* {font-family: 'NotesESA' !important;}` :`* {font-family: 'NotesESA' !important;}`"
                     class="pointerEvents">
                    </eox-layercontrol>
 
@@ -83,13 +83,9 @@ import DataPanel from '@/components/DataPanel.vue';
 import GlobalHeader from '@/components/GlobalHeader.vue';
 import GlobalFooter from '@/components/GlobalFooter.vue';
 import IndicatorFiltersPanel from '@/components/IndicatorFiltersPanel.vue';
-// import IndicatorFilters from '@/components/IndicatorFilters.vue';
-// import IndicatorFiltersSidebar from '@/components/IndicatorFiltersSidebar.vue';
 import IndicatorFiltersDemo from '@/components/IndicatorFiltersDemo.vue';
-// import ESABreadcrumbs from '@/components/ESA/ESABreadcrumbs.vue';
 import UiPanelsLayout from '@/components/UiPanelsLayout.vue';
 import UiPanel from '@/components/UiPanel.vue';
-import { getMapInstance } from '@/components/map/map';
 import closeMixin from '@/mixins/close';
 import dialogMixin from '@/mixins/dialogMixin';
 import { mapState, mapGetters } from 'vuex';
@@ -112,10 +108,7 @@ export default {
     GlobalHeader,
     GlobalFooter,
     IndicatorFiltersPanel,
-    // IndicatorFilters,
-    // IndicatorFiltersSidebar,
     IndicatorFiltersDemo,
-    // ESABreadcrumbs,
     UiPanel,
     UiPanelsLayout,
     StacInfo,
@@ -172,11 +165,6 @@ export default {
       this.$refs.globalHeader.showText = 'welcome';
       this.$refs.globalHeader.showInfoDialog = true;
     }
-    const { map } = getMapInstance('centerMap');
-    const mapElement = document.querySelector('eox-layerswitcher');
-    if (mapElement) {
-      document.querySelector('eox-layerswitcher').attachTo(map);
-    }
   },
   beforeDestroy() {
     this.$store.commit('indicators/SET_SELECTED_INDICATOR', null);