Skip to content

Commit

Permalink
add signals for isolated overlaps
Browse files Browse the repository at this point in the history
  • Loading branch information
B. Mahrt committed Aug 30, 2024
1 parent dda1113 commit dd6ac94
Show file tree
Hide file tree
Showing 12 changed files with 597 additions and 1 deletion.
38 changes: 38 additions & 0 deletions josm-presets/de-signals-eso.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2244,6 +2244,44 @@ See https://wiki.openstreetmap.org/wiki/OpenRailwayMap for details.
de.text="Frequenz (falls angezeigt)"
/>
</item>
<item name="Isolated overlap signals" de.name="Elektrische Streckentrennung" icon="de/el-begin-isolated-overlap-30.png" type="node">
<label text="Isolated overlap signs" de.text="Elektrische Streckentrennung" />
<label text="This signal is being mapped as a node on the track." de.text="Wird als Punkt auf dem Gleis erfasst." />
<space />
<key key="railway"
value="signal" />
<check key="railway:signal:electricity:deactivated"
text="Out of order"
de.text="Ungültigkeitskreuz"
/>
<combo key="railway:signal:position"
text="Signal position"
de.text="Signalstandort"
values="left,right,overhead"
display_values="left in direction of OSM way,right in direction of OSM way,overhead (at catenary level)"
de.display_values="Links von Wegrichtung,Rechts von Wegrichtung,in der Oberleitung"
/>
<reference ref="direction_fw_bw" />
<space />
<key key="railway:signal:electricity"
value="DE-ESO:streckentrennung" />
<combo key="railway:signal:electricity:type"
text="Exact type"
de.text="Signaltyp"
values="begin_of_isolated_overlap,end_of_isolated_overlap"
display_values="Begin of isolated overlap,End of isolated overlap"
de.display_values="Beginn elektrische Streckentrennung,Ende elektrische Streckentrennung"
/>
<combo key="railway:signal:electricity:height"
text="Signal height"
de.text="Signalbauhöhe"
values="normal,dwarf"
display_values="normal,dwarf"
de.display_values="Mastbauform,Zwergsignal"
/>
<key key="railway:signal:electricity:form"
value="sign" />
</item>
<group name="Signals for Helper Engines (Ts)" de.name="Signale für Schiebelokomotiven und Sperrfahrten (Ts)">
<item name="Stop Banking (Ts 1)" de.name="Nachschieben einstellen (Ts 1)" icon="de/ts1-32.png" type="node">
<label text="Stop Banking (Ts 1)" de.text="Nachschieben einstellen" />
Expand Down
6 changes: 6 additions & 0 deletions locales/de_DE/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -937,3 +937,9 @@ msgstr "700mm"

msgid "Monorail"
msgstr "Einschienenbahn"

msgid "Begin of isolated overlap"
msgstr "Beginn elektrische Streckentrennung"

msgid "End of isolated overlap"
msgstr "Ende elektrische Streckentrennung"
4 changes: 3 additions & 1 deletion styles/electrified.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@
{ "%SIGNAL%":"el3", "%TYPE%":"pantograph_down_advance", "%CAPTION%":"El 3 \"Bügel ab\"-Ankündigungssignal" },
{ "%SIGNAL%":"el4", "%TYPE%":"pantograph_down", "%CAPTION%":"El 4 \"Bügel ab\"-Signal" },
{ "%SIGNAL%":"el5", "%TYPE%":"pantograph_up", "%CAPTION%":"El 5 \"Bügel an\"-Signal" },
{ "%SIGNAL%":"el6", "%TYPE%":"end_of_catenary", "%CAPTION%":"El 6 Halt für Fahrzeuge mit gehobenem Stromabnehmer" }
{ "%SIGNAL%":"el6", "%TYPE%":"end_of_catenary", "%CAPTION%":"El 6 Halt für Fahrzeuge mit gehobenem Stromabnehmer" },
{ "%SIGNAL%":"DE-ESO:streckentrennung", "%TYPE%":"begin_of_isolated_overlap", "%CAPTION%":"Beginn elektrische Streckentrennung" },
{ "%SIGNAL%":"DE-ESO:streckentrennung", "%TYPE%":"end_of_isolated_overlap", "%CAPTION%":"Ende elektrische Streckentrennung" }
],
"features": [{
"type": "Point",
Expand Down
50 changes: 50 additions & 0 deletions styles/electrified.mapcss
Original file line number Diff line number Diff line change
Expand Up @@ -464,3 +464,53 @@ node|z17-[railway=signal]["railway:signal:direction"]["railway:signal:electricit
icon-height: 18;
allow-overlap: true;
}

/***********************************************************************/
/* DE begin of isolated overlap */
/***********************************************************************/
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"]
{
z-index: 400;
icon-image: "icons/de/el-begin-isolated-overlap-sign-30.png";
icon-width: 11;
icon-height: 16;
allow-overlap: true;
}

/***********************************************************************/
/* DE end of isolated overlap */
/***********************************************************************/
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"]
{
z-index: 400;
icon-image: "icons/de/el-end-isolated-overlap-sign-30.png";
icon-width: 11;
icon-height: 16;
allow-overlap: true;
}

/***********************************************************************/
/* AT begin of isolated overlap */
/***********************************************************************/
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"],
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"]
{
z-index: 400;
icon-image: "icons/at/el-begin-isolated-overlap-sign-30.png";
icon-width: 11;
icon-height: 16;
allow-overlap: true;
}

/***********************************************************************/
/* AT end of isolated overlap */
/***********************************************************************/
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"],
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"]
{
z-index: 400;
icon-image: "icons/at/el-end-isolated-overlap-sign-30.png";
icon-width: 11;
icon-height: 16;
allow-overlap: true;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
137 changes: 137 additions & 0 deletions styles/icons/at/el-begin-isolated-overlap-sign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added styles/icons/at/el-end-isolated-overlap-sign-30.png
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 dd6ac94

Please sign in to comment.