Skip to content

Commit 49e7169

Browse files
hiddewiehiddewie
committed
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 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
1 parent 3b91755 commit 49e7169

8 files changed

+1863
-1
lines changed

‎maxspeed_signals.mss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -884,5 +884,14 @@
884884
marker-width: 11;
885885
marker-height: 16;
886886
}
887+
888+
/**********************************************/
889+
/* NL speed limit light (part of main signal) */
890+
/**********************************************/
891+
["feature"="NL"]["signal_speed_limit_form"="light"] {
892+
marker-width: 16;
893+
marker-height: 16;
894+
marker-file: url('symbols/nl/speed_limit_light.svg');
895+
}
887896
}
888897
}

‎signals.mml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ Layer:
294294
tags->'railway:signal:crossing_distant',
295295
tags->'railway:signal:crossing',
296296
tags->'railway:signal:ring',
297-
tags->'railway:signal:whistle'
297+
tags->'railway:signal:whistle',
298+
tags->'railway:signal:departure',
299+
tags->'railway:signal:main_repeated'
298300
) AS feature,
299301
tags->'railway:signal:passing:caption' AS passing_caption,
300302
tags->'railway:signal:stop:caption' AS stop_caption,
@@ -315,6 +317,7 @@ Layer:
315317
tags->'railway:signal:crossing:deactivated' AS crossing_deactivated,
316318
tags->'railway:signal:ring:deactivated' AS ring_deactivated,
317319
tags->'railway:signal:whistle:deactivated' AS whistle_deactivated,
320+
tags->'railway:signal:departure:deactivated' AS departure_deactivated,
318321
tags->'railway:signal:combined:form' AS combined_form,
319322
tags->'railway:signal:main:form' AS main_form,
320323
tags->'railway:signal:distant:form' AS distant_form,
@@ -330,6 +333,7 @@ Layer:
330333
tags->'railway:signal:crossing:form' AS crossing_form,
331334
tags->'railway:signal:ring:form' AS ring_form,
332335
tags->'railway:signal:whistle:form' AS whistle_form,
336+
tags->'railway:signal:departure:form' AS departure_form,
333337
tags->'railway:signal:combined:height' AS combined_height,
334338
tags->'railway:signal:main:height' AS main_height,
335339
tags->'railway:signal:distant:height' AS distant_height,
@@ -344,6 +348,7 @@ Layer:
344348
tags->'railway:signal:crossing:height' AS crossing_height,
345349
tags->'railway:signal:ring:height' AS ring_height,
346350
tags->'railway:signal:whistle:height' AS whistle_height,
351+
tags->'railway:signal:departure:height' AS departure_height,
347352
tags->'railway:signal:combined:states' AS combined_states,
348353
tags->'railway:signal:main:states' AS main_states,
349354
tags->'railway:signal:distant:states' AS distant_states,
@@ -358,6 +363,8 @@ Layer:
358363
tags->'railway:signal:crossing:states' AS crossing_states,
359364
tags->'railway:signal:ring:states' AS ring_states,
360365
tags->'railway:signal:whistle:states' AS whistle_states,
366+
tags->'railway:signal:departure:states' AS departure_states,
367+
tags->'railway:signal:main_repeated:states' AS main_repeated_states,
361368
tags->'railway:signal:combined:repeated' AS combined_repeated,
362369
tags->'railway:signal:main:repeated' AS main_repeated,
363370
tags->'railway:signal:distant:repeated' AS distant_repeated,
@@ -372,6 +379,7 @@ Layer:
372379
tags->'railway:signal:crossing:repeated' AS crossing_repeated,
373380
tags->'railway:signal:ring:repeated' AS ring_repeated,
374381
tags->'railway:signal:whistle:repeated' AS whistle_repeated,
382+
tags->'railway:signal:departure:repeated' AS departure_repeated,
375383
tags->'railway:signal:combined:shortened' AS combined_shortened,
376384
tags->'railway:signal:main:shortened' AS main_shortened,
377385
tags->'railway:signal:distant:shortened' AS distant_shortened,
@@ -386,6 +394,7 @@ Layer:
386394
tags->'railway:signal:crossing:shortened' AS crossing_shortened,
387395
tags->'railway:signal:ring:shortened' AS ring_shortened,
388396
tags->'railway:signal:whistle:shortened' AS whistle_shortened,
397+
tags->'railway:signal:departure:shortened' AS departure_shortened,
389398
tags->'railway:signal:combined:only_transit' AS combined_only_transit,
390399
tags->'railway:signal:main:only_transit' AS main_only_transit,
391400
tags->'railway:signal:distant:only_transit' AS distant_only_transit,
@@ -400,6 +409,7 @@ Layer:
400409
tags->'railway:signal:crossing:only_transit' AS crossing_only_transit,
401410
tags->'railway:signal:ring:only_transit' AS ring_only_transit,
402411
tags->'railway:signal:whistle:only_transit' AS whistle_only_transit,
412+
tags->'railway:signal:departure:only_transit' AS departure_only_transit,
403413
tags->'railway:signal:combined:type' AS combined_type,
404414
tags->'railway:signal:main:type' AS main_type,
405415
tags->'railway:signal:distant:type' AS distant_type,
@@ -414,6 +424,7 @@ Layer:
414424
tags->'railway:signal:crossing:type' AS crossing_type,
415425
tags->'railway:signal:ring:type' AS ring_type,
416426
tags->'railway:signal:whistle:type' AS whistle_type,
427+
tags->'railway:signal:departure:type' AS departure_type,
417428
tags->'railway:signal:train_protection:shape' AS train_protection_shape
418429
FROM openrailwaymap_osm_signals
419430
WHERE
@@ -422,6 +433,7 @@ Layer:
422433
ORDER BY
423434
-- distant signals are less important, signals for slower speeds are more important
424435
(CASE
436+
WHEN railway_has_key(tags, 'railway:signal:departure') THEN 15000
425437
WHEN railway_has_key(tags, 'railway:signal:main') THEN 10000
426438
WHEN railway_has_key(tags, 'railway:signal:combined') THEN 10000
427439
WHEN railway_has_key(tags, 'railway:signal:distant') THEN 9000

‎signals.mss

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,25 @@ Format details:
842842
}
843843
}
844844

845+
/****************************/
846+
/* NL distant light signals */
847+
/****************************/
848+
["feature"="NL"]["distant_form"="light"] {
849+
::text {
850+
text-name: [ref];
851+
text-dy: 12;
852+
text-fill: @signal-text-fill;
853+
text-halo-radius: @signal-text-halo-radius;
854+
text-halo-fill: @signal-text-halo-fill;
855+
text-face-name: @bold-fonts;
856+
text-size: 10;
857+
}
858+
859+
marker-width: 9;
860+
marker-height: 19;
861+
marker-file: url('symbols/nl/distant_light.svg');
862+
}
863+
845864
/************************************************/
846865
/* DE distant signal replacement by sign So 106 */
847866
/* AT Kreuztafel */
@@ -1325,4 +1344,62 @@ Format details:
13251344
}
13261345
}
13271346
}
1347+
1348+
/*************************/
1349+
/* NL main light signals */
1350+
/*************************/
1351+
["feature"="NL"]["main_form"="light"] {
1352+
::text {
1353+
text-name: [ref];
1354+
text-dy: 12;
1355+
text-fill: @signal-text-fill;
1356+
text-halo-radius: @signal-text-halo-radius;
1357+
text-halo-fill: @signal-text-halo-fill;
1358+
text-face-name: @bold-fonts;
1359+
text-size: 10;
1360+
}
1361+
1362+
marker-width: 9;
1363+
marker-height: 19;
1364+
marker-file: url('symbols/nl/main_light.png');
1365+
}
1366+
1367+
/**********************************/
1368+
/* NL repeated main light signals */
1369+
/**********************************/
1370+
["feature"="NL"]["main_repeated_states"="NL:272;NL:273"] {
1371+
::text {
1372+
text-name: [ref];
1373+
text-dy: 12;
1374+
text-fill: @signal-text-fill;
1375+
text-halo-radius: @signal-text-halo-radius;
1376+
text-halo-fill: @signal-text-halo-fill;
1377+
text-face-name: @bold-fonts;
1378+
text-size: 10;
1379+
}
1380+
1381+
marker-width: 12;
1382+
marker-height: 18;
1383+
marker-file: url('symbols/nl/main_repeated_light.svg');
1384+
}
1385+
1386+
/******************************/
1387+
/* NL departure light signals */
1388+
/******************************/
1389+
["feature"="NL"]["departure_form"="light"],
1390+
["feature"="NL:VL"]["departure_form"="light"] {
1391+
::text {
1392+
text-name: [ref];
1393+
text-dy: 12;
1394+
text-fill: @signal-text-fill;
1395+
text-halo-radius: @signal-text-halo-radius;
1396+
text-halo-fill: @signal-text-halo-fill;
1397+
text-face-name: @bold-fonts;
1398+
text-size: 10;
1399+
}
1400+
1401+
marker-width: 9;
1402+
marker-height: 18;
1403+
marker-file: url('symbols/nl/departure.svg');
1404+
}
13281405
}

‎symbols/nl/departure.svg

Lines changed: 130 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)