Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into deploy-europe
Browse files Browse the repository at this point in the history
  • Loading branch information
hiddewie committed Mar 31, 2024
2 parents 57608db + ea20821 commit e9305ea
Show file tree
Hide file tree
Showing 16 changed files with 183 additions and 7 deletions.
26 changes: 19 additions & 7 deletions import/openrailwaymap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions import/sql/tile_views.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions symbols/be/2J.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions symbols/be/R-B.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions symbols/be/R.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions symbols/be/V.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 e9305ea

Please sign in to comment.