Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(config): update categories of geojsons layers #888

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix(config): update categories of geojsons layers #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions app/component/MapLayersDialogContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions app/configurations/config.aachen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
],
Expand Down
3 changes: 3 additions & 0 deletions app/configurations/config.bw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -588,6 +590,7 @@ export default configMerger(walttiConfig, {
de: 'Nette Toilette',
},
url: '/assets/geojson/hb-layers/toilet.geojson',
category: 'leisure_and_tourism',
isOffByDefault: true,
},
],
Expand Down
8 changes: 4 additions & 4 deletions app/configurations/config.ludwigsburg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions app/configurations/config.mobidatabw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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,
Expand Down
0 ...vg-icons/stadtnavi/icon-icon_bike_car.svg → .../svg-icons/default/icon-icon_bike_car.svg
View file
Open in desktop
File renamed without changes
0 ...navi/icon-icon_health_social_services.svg → ...ault/icon-icon_health_social_services.svg
View file
Open in desktop
File renamed without changes
0 ...s/stadtnavi/icon-icon_leisure_tourism.svg → ...ons/default/icon-icon_leisure_tourism.svg
View file
Open in desktop
File renamed without changes
0 ...stadtnavi/icon-icon_public_facilities.svg → ...s/default/icon-icon_public_facilities.svg
View file
Open in desktop
File renamed without changes
0 ...stadtnavi/icon-icon_shopping_services.svg → ...s/default/icon-icon_shopping_services.svg
View file
Open in desktop
File renamed without changes
4 changes: 0 additions & 4 deletions static/svg-icons/stadtnavi/icon-icon-leisure-tourism.svg
View file
Open in desktop

This file was deleted.

Loading