Skip to content

Commit

Permalink
Electricity signals (part 4) (#144)
Browse files Browse the repository at this point in the history
Part of #36 

Changes:
- Add missing DE BOStrab signals
- Render DE HHA signals
- Add CH FDV signals and icons 
- Add LU CFL signals and icons
- Add BE signals and icons
- Add PL tram signals and icons
- Add ES signals and icons

From https://de.wikipedia.org/wiki/Fahrleitungssignale and
https://wiki.openstreetmap.org/wiki/DE:OpenRailwayMap/Tagging_in_Switzerland#Signale_f%C3%BCr_den_elektrischen_Betrieb,
https://fr.wikipedia.org/wiki/Signalisation_ferroviaire_luxembourgeoise
  • Loading branch information
hiddewie authored Nov 10, 2024
1 parent ec99c68 commit 59f4ee8
Show file tree
Hide file tree
Showing 44 changed files with 695 additions and 9 deletions.
332 changes: 327 additions & 5 deletions features/electrification_signals.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions proxy/js/styles.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -719,8 +719,8 @@ const electrificationColor = (voltageProperty, frequencyProperty) => ['case',
['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 25000]], color_25kv_50hz,
['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 20000]], color_20kv_60hz,
['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 20000]], color_20kv_50hz,
['all', ['<', 16.665, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.675], ['==', ['get', voltageProperty], 15000]], color_15kv_16_67hz,
['all', ['<', 16.65, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.75], ['==', ['get', voltageProperty], 15000]], color_15kv_16_7hz,
['all', ['!=', ['get', frequencyProperty], null], ['<', 16.665, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.675], ['==', ['get', voltageProperty], 15000]], color_15kv_16_67hz,
['all', ['!=', ['get', frequencyProperty], null], ['<', 16.65, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.75], ['==', ['get', voltageProperty], 15000]], color_15kv_16_7hz,
['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 12500]], color_12_5kv_60hz,
['all', ['==', ['get', frequencyProperty], 25], ['==', ['get', voltageProperty], 12000]], color_12kv_25hz,
['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', ['get', voltageProperty], 3000]], color_gt3kv_dc,
Expand Down Expand Up @@ -2700,7 +2700,7 @@ const layers = {
{
id: 'electrification_signals_direction',
type: 'symbol',
minzoom: 16,
minzoom: 15,
source: 'openrailwaymap_electrification',
'source-layer': 'electrification_signals',
filter: ['all',
Expand Down Expand Up @@ -2734,7 +2734,7 @@ const layers = {
['get', 'feature'],
{
type: 'symbol',
minzoom: 16,
minzoom: 15,
source: 'openrailwaymap_electrification',
'source-layer': 'electrification_signals',
layout: {
Expand Down
6 changes: 6 additions & 0 deletions symbols/be/PBA.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions symbols/be/PBE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions symbols/be/PRL.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions symbols/ch/fdv-703.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions symbols/ch/fdv-704.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions symbols/ch/fdv-705.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions symbols/ch/fdv-707.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions symbols/ch/fdv-708.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions symbols/ch/fdv-709.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions symbols/ch/fdv-710.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 59f4ee8

Please sign in to comment.