Skip to content

Commit dd6ac94

Browse files
author
B. Mahrt
committed
add signals for isolated overlaps
1 parent dda1113 commit dd6ac94

12 files changed

+597
-1
lines changed

‎josm-presets/de-signals-eso.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,6 +2244,44 @@ See https://wiki.openstreetmap.org/wiki/OpenRailwayMap for details.
22442244
de.text="Frequenz (falls angezeigt)"
22452245
/>
22462246
</item>
2247+
<item name="Isolated overlap signals" de.name="Elektrische Streckentrennung" icon="de/el-begin-isolated-overlap-30.png" type="node">
2248+
<label text="Isolated overlap signs" de.text="Elektrische Streckentrennung" />
2249+
<label text="This signal is being mapped as a node on the track." de.text="Wird als Punkt auf dem Gleis erfasst." />
2250+
<space />
2251+
<key key="railway"
2252+
value="signal" />
2253+
<check key="railway:signal:electricity:deactivated"
2254+
text="Out of order"
2255+
de.text="Ungültigkeitskreuz"
2256+
/>
2257+
<combo key="railway:signal:position"
2258+
text="Signal position"
2259+
de.text="Signalstandort"
2260+
values="left,right,overhead"
2261+
display_values="left in direction of OSM way,right in direction of OSM way,overhead (at catenary level)"
2262+
de.display_values="Links von Wegrichtung,Rechts von Wegrichtung,in der Oberleitung"
2263+
/>
2264+
<reference ref="direction_fw_bw" />
2265+
<space />
2266+
<key key="railway:signal:electricity"
2267+
value="DE-ESO:streckentrennung" />
2268+
<combo key="railway:signal:electricity:type"
2269+
text="Exact type"
2270+
de.text="Signaltyp"
2271+
values="begin_of_isolated_overlap,end_of_isolated_overlap"
2272+
display_values="Begin of isolated overlap,End of isolated overlap"
2273+
de.display_values="Beginn elektrische Streckentrennung,Ende elektrische Streckentrennung"
2274+
/>
2275+
<combo key="railway:signal:electricity:height"
2276+
text="Signal height"
2277+
de.text="Signalbauhöhe"
2278+
values="normal,dwarf"
2279+
display_values="normal,dwarf"
2280+
de.display_values="Mastbauform,Zwergsignal"
2281+
/>
2282+
<key key="railway:signal:electricity:form"
2283+
value="sign" />
2284+
</item>
22472285
<group name="Signals for Helper Engines (Ts)" de.name="Signale für Schiebelokomotiven und Sperrfahrten (Ts)">
22482286
<item name="Stop Banking (Ts 1)" de.name="Nachschieben einstellen (Ts 1)" icon="de/ts1-32.png" type="node">
22492287
<label text="Stop Banking (Ts 1)" de.text="Nachschieben einstellen" />

‎locales/de_DE/LC_MESSAGES/messages.po

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,3 +937,9 @@ msgstr "700mm"
937937

938938
msgid "Monorail"
939939
msgstr "Einschienenbahn"
940+
941+
msgid "Begin of isolated overlap"
942+
msgstr "Beginn elektrische Streckentrennung"
943+
944+
msgid "End of isolated overlap"
945+
msgstr "Ende elektrische Streckentrennung"

‎styles/electrified.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@
151151
{ "%SIGNAL%":"el3", "%TYPE%":"pantograph_down_advance", "%CAPTION%":"El 3 \"Bügel ab\"-Ankündigungssignal" },
152152
{ "%SIGNAL%":"el4", "%TYPE%":"pantograph_down", "%CAPTION%":"El 4 \"Bügel ab\"-Signal" },
153153
{ "%SIGNAL%":"el5", "%TYPE%":"pantograph_up", "%CAPTION%":"El 5 \"Bügel an\"-Signal" },
154-
{ "%SIGNAL%":"el6", "%TYPE%":"end_of_catenary", "%CAPTION%":"El 6 Halt für Fahrzeuge mit gehobenem Stromabnehmer" }
154+
{ "%SIGNAL%":"el6", "%TYPE%":"end_of_catenary", "%CAPTION%":"El 6 Halt für Fahrzeuge mit gehobenem Stromabnehmer" },
155+
{ "%SIGNAL%":"DE-ESO:streckentrennung", "%TYPE%":"begin_of_isolated_overlap", "%CAPTION%":"Beginn elektrische Streckentrennung" },
156+
{ "%SIGNAL%":"DE-ESO:streckentrennung", "%TYPE%":"end_of_isolated_overlap", "%CAPTION%":"Ende elektrische Streckentrennung" }
155157
],
156158
"features": [{
157159
"type": "Point",

‎styles/electrified.mapcss

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,3 +464,53 @@ node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricit
464464
icon-height: 18;
465465
allow-overlap: true;
466466
}
467+
468+
/***********************************************************************/
469+
/* DE begin of isolated overlap */
470+
/***********************************************************************/
471+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="DE-ESO:streckentrennung"]["railway:signal:electricity:type"="begin_of_isolated_overlap"]["railway:signal:electricity:form"="sign"]
472+
{
473+
z-index: 400;
474+
icon-image: "icons/de/el-begin-isolated-overlap-sign-30.png";
475+
icon-width: 11;
476+
icon-height: 16;
477+
allow-overlap: true;
478+
}
479+
480+
/***********************************************************************/
481+
/* DE end of isolated overlap */
482+
/***********************************************************************/
483+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="DE-ESO:streckentrennung"]["railway:signal:electricity:type"="end_of_isolated_overlap"]["railway:signal:electricity:form"="sign"]
484+
{
485+
z-index: 400;
486+
icon-image: "icons/de/el-end-isolated-overlap-sign-30.png";
487+
icon-width: 11;
488+
icon-height: 16;
489+
allow-overlap: true;
490+
}
491+
492+
/***********************************************************************/
493+
/* AT begin of isolated overlap */
494+
/***********************************************************************/
495+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="AT-V2:bahnhof-streckentrennung_anfang"]["railway:signal:electricity:type"="begin_of_isolated_overlap"]["railway:signal:electricity:form"="sign"],
496+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="AT-V2:bahnhof-streckentrennung_anfang"]["railway:signal:electricity:type"="pantograph_down"]["railway:signal:electricity:form"="sign"]
497+
{
498+
z-index: 400;
499+
icon-image: "icons/at/el-begin-isolated-overlap-sign-30.png";
500+
icon-width: 11;
501+
icon-height: 16;
502+
allow-overlap: true;
503+
}
504+
505+
/***********************************************************************/
506+
/* AT end of isolated overlap */
507+
/***********************************************************************/
508+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="AT-V2:bahnhof-streckentrennung_ende"]["railway:signal:electricity:type"="end_of_isolated_overlap"]["railway:signal:electricity:form"="sign"],
509+
node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricity"="AT-V2:bahnhof-streckentrennung_ende"]["railway:signal:electricity:type"="pantograph_up"]["railway:signal:electricity:form"="sign"]
510+
{
511+
z-index: 400;
512+
icon-image: "icons/at/el-end-isolated-overlap-sign-30.png";
513+
icon-width: 11;
514+
icon-height: 16;
515+
allow-overlap: true;
516+
}

‎styles/icons/at/el-begin-isolated-overlap-sign-30.png

531 Bytes
Loading

‎styles/icons/at/el-begin-isolated-overlap-sign.svg

Lines changed: 137 additions & 0 deletions
Loading

‎styles/icons/at/el-end-isolated-overlap-sign-30.png

875 Bytes
Loading

0 commit comments

Comments
 (0)