Render NL signals #89

hiddewie · 2022-12-28T16:04:56Z

This PR enables rendering of Dutch (NL) signals:

These signals cover almost all tagged signals in The Netherlands.

Documentation about tagging in Wiki https://wiki.openstreetmap.org/wiki/OpenRailwayMap/Tagging_in_Netherlands.

Images used from Wiki, which are a compatible license and free to use in OSM. The images are slightly high but I think this suits the style fine with the label just below the signal.

Note: Not all Dutch signals have railway:signal:direction set which excludes them from rendering. This is fine for now.

Note: Main signals with integrated light speed limits are not tagged. They will not be rendered as a combined signal (e.g. https://www.openstreetmap.org/node/6301171816 is a combined main signal with speed limit according to ProRail data, but is not tagged with railway:signal:speed_limit:form=light)

@JJJWegdam You might be interested because you imported most of the ProRrail signals into OSM and update the Wiki and tagging scheme.

After this PR the legend in the OpenRailwayMap should also be updated with the Dutch signal images.

Around Deventer, main signals (http://127.0.0.1:6789/openrailwaymap/#14/52.2584/6.1603):

Deventer, in station (http://127.0.0.1:6789/openrailwaymap/#17/52.25686/6.16568):

Between Enschede and Gronau including distant signals (http://127.0.0.1:6789/openrailwaymap/#14/52.2194/6.9337) (note that all signals on Enschede station and on the line west of it are missing because they do not have a direction):

Max speed light signals (http://127.0.0.1:6789/openrailwaymap/#17/51.98356/5.92877):

Main repeat signals (http://127.0.0.1:6789/openrailwaymap/#16/51.9857/5.8723):

ETCS signs are rendered fine and are not modified

DerDakon · 2022-12-28T16:40:10Z

Please remove the pole from the images, only render the signal screen. What is the SVG used for?

hiddewie · 2022-12-28T17:10:48Z

@DerDakon Done.

I am still adding more signals (from the wiki, if they are actually present in OSM data) and updating the screenshots.

I will mark the PR ready for review when its all committed and tested.

besentv · 2023-10-02T23:05:55Z

I don't know how strict the maintainers of this project are, but the commits reverting stuff from earlier commits would be a no go in Wine. I'd recommend squashing them into their appropriate first commit using git rebase -i master and then reorder the commits and squash with s

hiddewie · 2023-10-06T15:08:07Z

@besentv Yes I can squash the PR if you like. Github also has an option to squash PR on merge, which makes a nice timeline in the master branch of this project. I am unsure what the maintainers prefer.

DerDakon · 2023-10-07T09:43:02Z

Sorry it took so long, this somehow got lost in the inbox.

You may keep this in multiple commits, but the ones that actually fix errors in previous commits in the series should indeed be squashed, so we don't e.g. have an image file added and then removed or wrongly layouted comments introduced in the first place.

signals.mss

signals.mml

maxspeed_signals.mss

signals.mss

hiddewie · 2023-10-21T15:15:37Z

Comments have been addressed and all commits have been squashed into 1. The screenshots still match with the current state of the PR.

JJJWegdam · 2023-10-22T12:36:20Z

Thanks for the work on this PR so far :)

Nakaner

I approve it because I want it merged. But please keep in mind that rendering maps for printing will not be possible in the Netherlands because you included some icons as PNG files. Please submit a separate pull request for the three PNG icons.

Nakaner · 2023-10-24T15:53:10Z

signals.mml

@@ -408,6 +419,7 @@ Layer:
          ORDER BY
            -- distant signals are less important, signals for slower speeds are more important
            (CASE
+              WHEN railway_has_key(tags, 'railway:signal:departure') THEN 15000


Assigning 15000 to departure signals will make them rendered with higher priority than main signals. Is this intended?

If I read the query correctly, the high numbers are low priority (rendered last, without overlap). The values are sorted ascending, so 15000 comes last.

2 screenshots for validation:

http://127.0.0.1:6789/openrailwaymap/#16/52.2577/6.1607

and zoomed out one level

http://127.0.0.1:6789/openrailwaymap/#15/52.2578/6.1612

Signal with ref 116 is rendered instead of the departure light.

hiddewie · 2023-10-24T18:51:50Z

Thanks!

Please submit a separate pull request for the three PNG icons.

Do you mean to transform the PNGs to SVG?

Nakaner · 2023-10-25T16:14:44Z

Please submit a separate pull request for the three PNG icons.

Do you mean to transform the PNGs to SVG?

Yes, vector drawings showing the same image. All other icons in our styles are vector drawings.

signals.mss

hiddewie · 2023-10-26T18:36:24Z

Please submit a separate pull request for the three PNG icons.

I made a pull request in #105, on top of this branch, that deletes the PNG files and replaces them with equivalent SVG files.

hiddewie · 2023-11-19T17:45:16Z

I merged the changes of #105 into this PR already because this PR is still open.

All the icons are SVGs now in this branch.

Departure signals Departure signals revert root departure remove unneeded distant symbols without pole Max speed light signals NL Repeated main light Fix a missing departure signal tagging combination revert maxspeed_signals.mss whitespace changes another one Main repeated states check Remove NL:light as light forms because of invalid tagging order Add support for signal categories like NL:voor NL:hoofd en NL:snelheid Refactor to NL:hoofd for main signals with speed limit box Squashed commit of the following: commit 339512c Author: Hidde Wieringa <[email protected]> Date: Thu Oct 26 20:39:31 2023 +0200 Update resource URLs as well commit c6d63a9 Author: Hidde Wieringa <[email protected]> Date: Thu Oct 26 20:34:15 2023 +0200 Modify Dutch icons to SVG commit 4a2a444 Author: Hidde Wieringa <[email protected]> Date: Wed Dec 28 17:03:15 2022 +0100 Support NL main and distant signals Departure signals Departure signals revert root departure remove unneeded distant symbols without pole Max speed light signals NL Repeated main light Fix a missing departure signal tagging combination revert maxspeed_signals.mss whitespace changes another one Main repeated states check Remove NL:light as light forms because of invalid tagging order Clean up PNG files

The icons are rendered very small. Therefore, a softening filter around the lights will not influence the rendered result. In addition, the filters are not supported by Mapnik. This commit removes dashed strokes from the lights, too.

Nakaner

Looks good to me.

I tidied up the SVG code and removed the filters because Mapnik does not support them.

@DerDakon You can squash my commit into the previous one when you merge it.

hiddewie · 2023-12-11T19:08:54Z

@DerDakon What is needed to get this pull request merged?

I have additional changes with more signals which are now tagged in The Netherlands. I can add those changes into this PR but I would rather make a separate PR and have the basic signalling visualized and ready for more iterative improvements.

Also almost all signals in the Netherlands are now correctly tagged with a railway:signal:direction and railway:signal:position which increases the visualization of the existing signals.

besentv · 2023-12-18T14:52:36Z

I suppose they are lacking the time to get to this, so we gotta wait for a bit.

hiddewie changed the title ~~Support NL main and distant signals~~ Render NL signals Dec 28, 2022

hiddewie marked this pull request as ready for review December 28, 2022 19:38

DerDakon requested review from Nakaner and DerDakon October 7, 2023 09:43

DerDakon requested changes Oct 7, 2023

View reviewed changes

signals.mss Outdated Show resolved Hide resolved

signals.mml Outdated Show resolved Hide resolved

maxspeed_signals.mss Outdated Show resolved Hide resolved

signals.mss Outdated Show resolved Hide resolved

hiddewie force-pushed the nl-signals branch from 3537a4e to 4a2a444 Compare October 21, 2023 15:14

hiddewie requested a review from DerDakon October 21, 2023 15:15

Nakaner approved these changes Oct 24, 2023

View reviewed changes

DerDakon reviewed Oct 26, 2023

View reviewed changes

signals.mss Show resolved Hide resolved

hiddewie mentioned this pull request Oct 26, 2023

Dutch railway signals to SVG #105

Closed

hiddewie force-pushed the nl-signals branch from 2f8bf32 to 653049c Compare October 26, 2023 19:08

hiddewie force-pushed the nl-signals branch from 653049c to 49e7169 Compare November 19, 2023 17:44

hiddewie force-pushed the nl-signals branch from 49e7169 to 1fd817d Compare November 19, 2023 18:07

Nakaner approved these changes Nov 25, 2023

View reviewed changes

besentv mentioned this pull request Apr 8, 2024

Draft: Add basic support for Polish signals based on #127 #128

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Render NL signals #89

Render NL signals #89

hiddewie commented Dec 28, 2022 •

edited

Loading

DerDakon commented Dec 28, 2022

hiddewie commented Dec 28, 2022 •

edited

Loading

besentv commented Oct 2, 2023

hiddewie commented Oct 6, 2023

DerDakon commented Oct 7, 2023

hiddewie commented Oct 21, 2023 •

edited

Loading

JJJWegdam commented Oct 22, 2023 •

edited

Loading

Nakaner left a comment

Nakaner Oct 24, 2023

hiddewie Oct 24, 2023

hiddewie commented Oct 24, 2023

Nakaner commented Oct 25, 2023

hiddewie commented Oct 26, 2023

hiddewie commented Nov 19, 2023

Nakaner left a comment

hiddewie commented Dec 11, 2023

besentv commented Dec 18, 2023

Render NL signals #89

Are you sure you want to change the base?

Render NL signals #89

Conversation

hiddewie commented Dec 28, 2022 • edited Loading

DerDakon commented Dec 28, 2022

hiddewie commented Dec 28, 2022 • edited Loading

besentv commented Oct 2, 2023

hiddewie commented Oct 6, 2023

DerDakon commented Oct 7, 2023

hiddewie commented Oct 21, 2023 • edited Loading

JJJWegdam commented Oct 22, 2023 • edited Loading

Nakaner left a comment

Choose a reason for hiding this comment

Nakaner Oct 24, 2023

Choose a reason for hiding this comment

hiddewie Oct 24, 2023

Choose a reason for hiding this comment

hiddewie commented Oct 24, 2023

Nakaner commented Oct 25, 2023

hiddewie commented Oct 26, 2023

hiddewie commented Nov 19, 2023

Nakaner left a comment

Choose a reason for hiding this comment

hiddewie commented Dec 11, 2023

besentv commented Dec 18, 2023

hiddewie commented Dec 28, 2022 •

edited

Loading

hiddewie commented Dec 28, 2022 •

edited

Loading

hiddewie commented Oct 21, 2023 •

edited

Loading

JJJWegdam commented Oct 22, 2023 •

edited

Loading