Skip to content

Commit

Permalink
Merge pull request #873 from stadtnavi/map-changes
Browse files Browse the repository at this point in the history 
Map layer changes
  • Loading branch information
@hbruch
hbruch authored Jan 9, 2025
2 parents b23f450 + 46bcbb3 commit 36e6951
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 29 deletions.
9 changes: 8 additions & 1 deletion app/component/MapLayersDialogContent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,13 @@ class MapLayersDialogContent extends React.Component {
icon: 'icon-icon_stop_tram',
settings: { stop: 'tram' },
},
isTransportModeEnabled(transportModes.funicular) && {
checked: stop.funicular,
defaultMessage: 'Funicular stop',
labelId: 'map-layer-stop-funicular',
icon: 'icon-icon_stop_funicular',
settings: { stop: 'funicular' },
},
isTransportModeEnabled(transportModes.ferry) && {
checked: stop.ferry,
disabled: !!this.props.mapLayerOptions?.stop?.ferry?.isLocked,
Expand Down Expand Up @@ -355,7 +362,7 @@ class MapLayersDialogContent extends React.Component {
this.context.config.weatherStations &&
this.context.config.weatherStations.show && {
checked: weatherStations,
defaultMessage: 'Road weather',
defaultMessage: 'Weather stations',
labelId: 'map-layer-weather-stations',
icon: 'icon-icon_stop_monitor',
settings: 'weatherStations',
Expand Down
54 changes: 35 additions & 19 deletions app/configurations/config.herrenberg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,32 @@ export default configMerger(parentConfig, {
icon: "brand_deer",
operator: "deer",
name: {
de: "deer"
de: "deer",
en: "deer"
},
type: "car",
form_factors: ['car'],
hideCode: true,
enabled: true,
url: {
de: "https://www.deer-carsharing.de/"
de: "https://www.deer-carsharing.de/",
en: "https://www.deer-carsharing.de/"
}
},
stadtmobil_stuttgart: {
icon: "brand_stadtmobil",
operator: "stadtmobil",
name: {
de: "Stadtmobil Stuttgart"
de: "Stadtmobil Stuttgart",
en: "Stadtmobil Stuttgart"
},
type: "car",
form_factors: ['car'],
hideCode: true,
enabled: true,
url: {
de: "https://stuttgart.stadtmobil.de/"
de: "https://stuttgart.stadtmobil.de/",
en: "https://stuttgart.stadtmobil.de/"
}
},
regiorad_stuttgart: {
Expand All @@ -68,84 +72,96 @@ export default configMerger(parentConfig, {
hideCode: true,
enabled: true,
url: {
de: "https://www.regioradstuttgart.de"
de: "https://www.regioradstuttgart.de",
en: "https://www.regioradstuttgart.de"
}
},
bolt_stuttgart: {
icon: "brand_bolt",
operator: "bolt",
name: {
de: "Bolt OÜ"
de: "Bolt OÜ",
en: "Bolt OÜ"
},
type: "scooter",
form_factors: ['scooter', 'bicycle'],
hideCode: true,
enabled: true,
url: {
de: "https://www.bolt.eu/"
de: "https://www.bolt.eu/",
en: "https://www.bolt.eu/"
}
},
bolt_reutlingen_tuebingen: {
icon: "brand_bolt",
operator: "bolt",
name: {
de: "Bolt OÜ"
de: "Bolt OÜ",
en: "Bolt OÜ"
},
type: "scooter",
form_factors: ['scooter', 'bicycle'],
hideCode: true,
enabled: true,
url: {
de: "https://www.bolt.eu/"
de: "https://www.bolt.eu/",
en: "https://www.bolt.eu/"
}
},
zeus_ludwigsburg: {
icon: "brand_zeus",
operator: "zeus",
name: {
de: "Zeus Scooters"
de: "Zeus Scooters",
en: "Zeus Scooters"
},
type: "scooter",
form_factors: ['scooter'],
hideCode: true,
enabled: true,
url: {
de: "https://zeusscooters.com"
de: "https://zeusscooters.com",
en: "https://zeusscooters.com"
}
},
zeus_pforzheim: {
icon: "brand_zeus",
operator: "zeus",
name: {
de: "Zeus Scooters"
de: "Zeus Scooters",
en: "Zeus Scooters"
},
type: "scooter",
form_factors: ['scooter'],
hideCode: true,
enabled: true,
url: {
de: "https://zeusscooters.com"
de: "https://zeusscooters.com",
en: "https://zeusscooters.com"
}
},
zeus_tubingen: {
icon: "brand_zeus",
operator: "zeus",
name: {
de: "Zeus Scooters"
de: "Zeus Scooters",
en: "Zeus Scooters"
},
type: "scooter",
form_factors: ['scooter'],
hideCode: true,
enabled: true,
url: {
de: "https://zeusscooters.com"
de: "https://zeusscooters.com",
en: "https://zeusscooters.com"
}
},
voi_karlsruhe: {
icon: "brand_voi",
operator: "voi",
name: {
de: "Voi Scooter Karlsruhe"
de: "Voi Scooter Karlsruhe",
en: "Voi Scooter Karlsruhe"
},
type: "scooter",
form_factors: ['scooter'],
Expand Down Expand Up @@ -352,12 +368,12 @@ export default configMerger(parentConfig, {
// adding assets/geoJson/hb-layers layers
geoJson: {
layers: [
// bicycleinfrastructure includes shops, repair stations,
// bicycleinfrastructure includes repair stations,
{
name: {
fi: '',
en: 'Service stations and stores',
de: 'Service Stationen und Läden',
en: 'Bicycle service stations',
de: 'Radservice-Punkte',
},
url: 'https://data.mfdz.de/hbg/dt-layers/bicycleinfrastructure.geojson',
category: 'bicycle_car',
Expand Down
4 changes: 2 additions & 2 deletions app/configurations/config.ludwigsburg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ export default configMerger(parentConfig, {
{
name: {
fi: '',
en: 'Service stations and stores',
de: "Radservice Stationen",
en: 'Bicycle Service Stations',
de: "Radservice-Punkte",
},
category: 'other',
url: '/assets/geojson/lb-layers/radservice.json',
Expand Down
12 changes: 6 additions & 6 deletions app/translations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ const translations = {
'itinerary-summary.interline-wait-multiple-legs': 'Die Linien-Nummer ({shortName}) und das Fahrtziel wird sich während der Fahrt mehrfach ändern. Gesamte Wartezeit ist {time}. Bitte bleiben Sie im Fahrzeug.',
'language-selection': 'Sprache: {language}',
'lighting': 'Beleuchtung',
'map-layer-stop-funicular': 'Seilbahnen',
'nearest-favorites': 'Haltestellen in der Nähe:',
'nearest-favorites-browse-stops': 'Haltestellen anzeigen und auswählen',
'nearest-favorites-no-favorites': 'Abfahrtszeiten für ausgewählte Haltestellen und Fahrzeuge in der Karte',
Expand Down Expand Up @@ -842,11 +841,12 @@ const translations = {
'map-layer-park-and-ride': 'Parkplätze / Parkhäuser',
'map-layer-stop-bus': 'Bushaltestellen',
'map-layer-stop-ferry': 'Fähren',
'map-layer-stop-funicular': 'Seil- und Zahnradbahnen',
'map-layer-stop-tram': 'Tramhaltestellen',
'map-layer-terminal-bus': 'Busbahnhöfe',
'map-layer-terminal-rail': 'Bahnhöfe',
'map-layer-terminal-subway': 'U-Bahnhöfe',
'map-layer-vehicles': 'Buspositionen',
'map-layer-vehicles': 'Fahrzeugpositionen',
'map-layer-weather-stations': 'Straßenwetter',
'map-layer-datahub-bike-rentals': 'Fahrradverleihe',
'map-layer-datahub-bike-repair-shops': 'Fahrradwerkstätten',
Expand Down Expand Up @@ -1551,7 +1551,7 @@ const translations = {
'charging-spaces-in-total': '{capacity} charging slots',
'charging-spaces-no-data' : 'No capacity data available',
'choose-freely': 'Optional',
'choose-stop': 'Select stop',
'choose-stop': 'Select option',
'choose-stop-or-vehicle': 'Select vehicle or stop',
'choose-vehicle': 'Select vehicle',
citybike: 'Sharing',
Expand Down Expand Up @@ -1849,15 +1849,15 @@ const translations = {
'map-layer-charging-stations': 'Charging stations',
'map-layer-citybike': 'Citybike stations',
'map-layer-park-and-ride': 'Park & ride sites',
'map-layer-bike-parks': 'Bike parking spaces',
'map-layer-bike-parks': 'Bicycle parking spaces',
'map-layer-stop-bus': 'Bus stops',
'map-layer-stop-ferry': 'Ferries',
'map-layer-stop-funicular': 'Funiculars',
'map-layer-stop-funicular': 'Funiculars and cog railways',
'map-layer-stop-tram': 'Tram stops',
'map-layer-terminal-bus': 'Bus terminals',
'map-layer-terminal-rail': 'Train stations',
'map-layer-terminal-subway': 'Metro stations',
'map-layer-vehicles': 'Bus positions',
'map-layer-vehicles': 'Vehicle positions',
'map-layer-dynamic-parking-lots': 'Parking spaces',
'map-layer-datahub-bike-rentals': 'Bike rentals',
'map-layer-datahub-bike-repair-shops': 'Bike repair shops',
Expand Down
2 changes: 1 addition & 1 deletion static/svg-icons/stadtnavi/icon-icon_leisure_tourism.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions static/svg-icons/stadtnavi/icon-icon_stop_funicular.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 36e6951

Please sign in to comment.