Ticket #23005: josm_23005.patch

resources/data/defaultpresets.xml

@@ -2599 +2599 @@
             <link wiki="Tag:railway=turntable" />
             <key key="railway" value="turntable" />
         </item> <!-- Turntable -->
+        <item name="Derail" icon="presets/transport/railway/derail.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:railway=derail" />
+            <key key="railway" value="derail" />
+            <reference ref="ref_operator"/>
+        </item>  <!-- Derail -->
         <item name="Buffer Stop" icon="presets/transport/railway/buffer_stop.svg" type="node" preset_name_label="true">
             <link wiki="Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />

resources/data/validator/geometry.mapcss

@@ -276 +276 @@
 node:unconnected:in-downloaded-area[railway=milestone],
 node:unconnected:in-downloaded-area[railway=crossing],
 node:unconnected:in-downloaded-area[railway=level_crossing],
+node:unconnected:in-downloaded-area[railway=derail],
 node:unconnected:in-downloaded-area[railway=buffer_stop],
 node:unconnected:in-downloaded-area[public_transport=stop_position],
 node:unconnected:in-downloaded-area[aeroway=holding_position],

resources/data/validator/ignoretags.cfg

@@ -770 +770 @@
 K:hedge=hedge_bank
 K:highway=corridor
 K:historic=bomb_crater
+E:roof:levels
 ; May be duplicate of older tagging, `hiking=yes` + `bicycle=yes` versus `guidepost=hiking;bicycle`
 E:guidepost
 K:indoor=area

resources/images/presets/transport/railway/derail.svg

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="derail3.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="6.4910483"
+     inkscape:cy="9.4670139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:document-rotation="0"
+     inkscape:window-width="1333"
+     inkscape:window-height="1080"
+     inkscape:window-x="2194"
+     inkscape:window-y="124"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.484258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1611"
+       width="14.515741"
+       height="1.809513"
+       x="0.26422629"
+       y="1046.245" />
+    <path
+       style="fill:#d60000;fill-opacity:1;stroke:#000000;stroke-width:0.190365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.9358997,1045.9101 0.022837,-0.787 c 0.4799083,-0.1548 1.2307454,-0.5592 1.6827609,-0.9517 0.3992739,-0.3467 1.1873859,-1.2547 1.3585024,-1.8093 h 4.085468 v 3.548 z"
+       id="path1607"
+       sodipodi:nodetypes="ccscccc" />
+  </g>
+</svg>

resources/styles/standard/elemstyles.mapcss

@@ -4295 +4295 @@
     icon-image: "presets/transport/railway/turntable.svg";
     set icon_z17;
 }
+node[railway=derail] {
+    icon-image: "presets/transport/railway/derail.svg";
+    set icon_z17;
+}
 node[railway=buffer_stop] {
     icon-image: "presets/transport/railway/buffer_stop.svg";
     set icon_z17;