Changeset 17025 in josm

Timestamp:

2020-09-14T17:40:39+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19747 - Warn about electrified=no together with voltage or frequency on railway ways, add frequency=25 to presets

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (2 diffs)
• validator/combinations.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -82 +82 @@
         <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
         <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25" length="5" />
         <reference ref="highway_yesno" />
     </chunk>
@@ -347 +347 @@
     </chunk>
     <chunk id="frequency">
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25,50,60" length="5" />
     </chunk>
     <chunk id="voltage_frequency">

trunk/resources/data/validator/combinations.mapcss

@@ -308 +308 @@
 }
 
+/* {0.key} together with {1.tag} and {2.key}, #19747 */
+way[railway][electrified=no][frequency],
+way[railway][electrified=no][voltage] {
+  throwWarning: tr("{0} together with {1} and {2}", "{0.key}", "{1.tag}", "{2.key}");
+  group: tr("suspicious tag combination");
+}
+
 /* #11127, #13727 */
 way[waterway][bridge=yes][waterway!=weir] {