OpenRailwayMap-vector integration#132
Open
hiddewie wants to merge 762 commits into
Open
Conversation
Fixes #484 Postgres 18 is released: https://www.postgresql.org/about/news/postgresql-18-released-3142/ PostGIS 3.6 is released: https://gitea.osgeo.org/postgis/postgis/raw/tag/3.6.0/NEWS https://hub.docker.com/r/imresamu/postgis/tags Using the base image `imresamu/postgis:18beta1-3.6.0alpha1-alpine`, the signal feature generation time goes from >2 minutes to 17 seconds 🎉 ~The current tag is a beta (Postgres) + alpha (PostGIS) release, but so far it looks good.~
see the [osmwiki](https://osm.wiki/Australian_Tagging_Guidelines/Railway_Signals#NSW_Other_Signs) page. Unfortunately many signs have tiny text (the New South Wales system is dumb...). Because of this, I've used a simplified icon with less text in a few cases (for example: [original](https://osm.wiki/File:NSW_Railway_Sign_End_Signalled_Authority.svg) vs [icon](https://github.com/k-yle/OpenRailwayMap-vector/blob/922505/symbols/au/nsw/signs/end_signalled_authority.svg)) <img width="136" height="113" alt="Image" src="https://github.com/user-attachments/assets/d8458273-0c25-4c45-afab-7d7362b71e91" /> <img width="96" height="115" alt="Image" src="https://github.com/user-attachments/assets/a819f1da-da3a-4853-b06b-1d06605031e1" /> <img width="141" height="142" alt="Image" src="https://github.com/user-attachments/assets/2d318b05-ebea-4651-92eb-31fd7e178817" /> <img width="117" height="135" alt="Image" src="https://github.com/user-attachments/assets/a5b83ee5-da82-4b73-940e-476b4bc59ad1" /> <br /> <img width="67" height="68" alt="Image" src="https://github.com/user-attachments/assets/627cd7d8-9c1e-47de-a3e4-dc33edd992c7" /> <img width="52" height="64" alt="Image" src="https://github.com/user-attachments/assets/0214beca-45df-434e-9dc6-49faa38c3316" /> <img width="71" height="71" alt="Image" src="https://github.com/user-attachments/assets/b32cf353-8d27-4726-b6e7-326d2825a070" /> <img width="56" height="55" alt="Image" src="https://github.com/user-attachments/assets/5ac1cd8f-931d-4f42-9af0-350e17733f34" /> <img width="53" height="45" alt="Image" src="https://github.com/user-attachments/assets/76dd72b9-6f84-4cf7-9cd5-1f44c199f2fd" /> <img width="75" height="70" alt="Image" src="https://github.com/user-attachments/assets/2b38b989-7c5c-4ad7-b9c5-5dc6e699e475" /> <img width="40" height="26" alt="Image" src="https://github.com/user-attachments/assets/ac057f44-3e11-410d-86e7-f9ec2ae8969f" /> <img width="57" height="49" alt="Image" src="https://github.com/user-attachments/assets/0f16bbd8-b224-4f1c-9999-6f9ca6418c5f" /> <img width="49" height="49" alt="Image" src="https://github.com/user-attachments/assets/54d56d9c-950c-4c16-9448-c3c9e4d6243f" /> <img width="44" height="40" alt="Image" src="https://github.com/user-attachments/assets/5590c552-eb63-4ca2-bf00-287be7da3420" /> <img width="93" height="77" alt="Image" src="https://github.com/user-attachments/assets/116fcdd0-c05b-4ddf-bfdb-06ec514afec7" /> <img width="51" height="53" alt="Image" src="https://github.com/user-attachments/assets/003af980-837f-4ad2-a515-8a6c02e89a82" /> <img width="57" height="62" alt="Image" src="https://github.com/user-attachments/assets/ea96ee0f-03bb-4694-ad68-66d5bbdefe4e" /> Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Closes #498 Add tests for the OpenRailwayMap Lua Osm2psql import script. Some tests verify the importing logic, giving meaning to OpenStreetMap tags. Some tests verify the importing logic, providing a node/way/relation with certain tags, and verifying the expected rows with values in the Postgres tables.
This reduces the context which needs to be sent to the Docker daemon for individual image builds, which speeds up the builds.
Part of #555 ## Approach Consider the zoom levels 0 up to and including 6. These zoom levels only show the main and present lines, no historical or future, nor branch/service lines. For every layer, the railway lines are grouped in their geometries, making a single line with the same properties for that layer. For example, in the infrastructure layer, the lines with the same reference and high-speed indication are grouped together to form a single line. That geometry is easier to simplify (remove points close together). Layers: - infrastructure: group by reference, name, highspeed - speed: group by reference, name, highspeed, speed - electrification: group by reference, name, electrification state, voltage, frequency - gauge: group by reference, name, gauge (only the first if the line has multiple) - loading gauge: group by reference, name, loading gauge - track class: group by reference, name, track class - operator, group by reference, name, owner, operator In particular this means that every layer can have slightly different geometries, and will have different properties. In particular, railway lines grouped by e.g. speed cannot have a property with e.g. gauge, because that property is not grouped on. The popup will not show the properties of the other layers for the low zooms. Also the aggregated railway lines will not show the OSM links to view/edit a railway line, because the line can consist of **many** OSM lines. Every layer will have its own source for the low zoom railway line data because of this. Technical note: ouputting repeated properties, such as `state: 'present'` and `usage: 'main'` which every low zoom tile has, is no problem. The tiles are compressed, so repeated values of the same property consume almost no space. ## Testing The map view has some small differences because of the grouping of the railway lines. The lines are smoother and less "thick" where many small line segments are in OSM data. This improves the map clarity. In screenshots below: ignore transfered data, only look at loaded data. On localhost, caching is not enabled. ### Zoom 5 Before (https://openrailwaymap.app/#view=5.9/50.984/6.043): <img width="1433" height="139" alt="image" src="https://github.com/user-attachments/assets/ea8a940d-59bd-4f48-a313-772566a1d9a4" /> <img width="882" height="491" alt="image" src="https://github.com/user-attachments/assets/b012bd8d-36e5-4e89-91ef-0b5df1554fb4" /> <img width="1433" height="755" alt="image" src="https://github.com/user-attachments/assets/65dd6ab9-163d-4b54-8e22-c21b4d5eac09" /> <img width="1433" height="357" alt="image" src="https://github.com/user-attachments/assets/0da62783-22ee-4083-8088-0bad4499dcfb" /> 28 MB of data loaded After (http://localhost:8000/#view=5.9/50.984/6.043): <img width="1430" height="122" alt="image" src="https://github.com/user-attachments/assets/7b86ec54-41f7-40d0-849a-e4afc016dfe2" /> <img width="784" height="400" alt="image" src="https://github.com/user-attachments/assets/7a1f3f36-f0bc-4bed-9024-3a192af2cfe3" /> <img width="1433" height="755" alt="image" src="https://github.com/user-attachments/assets/2c958e64-1df1-4138-8bb4-91a077a69ba2" /> <img width="1433" height="357" alt="image" src="https://github.com/user-attachments/assets/0349be3c-4c9f-4420-92de-7166fb475c4d" /> 9 MB of data loaded ## Zoom 2 Before (https://openrailwaymap.app/#view=2/54.55/42.19): <img width="1433" height="753" alt="image" src="https://github.com/user-attachments/assets/515432cb-0cbb-4637-a9a4-4e7845c6a701" /> <img width="1432" height="359" alt="image" src="https://github.com/user-attachments/assets/a54385d9-a1cb-48ef-b40a-5029c7d53b34" /> 30 MB of data loaded After (http://localhost:8000/#view=2/54.55/42.19): <img width="1433" height="753" alt="image" src="https://github.com/user-attachments/assets/09cf29b2-b48f-4142-8d17-a18cc3915f65" /> <img width="1432" height="359" alt="image" src="https://github.com/user-attachments/assets/335c363e-ea80-4fed-9022-2cbc2513d7f4" /> 10.5 MB of data loaded ### Funny detail Many lines in Russia, middle east, and Asia do not have a reference nor name. They will all be grouped together and highlighted as a single (huge) line. <img width="790" height="619" alt="image" src="https://github.com/user-attachments/assets/74568672-0ef5-4e70-9b6d-b92940477f77" /> ## Followups - Booleans, do not send `false` but only `null` or `true`
Docs in https://wiki.openstreetmap.org/wiki/OpenRailwayMap/Tagging_in_France#Cab_signalling Changes: - Cab signalling signs - TVM and ETCS stop marker signs - Shunting marker - Wrong route - Distant route indicator and route indicator - Distant stop and stop signals - Shunting signals
Changes: - correct detecting block markers with the arrow shape - add support for the tagging of block markers with lights for shunting movements (227a and 227c) - simplify icons a bit Docs in https://wiki.openstreetmap.org/wiki/OpenRailwayMap/Tagging_in_Netherlands#ETCS_stop_marker (http://localhost:8000/#view=19.1/51.8958495/5.8106961&style=signals): <img width="893" height="622" alt="image" src="https://github.com/user-attachments/assets/fbf3f428-2621-493c-b337-442b81c8d1a2" />
This keeps the tile sources consistent (currently it is a mix of views and functions), and allows using the 'id' column of a layer as ID, without promoting it client-side. Changing the fields of a single tile view is also possible by redefining the tile function (and comment), without further changing the Martin configuration or even restarting the Martin container.
Fixes #605 Implements: - ETCS block markers - TVM/CBTC block markers - Cab Shunt Entry block markers - Entry, Exit, and Warning of entry into cab signalling - Directional arrows for the above (left and right only) - Block marker absolute/passable plates Drawn from the relevant RSSB standards. --- - [x] Tagging on map - [x] Description on the [UK Rail Signal Tagging page](https://wiki.openstreetmap.org/wiki/OpenRailwayMap/Tagging_in_the_United_Kingdom) --- ## Potential testing locations | Location | What's there | | --------- | -------------- | | Aberystwyth | ETCS block markers, cab signalling entry (2) | | Dovey Junction | ETCS block markers | | Tywyn | ETCS block markers, shunt entry block markers, cab signalling entry | | Barmouth | ETCS block markers, shunt entry block markers, cab signalling entry | | Harlech | ETCS block markers, shunt entry block markers | Note: At Barmouth the crossing signal (white/red flashing light) should be above the ETCS block marker at the UP end of the platforms. --------- Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
TMACS is another australian system ([enwiki](https://en.wikipedia.org/wiki/Train_Management_and_Control_System) | [osmwiki](https://osm.wiki/Key:railway:tmacs)). Just like ATMS (#546), it uses GPS instead of Balises. To avoid a colour clash, i've used `#ffcc00`. This is a list of every colour used in Australia: * `#006eff` ETCS * `#cc0052` CBTC * `#43b54d` ATMS * `#884400` TWC * `#ffc0cb` TPWS * `#ffcc00` TMACS 🆕 <img width="1165" height="687" alt="image" src="https://github.com/user-attachments/assets/0e135eda-fa9d-42fd-9028-f60d9d48b6e7" /> <img width="1290" height="516" alt="image" src="https://github.com/user-attachments/assets/4595c1f8-1125-4451-9b0d-0827bdf23a27" />
~~Partially reverts #636 The background map does not load entirely through the changes in maplibre/maplibre-gl-js#6469, see comment maplibre/maplibre-gl-js#6469 (comment). Fixed in maplibre/maplibre-gl-js#6650, released in https://github.com/maplibre/maplibre-gl-js/releases/tag/v5.11.0. Closes #644 I also removed all unused javascript assets.
Fixes #645 If the platforms are included in a `stop_area` relation, they will be included in the station bubble as well. http://localhost:8000/#view=15.8/51.887194/4.552073: <img width="972" height="684" alt="image" src="https://github.com/user-attachments/assets/09539276-8e26-407b-b6b4-9f03afa83bf1" /> <img width="972" height="684" alt="image" src="https://github.com/user-attachments/assets/104491d6-99f7-4cf8-be71-c8241507419c" /> <img width="1160" height="825" alt="image" src="https://github.com/user-attachments/assets/27083aa9-263e-4f72-a073-ff51d1fa2506" /> http://localhost:8000/#view=17.41/52.283907/6.419948: <img width="1160" height="825" alt="image" src="https://github.com/user-attachments/assets/3a76f178-004d-483b-a1ad-7717ef8f1394" />
I added italian square main, distant and combined signal icons. They are used where signals are placed on the right of the track they reference to. I don't know how to test the updates to signals_railway_signals.yaml. I hope for the best. I proposed to split italian AVA.svg and AVV.svg substitute signal icons from primary signals they can be referenced to. I don't know if the this issue can be implemented: have a look to comments i wrote in signals_railway_signals.yaml. --------- Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Fixes #647 Berlin Friedrichstraße (http://localhost:8000/#view=16.89/52.520229/13.38747) looks like a work of art: <img width="1254" height="898" alt="image" src="https://github.com/user-attachments/assets/5e924554-d9aa-48ff-9023-00981160f98c" /> <img width="1254" height="898" alt="image" src="https://github.com/user-attachments/assets/1286109a-0a37-454f-8eb9-c4966bfae167" /> <img width="1254" height="898" alt="image" src="https://github.com/user-attachments/assets/4b1561ee-d52e-4f58-88ee-7c5fa1cb024f" /> Note that the 2 light_rail stop positions are tagged as `train = yes`, so they are rendered orange (for train) instead of green (light rail). Legend: <img width="377" height="483" alt="image" src="https://github.com/user-attachments/assets/fd13ca5b-5583-436c-96ac-1e9e7038b247" />
…gnal query (#659) Split off from #657 to make that PR a bit smaller. Part of #484, this improves performance importing signals. This pull request splits off the *direction* and *features* (*icons*) into separate views. During tile rendering, the `signals` table is joined with the direction and feature views to determine the signal direction and features for map display.
This PR adds all light signals for New South Wales (Australia), except `main` and `distant`, because those two are more complicated, like [the italian system](#639). See [the osmwiki page](https://osm.wiki/Australian_Tagging_Guidelines/Railway_Signals#NSW) for details. In Australia, there can be up to 6 `train_protection` signals on a single pole ([example](https://wiki.openstreetmap.org/wiki/File:NSW_Railway_Signal_full_example.jpg)), so we need to increase the limit from 5 to 6. <img width="112" height="136" alt="image" src="https://github.com/user-attachments/assets/1d6fdfe7-2852-4a07-a5ee-ab20996aaa16" /> <img width="71" height="97" alt="image" src="https://github.com/user-attachments/assets/90b04dff-5b99-41ca-98eb-c2cb33a7532a" /> <img width="78" height="102" alt="image" src="https://github.com/user-attachments/assets/cf86a095-2a3d-420a-9691-89ef66151066" /> <img width="204" height="169" alt="image" src="https://github.com/user-attachments/assets/4bd2fffa-1cf4-4075-9387-627f353ccb78" /> <img width="92" height="125" alt="image" src="https://github.com/user-attachments/assets/347fca1c-96c6-43e8-972d-41cd280ab506" /> <img width="172" height="212" alt="image" src="https://github.com/user-attachments/assets/53ab6a1f-48c1-4fc3-8d4a-ce744e3b7df7" /> <img width="47" height="82" alt="image" src="https://github.com/user-attachments/assets/d59126bd-0170-46e8-9686-b5158bbae3cb" /> <img width="101" height="98" alt="image" src="https://github.com/user-attachments/assets/5a82cbfe-bb11-4fdd-8823-eba239b25a98" /> <img width="134" height="154" alt="image" src="https://github.com/user-attachments/assets/8492f134-302c-4d73-9376-77fd261130ac" /> <img width="80" height="60" alt="image" src="https://github.com/user-attachments/assets/27e5cbc3-a8d7-43e0-bc41-97247db5ae83" /> <img width="94" height="116" alt="image" src="https://github.com/user-attachments/assets/f1859e73-bf34-4bf7-87d4-b2ad1cb03086" /> <img width="103" height="181" alt="image" src="https://github.com/user-attachments/assets/eb3b1009-6d85-440d-b860-9710f0f8791f" /> <img width="94" height="100" alt="image" src="https://github.com/user-attachments/assets/3322407b-a0aa-4963-8edb-4d2c89efa6aa" /> <img width="80" height="93" alt="image" src="https://github.com/user-attachments/assets/f5bff291-08b6-4690-b8c6-2583956d9014" /> <img width="82" height="114" alt="image" src="https://github.com/user-attachments/assets/177f9185-21b4-4462-8aec-70e35deaf0b4" /> Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Selecting the correct radio button from user configuration for the station labels in the settings UI was using the incorrect variable.
Part of #545 Requires decoupling the icon from the signal "feature". Goal: instead of duplicating the same signal features because they have similar tags but need different icons: ```yaml - description: 1ª categoria quadro (Avvio & Avanzamento) (1 light) country: IT icon: match: 'railway:signal:main:states' cases: - { any: ['(Y)', 'Y'], value: 'it/main-s-1v-AVV-AVA-Y' } - { exact: 'G', value: 'it/main-s-1v-AVV-AVA-G' } default: 'it/main-s-1v-AVV-AVA-R' tags: - { tag: 'railway:signal:main', value: 'IT:1V' } - { tag: 'railway:signal:main:form', value: 'light' } - { tag: 'railway:signal:main:shape', value: 'square' } - { tag: 'railway:signal:main:substitute_signal', all: ['IT:AVA', 'IT:AVV'] } - description: 1ª categoria quadro (Avanzamento) (1 light) country: IT icon: match: 'railway:signal:main:states' cases: - { any: ['(Y)', 'Y'], value: 'it/main-s-1v-AVA-Y' } - { exact: 'G', value: 'it/main-s-1v-AVA-G' } default: 'it/main-s-1v-AVA-R' tags: - { tag: 'railway:signal:main', value: 'IT:1V' } - { tag: 'railway:signal:main:form', value: 'light' } - { tag: 'railway:signal:main:shape', value: 'square' } - { tag: 'railway:signal:main:substitute_signal', value: 'IT:AVA' } ``` instead, allow multiple icons, composed with each other: ```yaml - description: 1ª categoria quadro (1 light) country: IT icon: - default: 'it/main-1v-s' - match: 'railway:signal:main:states' cases: - { any: ['(Y)', 'Y'], value: 'it/1v-Y' } - { exact: 'G', value: 'it/1v-G' } - { exact: 'R', value: 'it/1v-R' } - match: 'railway:signal:main:substitute_signal' cases: - { all: ['IT:AVA', 'IT:AVV'], value: 'it/AVV-AVA', description: 'Avvio & Avanzamento' } - { exact: 'IT:AVA', value: 'it/AVA', description: 'Avanzamento' } - { exact: 'IT:AVV', value: 'it/AVV', description: 'Avvio' } tags: - { tag: 'railway:signal:main', value: 'IT:1V' } - { tag: 'railway:signal:main:form', value: 'light' } - { tag: 'railway:signal:main:shape', value: 'square' } ``` (this example is only combining 2 signals, the Italian signals will have more variants composed together) For a full example, see #639 which has huge duplication because of the large variety in tagging. (A good thing, but currently the YAML configuration does not support such use cases well.) This requires changes in many different places: - [x] UI icon map rendering #656 - [x] Icon size determination - [x] Signal feature SQL - [x] YAML signal configuration - [x] Taginfo - [x] JOSM preset - [x] Documentation - [x] Signal feature performance - [x] Duplicated features in popup - [x] Make offsets work - [x] Split off commit 66a7eae into separate PR --> #659
Followup on #657 Features with multiple icons did not output their icon height correctly for non-center-positioned icons. Now the feature icon height is calculated as ``` max(max(centered) + sum(top_bottom), left_right) ``` with centered the height of centered icons, `top_bottom` the height of the top/bottom positioned icons, and `left_right` the left/right positioned icons. Tested on http://localhost:8000/#view=18.5/45.5409841/11.5417528&style=signals: Before: <img width="1275" height="574" alt="image" src="https://github.com/user-attachments/assets/d99aa4fb-2f50-4ddd-86ae-00037074cc28" /> After: <img width="1196" height="586" alt="image" src="https://github.com/user-attachments/assets/5e6f79b9-99bc-4ced-8e20-7cda5f8e06ad" />
Fixes #667 (http://localhost:8000/#view=19.33/50.4629604/4.6709142&style=signals): <img width="748" height="468" alt="image" src="https://github.com/user-attachments/assets/af484136-3610-469e-9b57-79582bf6f430" />
Fixes #630 Changes: - Support for T-144 and new T-144 signs - Support for T-270 - T272 signs for stop positions - Support for T-273 - T275 signs for train compositions Tampere (http://localhost:8000/#view=15.94/61.498645/23.774113/-43.1&style=signals): <img width="1091" height="980" alt="image" src="https://github.com/user-attachments/assets/275faf5c-9530-45dd-a719-0f9c30898cfb" /> Nokia (http://localhost:8000/#view=16.44/61.481815/23.501053&style=signals): <img width="1335" height="1004" alt="image" src="https://github.com/user-attachments/assets/eb04e71c-82c6-415f-9a42-ed4d1d459010" /> Note some signals have multiple stop signals tagged on a single node, which does not work.
Application of #657 for simplifying the IT icons. Related to #639 cc @MatCr90 this PR simplifies the icon setup for the IT main/combined/distant signals. (http://localhost:8000/#view=16.99/45.666447/11.936039&style=signals): <img width="1624" height="699" alt="image" src="https://github.com/user-attachments/assets/48a3e332-68df-4f73-a658-e08e47824f5a" /> (http://localhost:8000/#view=16.62/45.541332/11.539128&style=signals): <img width="1752" height="839" alt="image" src="https://github.com/user-attachments/assets/0cabc0ea-6044-4dd2-b39b-410da1583a48" /> (http://localhost:8000/#view=18.96/45.5404914/11.5740117&style=signals): <img width="757" height="502" alt="image" src="https://github.com/user-attachments/assets/e0e43b6e-71ab-4a4f-b4fa-e1916c223434" /> TODO: - [x] example icons for preset/taginfo
Fixes #662 Tested on http://localhost:8000/#view=14.97/31.1833/-82.38589 at Waycross. <img width="1420" height="929" alt="image" src="https://github.com/user-attachments/assets/2b371d62-8054-47b6-a3fa-2e39eae2c934" />
I changed the code of "2 lights italian distant signal icon" (avviso) to show the black and white pole, not correctly rendered. <img width="307" height="306" alt="screen" src="https://github.com/user-attachments/assets/4ecbd11f-4cce-49bf-83d1-59b1f1b8b33d" /> Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Eisenbahnen und Verkehrsbetriebe Elbe-Weser GmbH <img width="850" height="693" alt="image" src="https://github.com/user-attachments/assets/ac51bc57-7c74-413e-8555-425d0cc7abe3" /> SWEG Schienenwege (dark blue) <img width="1248" height="858" alt="image" src="https://github.com/user-attachments/assets/67f3c924-e3a3-44db-9eb9-4f328f68e100" /> Rennsteigbahn GmbH & Co. KG (Note: some of the ways need re-tagging so it won't immediately exactly look like that) <img width="677" height="737" alt="image" src="https://github.com/user-attachments/assets/e8ce4e81-dbee-4797-851f-5117280dd1f8" /> BayernBahn Infra <img width="604" height="792" alt="image" src="https://github.com/user-attachments/assets/a9d1cb08-77b5-4423-a7f3-255973171cc6" />
Related to #945 The OpenHistoricalMap features catalog do not have a view defined, but should still show the popup from the available properties data. <img width="951" height="443" alt="image" src="https://github.com/user-attachments/assets/3d17cc7e-7853-42e7-900f-e1a74ffefab3" />
Extracted from work in #674 by @MatisseBE When the map is pitched, 30 degrees or more, directional features such as signals are shown only for the faced direction. In the pitched view, signals within 75 degrees of the faced direction are shown. The signal direction icon will be hidden in the pitched view, as only the facing signals are visible on the map. First render: <img width="1433" height="992" alt="image" src="https://github.com/user-attachments/assets/c6d8f424-2eaa-4b03-8f44-656765d922dd" /> Codewise there is quite some duplication in the style, because of the different layers. using the same kind of data. With #865 that can be reduced. TODO: - [x] signals with both directions - [x] icons above track when in pitched mode - [x] direction for buffer stop signals - [x] legend
This fixes a bug in #946 (comment) The pitched style was always rendered not checking if the pitch is actually > 30 degrees. ## Without pitch (`pitch <= 30`) **This is fixed by this PR** http://localhost:8000/#view=17.72/49.987131/14.365661/-137.6&style=signals This PR | Previously --- |--- <img width="338" height="855" alt="image" src="https://github.com/user-attachments/assets/ac623a1b-2340-4001-a71f-8fd836782e6f" /> | <img width="338" height="855" alt="image" src="https://github.com/user-attachments/assets/d9b49e3e-9120-49f5-a755-b8d99b9ce432" /> Similar changes are also in the other layers with pitching implemented, e.g. *Electricity* and *Speed* ### With pitch (`pitch > 30`) **This is not changed by this PR** http://localhost:8000/#view=17.72/49.987131/14.365661/-139.6/52&style=signals This PR | Previously --- |--- <img width="338" height="855" alt="image" src="https://github.com/user-attachments/assets/324468d4-e093-4904-a084-b4ae05a5c517" /> | <img width="338" height="855" alt="image" src="https://github.com/user-attachments/assets/2408fba8-3747-49a0-bb03-4c62a683c3e2" />
Solves issue #956 Fix for a bug in #939 Rendering of non-signal POIs (`power_supply` and `isolated_track_section`) in the electrification layer was broken in #939. This PR fixes that. That PR was partially a preparation for #865 (Merging of signal layers). Rendering of POIs inside signal layers might need to be reworked again for #865. https://localhost:8000/#view=19.19/50.0866823/19.9330909&style=electrification | Before this fix | After this fix | | --- | --- | | <img width="840" height="697" alt="Image" src="https://github.com/user-attachments/assets/79c5968c-bf6a-4305-82f9-678213085ac7" /> | <img width="840" height="697" alt="Image" src="https://github.com/user-attachments/assets/27d75d03-36e0-4fc5-b4af-6669b137e724" /> |
This indicator is rare, and probably the only blue signal in Germany... :smile: It tells the driver about the state of the technical blockage (i.e. Indusi 2000hz magnet) to enter a line with simplified ruleset (Zugleitbetrieb aka. ZLB). It can either be blue (blockage on) or be flashing blue (blockage off). It does not indicate a driving permission! The permission to enter the line is gained via radio. It looks like this: <img width="426" height="329" alt="image" src="https://github.com/user-attachments/assets/9851b857-46ab-4729-9871-abf26e51e691" /> (cred: https://youtu.be/aEpg9_NU4Ak?t=1026) <img width="510" height="476" alt="image" src="https://github.com/user-attachments/assets/01c36332-daaa-4e01-b5a4-b871cfd1f106" /> (cred: https://youtu.be/kwirJdvKAH0?t=2852) btw: TUZ = technically assisted ZLB
FGV's color is the one present on their icon/logo https://commons.wikimedia.org/wiki/File:FGV_icono.svg https://commons.wikimedia.org/wiki/File:FGV.svg
Huge list of functional changes between January and May 2026. <img width="1430" height="1114" alt="image" src="https://github.com/user-attachments/assets/45ff1e88-ce19-4457-a1c1-c2927ab54245" />
Closes #869 This pull request adds support for stations without names, in the zooms where all stations are shown on the map. Stations without a name will show only a dot. http://localhost:8000/#view=12.47/34.36065/-3.01361: <img width="780" height="528" alt="image" src="https://github.com/user-attachments/assets/f62b9425-85c3-4534-85d1-06960b2f35ec" /> http://localhost:8000/#view=15.84/34.351932/-3.040193: <img width="780" height="528" alt="image" src="https://github.com/user-attachments/assets/85de77e7-f99e-4b3e-af14-d171268f9105" />
Followup from #960 which put the argument of the station name for high zooms in the operator layer in the wrong place.
Simplify the style expressions for rendering the guage coloring with the `interpolate-hcl` expression. <img width="1419" height="798" alt="image" src="https://github.com/user-attachments/assets/95efcd96-5d77-4ba4-935c-07d3cacca291" />
Move the generation of railway line labels for the infrastructure, electrification and gauge layers to the map style instead of the database. The speed label is an exception, it is generated with complex logic during data import. Additionally, the reference and name are not output in the low zoom tiles anymore, because there is no use for it in the tile rendering. http://localhost:8000/#view=16.33/55.565637/12.903312&style=electrification <img width="1229" height="384" alt="image" src="https://github.com/user-attachments/assets/6e2e5593-9541-4fe2-8267-6578a6c655f0" /> http://localhost:8000/#view=12.95/39.6525/-0.24478&style=track <img width="1431" height="780" alt="image" src="https://github.com/user-attachments/assets/93ad19b6-d013-4b51-8aaf-d3c376441670" /> http://localhost:8000/#view=15.42/55.565678/12.897913 <img width="1229" height="384" alt="image" src="https://github.com/user-attachments/assets/140ce289-d6b1-4e3d-a61b-25004baaba38" />
Fixes #951 In the Bordeaux-Saint-Jean station, http://localhost:8000/#view=17.57/44.825551/-0.555097: <img width="1009" height="627" alt="image" src="https://github.com/user-attachments/assets/f764099b-0536-445f-98bc-4415254e963a" />
The unit was correct, but the spherical projection was not taken into account. Fixes #974 Followup on #971 On http://localhost:8000/#view=17.74/44.825825/-0.555384, Bordeaux-Saint-Jean. Before: <img width="1019" height="448" alt="image" src="https://github.com/user-attachments/assets/525c3ba2-df5d-402f-92b0-5392c60e85a8" /> After: <img width="1019" height="448" alt="image" src="https://github.com/user-attachments/assets/6d34698a-bf1a-4ba9-a81f-bd4c2d18642d" />
This saves tile data for stations between zooms 8 and 13, and speed signals between 13 and 16, where not every feature is shown on the map. Magdeburg, speed layer: Zoom 12 http://localhost:8000/#view=12/52.1314/11.6568&style=speed <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/28d3ce4e-8cd1-4b28-a6c3-ae519121837d" /> Zoom 13 http://localhost:8000/#view=12/52.1314/11.6568&style=speed <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/4ab53498-3290-4f4c-a974-d5f3723499be" /> Zoom 14 http://localhost:8000/#view=14/52.12747/11.62723&style=speed <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/e791d937-ee7c-46a1-815e-6517ce1c1a04" /> Zoom 16 http://localhost:8000/#view=16/52.122952/11.625045&style=speed <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/a54f0ec1-c7b9-44cc-8c80-81a899c76822" /> Magdeburg, infrastructure layer: Zoom 8 http://localhost:8000/#view=8/52.131/11.657 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/6bbb922a-08da-4d11-a7d2-044ed9d3e11e" /> Zoom 9 http://localhost:8000/#view=9/52.131/11.657 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/2c315281-27db-4ac0-8db8-432a8718e431" /> Zoom 10 http://localhost:8000/#view=10/52.131/11.657 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/c7896dce-d25b-4164-9e02-7ff90acc5ed5" /> Zoom 11 http://localhost:8000/#view=11/52.131/11.657 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/e48ab783-d4a5-4166-8993-0b1e17ab557e" /> Zoom 12 http://localhost:8000/#view=12/52.131/11.657 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/f3027bfa-3ea6-4390-978d-0872d9c85479" /> Zoom 13 http://localhost:8000/#view=13/52.12989/11.63333 <img width="1028" height="778" alt="image" src="https://github.com/user-attachments/assets/1d4124a5-7b53-4b14-b720-f9ece987314d" />
This adds most railway signals of Luxembourg. The documentation can be found at https://wiki.openstreetmap.org/wiki/OpenRailwayMap/Tagging_in_Luxembourg - This includes every signal in Luxembourg currently tagged in OSM except for tram and foreign signals. - Signals RF6 and RF13 are included as symbols, but not yet implemented as signal features, as I want to wait for a new suitable signal category (#972). - Some other signals not yet tagged in OSM are still missing which I will add when encountering them in person. - The only previously implemented signals of Luxembourg were the catenary ones. I have replaced these to better match their actual design (as opposed to the French one). - This probably doesn't matter to anyone but me, but the SVGs are (except for letters and numbers) entirely written in a text editor which makes the source code compact and me happy. :) Due to the large number of signals, I will just show some screenshots for demonstration. Please ask if you have any questions regarding specific signals. Most of them can be seen around Luxembourg, Bettembourg, Ettelbruck and Dudelange-Ville station. <img width="401" height="553" alt="Screenshot 2026-05-26 193642" src="https://github.com/user-attachments/assets/ab431718-ec3b-436b-aead-2fadff6a483b" /><img width="355" height="319" alt="Screenshot 2026-05-26 193744" src="https://github.com/user-attachments/assets/fad21d46-7284-42ea-aa92-7358e94be847" /><img width="275" height="303" alt="Screenshot 2026-05-26 193819" src="https://github.com/user-attachments/assets/c703988d-4dcf-49d8-a9be-ba779ef3bf56" /><img width="289" height="536" alt="Screenshot 2026-05-26 193837" src="https://github.com/user-attachments/assets/1abc3ce5-4437-4f4e-bffd-1f66231f944d" /><img width="366" height="277" alt="Screenshot 2026-05-26 193852" src="https://github.com/user-attachments/assets/7252b76d-143b-4901-86db-d24e6d041453" /><img width="298" height="345" alt="Screenshot 2026-05-26 193912" src="https://github.com/user-attachments/assets/94b701bd-433f-497d-9dae-899cbe1fa25c" /><img width="169" height="148" alt="Screenshot 2026-05-26 193657" src="https://github.com/user-attachments/assets/e34d5a21-1d2a-4ff7-af15-cb053a29a467" /><img width="333" height="643" alt="Screenshot 2026-05-26 193728" src="https://github.com/user-attachments/assets/3bdae543-abf8-4189-b870-ab2e94ff5a11" /><img width="204" height="164" alt="Screenshot 2026-05-26 193753" src="https://github.com/user-attachments/assets/9f753f58-9a5a-4f71-8035-3f4ebcdecb58" /><img width="136" height="123" alt="Screenshot 2026-05-26 194048" src="https://github.com/user-attachments/assets/a0918b54-ac2c-4e91-98a3-eff0386c0c87" /><img width="763" height="284" alt="Screenshot 2026-05-26 193936" src="https://github.com/user-attachments/assets/914acddd-3b51-422d-b17a-3933b667ae4a" /><img width="283" height="463" alt="Screenshot 2026-05-26 193953" src="https://github.com/user-attachments/assets/a3e6ba69-4855-4553-b602-e605eed4abaf" /><img width="152" height="148" alt="Screenshot 2026-05-26 194013" src="https://github.com/user-attachments/assets/c56c9f3d-062f-4547-8af8-c55a3848960a" /><img width="264" height="243" alt="Screenshot 2026-05-26 194137" src="https://github.com/user-attachments/assets/b3afd038-377f-4dbe-ba26-1499785e4ae3" /><img width="239" height="257" alt="Screenshot 2026-05-26 194214" src="https://github.com/user-attachments/assets/91072645-6f7a-4560-8d8b-653f91da1c06" /><img width="188" height="169" alt="Screenshot 2026-05-26 194150" src="https://github.com/user-attachments/assets/60fe966d-f7cc-4eee-9458-90bbe5c7f9ba" /><img width="198" height="154" alt="Screenshot 2026-05-26 194120" src="https://github.com/user-attachments/assets/c6bde99d-85e5-4685-ace9-e71a5c94b75f" /><img width="115" height="104" alt="Screenshot 2026-05-26 194109" src="https://github.com/user-attachments/assets/6dc0b133-e4e7-4bf6-9901-d8cef172a9e0" /><img width="480" height="576" alt="Screenshot 2026-05-26 194939" src="https://github.com/user-attachments/assets/9f03d19d-450d-40cb-b262-d015ebf37fae" /><img width="507" height="577" alt="Screenshot 2026-05-26 194951" src="https://github.com/user-attachments/assets/dddead8f-3901-4788-9824-c2013fa8a4d6" /><img width="377" height="77" alt="Screenshot 2026-05-26 195000" src="https://github.com/user-attachments/assets/09e37a3d-464e-4adf-9938-09e0a58fa998" /><img width="479" height="264" alt="Screenshot 2026-05-26 194903" src="https://github.com/user-attachments/assets/8e1fb304-d9f0-464a-a728-740fc9285f17" />
http://localhost:8000/#view=16.95/52.498872/13.374558 <img width="1055" height="595" alt="image" src="https://github.com/user-attachments/assets/5a00f3fe-a3c9-4d2a-9173-43b6efaa2123" /> http://localhost:8000/#view=17.03/49.736383/13.353126 <img width="519" height="352" alt="image" src="https://github.com/user-attachments/assets/7c9f81c7-3093-456a-b30c-17c00cc26a99" />
Support for route and block sign signals in The Netherlands. Route signal, http://localhost:8000/#view=16.24/52.14363/6.183649/-89.9/58&style=signals <img width="583" height="538" alt="image" src="https://github.com/user-attachments/assets/17141c06-f3bb-4bb8-b34b-8cd2cec5af46" /> Block sign, http://localhost:8000/#view=13.91/52.10813/6.06694/-9.6/58&style=signals <img width="851" height="729" alt="image" src="https://github.com/user-attachments/assets/14a3e747-d023-440e-ad09-1aef6510497d" />
Fixes #978 http://localhost:8000/#view=17.28/49.005052/8.411097&date=1908 <img width="689" height="402" alt="image" src="https://github.com/user-attachments/assets/8d5224c5-93c5-4f95-b2c2-6167f3549e6c" /> Popup is now classifying the features as a way, not a node. Link now points to https://www.openhistoricalmap.org/way/199474787#date=1908-01-01&layers=R which does work.
http://localhost:8000/#view=17.99/49.542571/18.216584 <img width="940" height="603" alt="image" src="https://github.com/user-attachments/assets/f0038aeb-169c-4103-82c1-14c2e68fbed6" /> http://localhost:8000/#view=17.76/50.234833/12.859354&style=electrification <img width="1517" height="810" alt="image" src="https://github.com/user-attachments/assets/0532903a-c8bd-446d-8ed5-8df26c011f52" />
http://localhost:8000/#view=17.42/49.229176/16.531673&style=electrification <img width="1010" height="679" alt="image" src="https://github.com/user-attachments/assets/a5a08357-d011-41d8-8398-cbd81e09483b" />
The OSM data has been updated. Ensure the API tests run again.
Add color from the metro's logo Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Fixes #961 Ideally this can be solved more properly when maplibre/maplibre-gl-js#2108 is implemented, to render bridges and tunnels for multiple levels over each other in the correct order. http://localhost:8000/#view=17.55/52.499678/13.374688 <img width="1001" height="634" alt="image" src="https://github.com/user-attachments/assets/afd1434d-5f97-4cd9-904a-f4f4e0fc4624" />
Fixes #903 The same icon (circle, `general/station-small`), was always used for railway sites, even if they were historical or future. With this pull request the correct icon will be used in high zooms (>= 13) as well. Standard layer: http://localhost:8000/#view=12.79/51.16835/4.36332 <img width="762" height="708" alt="image" src="https://github.com/user-attachments/assets/75438076-46dc-451e-9605-169b52e62c24" /> http://localhost:8000/#view=15.17/51.171518/4.345346 <img width="762" height="708" alt="image" src="https://github.com/user-attachments/assets/b109bfa2-c00b-4740-8d94-0e23a99df706" /> Operator layer: http://localhost:8000/#view=14.7/51.17142/4.34895&style=operator <img width="762" height="708" alt="image" src="https://github.com/user-attachments/assets/bf0e4a1d-80c8-4ddc-bca7-211f29e8cccd" /> Route layer: http://localhost:8000/#view=15.08/51.17156/4.34562&style=route <img width="762" height="708" alt="image" src="https://github.com/user-attachments/assets/f4227dae-d6f5-458e-bd41-08d0163dae7c" />
Closes #549 ### Railway line states Railway lines under construction and proposed are shown from zooms 7 onwards. These are a single dashed line with the train protection under construction if defined, and otherwise the train protection. Present railway lines show one, two or three train protection systems present on the line, with dashes in multiple colors. If additionally a train protection system is under construction, it will be shown with dashes "around" the solid line. ### No train protection Previously there were explicit combinations configured for the case when one or more train protection tags were set to `no`. Instead, if no train protection system is matched, a check is done against all known tags. If any of the tags is `no`, and all tags which are not `no` are missing, the railway line is classified explicitly has having no train protection. ### Testing Single train protection (http://localhost:8000/#view=8.43/47.33/1.057/0/1&style=signals): <img width="786" height="340" alt="image" src="https://github.com/user-attachments/assets/ae88ab1a-7ae8-4050-b142-b5dd58ce1683" /> Dual train protection (http://localhost:8000/#view=13.76/49.3852/6.17502/90.4/33&style=signals): <img width="1362" height="502" alt="image" src="https://github.com/user-attachments/assets/4a1de05c-f9bb-4435-ab8d-1d794c2b0a5b" /> (http://localhost:8000/#view=13.41/49.55418/5.70635/0/1&style=signals) <img width="1362" height="502" alt="image" src="https://github.com/user-attachments/assets/a456a48f-6d2d-481e-b3d9-be214ee5e0cb" /> Triple train protection (http://localhost:8000/#view=14.81/38.4966/-8.14791/0/1&style=signals) <img width="1311" height="694" alt="image" src="https://github.com/user-attachments/assets/2be18b6e-a908-49dc-9cdc-7bf9386aa55f" /> Train protection under construction (http://localhost:8000/#view=11.43/49.2809/6.12&style=signals): <img width="1583" height="921" alt="image" src="https://github.com/user-attachments/assets/a937a328-e7ff-41a1-8f29-d3529e96ddae" /> (http://localhost:8000/#view=14.73/49.43786/5.62508/0/1&style=signals) <img width="1583" height="921" alt="image" src="https://github.com/user-attachments/assets/cc5f2f8c-2961-489b-9ae1-63b0371be474" /> No train protection, unknown train protection (http://localhost:8000/#view=14.94/49.23037/2.88653/0/1&style=signals): <img width="1657" height="536" alt="image" src="https://github.com/user-attachments/assets/6bba7916-d3a9-419c-841c-9f2723c6716a" /> Legend: <img width="1064" height="709" alt="image" src="https://github.com/user-attachments/assets/1c17e885-fcf3-4cb2-aa3d-928608fd001e" /> Country specific details: (South Korea, http://localhost:8000/#view=6.76/36.675/128.003/0/1&style=signals) <img width="573" height="700" alt="image" src="https://github.com/user-attachments/assets/801bc924-e064-4649-8104-cf2668f22019" /> (South Korea, http://localhost:8000/#view=10.24/36.3903/127.5182/0/1&style=signals) <img width="1613" height="932" alt="image" src="https://github.com/user-attachments/assets/ba88153c-58b9-4ab5-b506-5b3f454cf88d" /> (UK, London, http://localhost:8000/#view=14.27/51.50629/-0.09066/0/1&style=signals) <img width="1613" height="932" alt="image" src="https://github.com/user-attachments/assets/5a27fc77-8632-4678-9907-0fd8b8d2b9b4" /> (UK, Great Western Main Line, http://localhost:8000/#view=14.34/51.50855/-0.47537/0/1&style=signals) <img width="1613" height="932" alt="image" src="https://github.com/user-attachments/assets/b02f0ba0-ea0e-499c-864d-5c282ee80581" /> (Central Europe, construction of ETCS, http://localhost:8000/#view=5.06/51.25/10.24/0/1&style=signals) <img width="1613" height="969" alt="image" src="https://github.com/user-attachments/assets/deceefbf-debe-4db5-a36e-b48b8144115e" /> (USA, Philadelphia) <img width="1001" height="730" alt="image" src="https://github.com/user-attachments/assets/d9f432f9-3032-43d0-adad-4e3935f8d0f3" /> (Uruguay, construction of ETCS, http://localhost:8000/#view=6.99/-33.272/-56.044/0/1&style=signals) <img width="1613" height="969" alt="image" src="https://github.com/user-attachments/assets/34e003f8-e61d-4b76-8001-0173f0aa5b8a" />
added more short line freight railroads, added and updated colors for passenger railroads. --------- Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Part of #988 (http://localhost:8000/#view=15.1/52.39436/13.13404&style=electrification) <img width="1166" height="618" alt="image" src="https://github.com/user-attachments/assets/a0a77b3d-53d0-4e86-8a92-8efce9e7f361" />
Updated transportation entries for Portugal, including new operators and color adjustments. --------- Co-authored-by: Hidde Wieringa <hidde@hiddewieringa.nl>
Followup on #993 Closes #988 <img width="807" height="483" alt="image" src="https://github.com/user-attachments/assets/c59f94da-139e-4809-85ce-8352ca2fde41" /> Currently the individual voltages and frequencies are shown. When two voltages and two frequencies are tagged, the conversion is determined instead, formatted. At this moment the `frequency_conversion` is not used at this point. See https://wiki.openstreetmap.org/wiki/Proposal:Traction_substations_extension.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hi!
Over the past years I have been working on a fork of the OpenRailwayMap.
The announcement can be found on the OpenRailwayMap mailing list and on the OpenStreetMap community forum.
The fork has several features, and is actively being developed by me and several more contributors:
At the moment the fork is hosted on https://openrailwaymap.app using Fly.io. This is purely practical, it could be hosted anywhere else.
This pull request is a starter to discuss:
openrailwaymap.org?These are open questions, any response is appreciated!