diff --git a/import/openrailwaymap.lua b/import/openrailwaymap.lua index d4bf8a15..fd11cd4d 100644 --- a/import/openrailwaymap.lua +++ b/import/openrailwaymap.lua @@ -287,13 +287,25 @@ function osm2pgsql.process_node(object) end if railway_station_values(tags.railway) then - stations:insert({ - way = object:as_point(), - railway = tags.railway, - name = tags.short_name or tags.name, - station = tags.station, - label = tags['railway:ref'], - }) + if tags.station then + for station in string.gmatch(tags.station, '[^;]+') do + stations:insert({ + way = object:as_point(), + railway = tags.railway, + name = tags.short_name or tags.name, + station = station, + label = tags['railway:ref'], + }) + end + else + stations:insert({ + way = object:as_point(), + railway = tags.railway, + name = tags.short_name or tags.name, + station = nil, + label = tags['railway:ref'], + }) + end end if railway_poi_values(tags.railway) then diff --git a/import/sql/tile_views.sql b/import/sql/tile_views.sql index 9317c3d9..b0f70e14 100644 --- a/import/sql/tile_views.sql +++ b/import/sql/tile_views.sql @@ -402,6 +402,15 @@ CREATE OR REPLACE VIEW speed_railway_signals AS WHEN feature = 'AT-V2:ek-sicht_pfeiftafel' AND signal_speed_limit_form = 'sign' THEN 'at/ek-sicht-pfeiftafel' + -- BE -- + + -- BE speed limit light (part of main signal) + WHEN feature = 'BE:VIS' AND signal_speed_limit_form = 'light' THEN + CASE + WHEN signal_speed_limit_speed IS NULL THEN 'be/chiffre-vitesse-empty' + WHEN signal_speed_limit_speed ~ '^([4-9]0)$' THEN CONCAT('be/chiffre-vitesse-', signal_speed_limit_speed) + END + -- CH -- -- Vorsignal verminderte Geschwindigkeit diff --git a/symbols/be/2J.svg b/symbols/be/2J.svg new file mode 100644 index 00000000..0f832eaa --- /dev/null +++ b/symbols/be/2J.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/be/R-B.svg b/symbols/be/R-B.svg new file mode 100644 index 00000000..df6478db --- /dev/null +++ b/symbols/be/R-B.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/be/R.svg b/symbols/be/R.svg new file mode 100644 index 00000000..6d5bece9 --- /dev/null +++ b/symbols/be/R.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/symbols/be/V.svg b/symbols/be/V.svg new file mode 100644 index 00000000..39eab351 --- /dev/null +++ b/symbols/be/V.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/symbols/be/VJH.svg b/symbols/be/VJH.svg new file mode 100644 index 00000000..3b581608 --- /dev/null +++ b/symbols/be/VJH.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/be/VJV.svg b/symbols/be/VJV.svg new file mode 100644 index 00000000..6a101b99 --- /dev/null +++ b/symbols/be/VJV.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/be/chiffre-vitesse-40.svg b/symbols/be/chiffre-vitesse-40.svg new file mode 100644 index 00000000..5b8ae83a --- /dev/null +++ b/symbols/be/chiffre-vitesse-40.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-50.svg b/symbols/be/chiffre-vitesse-50.svg new file mode 100644 index 00000000..f9c37559 --- /dev/null +++ b/symbols/be/chiffre-vitesse-50.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-60.svg b/symbols/be/chiffre-vitesse-60.svg new file mode 100644 index 00000000..b5a6f2db --- /dev/null +++ b/symbols/be/chiffre-vitesse-60.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-70.svg b/symbols/be/chiffre-vitesse-70.svg new file mode 100644 index 00000000..7109fdc4 --- /dev/null +++ b/symbols/be/chiffre-vitesse-70.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-80.svg b/symbols/be/chiffre-vitesse-80.svg new file mode 100644 index 00000000..2a50c7b7 --- /dev/null +++ b/symbols/be/chiffre-vitesse-80.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-90.svg b/symbols/be/chiffre-vitesse-90.svg new file mode 100644 index 00000000..2668e27c --- /dev/null +++ b/symbols/be/chiffre-vitesse-90.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/chiffre-vitesse-empty.svg b/symbols/be/chiffre-vitesse-empty.svg new file mode 100644 index 00000000..d64b23f0 --- /dev/null +++ b/symbols/be/chiffre-vitesse-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/dwarf.svg b/symbols/be/dwarf.svg new file mode 100644 index 00000000..30d196dd --- /dev/null +++ b/symbols/be/dwarf.svg @@ -0,0 +1,8 @@ + + + + + + + +