Merge pull request #888 from stadtnavi/fix/stadtnavi-geojson-config

fix(config): update categories of geojsons layers
stadtnavi · Jan 21, 2025 · f1c7ac2 · f1c7ac2
2 parents b8bac0b + f10cfb3
commit f1c7ac2
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 20 deletions.
diff --git a/app/component/MapLayersDialogContent.js b/app/component/MapLayersDialogContent.js
@@ -512,9 +512,16 @@ class MapLayersDialogContent extends React.Component {
                 defaultMessage: 'Shopping & Services',
               })}
               onChange={this.updateSetting}
-              options={getPoiLayers(shoppingAndServicesLayer).sort(
-                sortLayersByKey,
-              )}
+              options={getPoiLayers(shoppingAndServicesLayer)
+                .concat(
+                  this.layerOptionsByCategory(
+                    'shopping_and_services',
+                    config.geoJson?.layers,
+                    geoJson,
+                    this.props.lang,
+                  ),
+                )
+                .sort(sortLayersByKey)}
             />
             <LayerCategoryDropdown
               icon="icon-icon_public_facilities"
@@ -523,9 +530,16 @@ class MapLayersDialogContent extends React.Component {
                 defaultMessage: 'Public Facilities',
               })}
               onChange={this.updateSetting}
-              options={getPoiLayers(publicFacilitiesLayer).sort(
-                sortLayersByKey,
-              )}
+              options={getPoiLayers(publicFacilitiesLayer)
+                .concat(
+                  this.layerOptionsByCategory(
+                    'public_facilities',
+                    config.geoJson?.layers,
+                    geoJson,
+                    this.props.lang,
+                  ),
+                )
+                .sort(sortLayersByKey)}
             />
             <LayerCategoryDropdown
               icon="icon-icon_health_social_services"

diff --git a/app/configurations/config.aachen.js b/app/configurations/config.aachen.js
@@ -153,7 +153,7 @@ export default configMerger(parentConfig, {
                     nl: 'Buwplaats',
                 },
                 url: 'https://data.mfdz.de/aachen/baustellen/roadworks.geojson',
-                category: 'other',
+                category: 'bicycle_car',
                 icon: 'icon-icon_roadworks',
             },
             {
@@ -165,7 +165,7 @@ export default configMerger(parentConfig, {
                     nl: 'Bezienswaardigheden',
                 },
                 url: 'https://kim.regioit.de/GIS/STAC/stadtnavi/poi_2.json',
-                category: 'other',
+                category: 'leisure_and_tourism',
                 icon: 'icon-icon_poi-marker',
             },
             {
@@ -177,7 +177,7 @@ export default configMerger(parentConfig, {
                     nl: 'Smart Shopping',
                 },
                 url: 'https://kim.regioit.de/GIS/STAC/stadtnavi/poi_smart_shopping.json',
-                category: 'other',
+                category: 'shopping_and_services',
                 icon: 'icon-icon_aac_smart-shopping-marker',
             },
             {
@@ -189,7 +189,7 @@ export default configMerger(parentConfig, {
                     nl: 'Winkelstraten',
                 },
                 url: 'https://kim.regioit.de/GIS/STAC/stadtnavi/einkaufsstrasse.json',
-                category: 'other',
+                category: 'shopping_and_services',
                 icon: 'icon-icon_aac_shopping-streets-marker',
             },
         ],

diff --git a/app/configurations/config.bw.js b/app/configurations/config.bw.js
@@ -559,6 +559,7 @@ export default configMerger(walttiConfig, {
           en: 'Service stations and stores',
           de: 'Service Stationen und Läden',
         },
+        category: 'bicycle_car',
         url: '/assets/geojson/hb-layers/bicycleinfrastructure.geojson',
       },
       /* Charging stations
@@ -578,6 +579,7 @@ export default configMerger(walttiConfig, {
           de: 'LoRaWAN Gateways',
         },
         url: '/assets/geojson/hb-layers/lorawan-gateways.geojson',
+        category: 'leisure_and_tourism',
         isOffByDefault: true,
       },
       // Nette Toilette layer
@@ -588,6 +590,7 @@ export default configMerger(walttiConfig, {
           de: 'Nette Toilette',
         },
         url: '/assets/geojson/hb-layers/toilet.geojson',
+        category: 'leisure_and_tourism',
         isOffByDefault: true,
       },
     ],

diff --git a/app/configurations/config.ludwigsburg.js b/app/configurations/config.ludwigsburg.js
@@ -342,7 +342,7 @@ export default configMerger(parentConfig, {
                     en: 'Bicycle Service Stations',
                     de: "Radservice-Punkte",
                 },
-                category: 'other',
+                category: 'bicycle_car',
                 url: '/assets/geojson/lb-layers/radservice.json',
                 icon: 'icon-icon_bike_repair',
                 isOffByDefault: true,
@@ -354,7 +354,7 @@ export default configMerger(parentConfig, {
                     en: 'Public Toilets',
                     de: 'Nette Toilette',
                 },
-                category: 'other',
+                category: 'leisure_and_tourism',
                 url: "/assets/geojson/lb-layers/nettetoilette.json",
                 icon: 'icon-icon_public_toilets',
                 isOffByDefault: true,
@@ -366,7 +366,7 @@ export default configMerger(parentConfig, {
                   en: 'Parking zones',
                   de: 'Parkzonen',
                 },
-                category: 'car',
+                category: 'bicycle_car',
                 url: '/assets/geojson/lb-layers/parkzonen.json',
                 icon: 'icon-icon_open_carpark',
                 isOffByDefault: false,
@@ -379,7 +379,7 @@ export default configMerger(parentConfig, {
                   en: "Bicycle network",
                   de: 'Radnetz Ludwigsburg',
                 },
-                category: 'bicycle',
+                category: 'bicycle_car',
                 url: '/assets/geojson/lb-layers/radnetz.json',
                 icon: 'icon-icon_radnetz',
                 isOffByDefault: false,

diff --git a/app/configurations/config.mobidatabw.js b/app/configurations/config.mobidatabw.js
@@ -244,6 +244,7 @@ export default configMerger(parentConfig, {
                   de: 'Auskunft',
                 },
                 url: '/assets/geojson/mobidatabw_service_area.json',
+                category: 'bicycle_car',
                 icon: 'icon-icon_open_carpark',
                 isOffByDefault: false,
                 minZoom: 1,
@@ -256,7 +257,7 @@ export default configMerger(parentConfig, {
                   de: 'Radservice-Punkte',
                 },
                 url: 'https://data.mfdz.de/mobidata-bw/routing/dt_radservice_punkte.json',
-                category: 'bicycle',
+                category: 'bicycle_car',
                 icon: 'icon-icon_bike_repair',
                 isOffByDefault: false,
                 minZoom: 10
@@ -268,7 +269,7 @@ export default configMerger(parentConfig, {
                   en: "Bicycle network",
                   de: 'Radnetz',
                 },
-                category: 'bicycle',
+                category: 'bicycle_car',
                 url: 'https://api.mobidata-bw.de/geoserver/MobiData-BW/wms',
                 icon: 'icon-icon_radnetz',
                 isOffByDefault: false,

diff --git a/...vg-icons/stadtnavi/icon-icon_bike_car.svg → .../svg-icons/default/icon-icon_bike_car.svg b/...vg-icons/stadtnavi/icon-icon_bike_car.svg → .../svg-icons/default/icon-icon_bike_car.svg
diff --git a/...navi/icon-icon_health_social_services.svg → ...ault/icon-icon_health_social_services.svg b/...navi/icon-icon_health_social_services.svg → ...ault/icon-icon_health_social_services.svg
diff --git a/...s/stadtnavi/icon-icon_leisure_tourism.svg → ...ons/default/icon-icon_leisure_tourism.svg b/...s/stadtnavi/icon-icon_leisure_tourism.svg → ...ons/default/icon-icon_leisure_tourism.svg
diff --git a/...stadtnavi/icon-icon_public_facilities.svg → ...s/default/icon-icon_public_facilities.svg b/...stadtnavi/icon-icon_public_facilities.svg → ...s/default/icon-icon_public_facilities.svg
diff --git a/...stadtnavi/icon-icon_shopping_services.svg → ...s/default/icon-icon_shopping_services.svg b/...stadtnavi/icon-icon_shopping_services.svg → ...s/default/icon-icon_shopping_services.svg
diff --git a/static/svg-icons/stadtnavi/icon-icon-leisure-tourism.svg b/static/svg-icons/stadtnavi/icon-icon-leisure-tourism.svg