see #21836 - Add some power/voltage validation rules:

- `voltage:primary/secondary/tertiary` without `transformer`
- `voltage:primary/secondary/tertiary` on a way
- `voltage:primary/secondary/tertiary` not in correct number format (should be in volts with no units/delimiter/spaces)
- don't warn about unknown numeric values of `voltage:primary/secondary/tertiary`
- `transformer` together with `voltage` on nodes
- `voltage:secondary` is lower than `voltage:primary` on `transformer=generator`
- deprecate `voltage-high` and `voltage-low` in favor of `voltage:primary/secondary`



git-svn-id: https://josm.openstreetmap.de/svn/trunk@18535 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: Klumbumbus

resources/data/validator/combinations.mapcss

@@ -10,6 +10,9 @@ way[surface=~/^(paved|asphalt|cobblestone|cobblestone:flattened|sett|concrete|co
 }
 
 /* {0.key} without {1.key} (warning level) */
+node[voltage:primary           ][!transformer],
+node[voltage:secondary         ][!transformer],
+node[voltage:tertiary          ][!transformer],
 way[junction                   ][!highway][junction!=yes][!area:highway],
 way[living_street              ][!highway],
 way[maintenance                ][!highway],
@@ -345,7 +348,8 @@ relation[type=multipolygon][area=no] {
   group: tr("suspicious tag combination");
 }
 
-/* {0.key} together with {1.key}, #18267, #17630, #17604 */
+/* {0.key} together with {1.key}, #18267, #17630, #17604, #21836 */
+node[transformer][voltage],
 node[marker][cover],
 node[marker][voltage],
 node[marker][pressure],
@@ -1060,3 +1064,9 @@ relation[piste:type=nordic][!piste:grooming]{
   assertMatch:   "relation piste:type=nordic";
   assertNoMatch: "relation piste:type=nordic piste:grooming=classic";
 }
+
+/* #21836 */
+*[voltage:primary][voltage:secondary][transformer=generator][tag("voltage:secondary")<tag("voltage:primary")] {
+  throwWarning: tr("{0} is lower than {1} on {2}.", "{1.key}", "{0.key}", "{2.tag}");
+  group: tr("suspicious tag combination");
+}

resources/data/validator/deprecated.mapcss

@@ -2381,4 +2381,13 @@ way[shoulder=none] {
   group: tr("deprecated tagging");
 }
 
+/* #21836 */
+*[voltage-high],
+*[voltage-low] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "voltage:primary";
+  suggestAlternative: "voltage:secondary";
+  group: tr("deprecated tagging");
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

resources/data/validator/geometry.mapcss

@@ -95,6 +95,9 @@ node[restriction] {
 }
 
 /* {0} on a way, should be a node */
+way[voltage:primary],
+way[voltage:secondary],
+way[voltage:tertiary],
 way[line_attachment],
 way[line_management],
 way[emergency=fire_hydrant],

resources/data/validator/ignoretags.cfg

@@ -135,6 +135,9 @@ E:traffic_sign
 E:building:levels
 E:distance
 E:voltage
+E:voltage:primary
+E:voltage:secondary
+E:voltage:tertiary
 E:amperage
 E:generator:output:electricity
 E:plant:output:electricity
@@ -726,6 +729,8 @@ E:pump:type
 K:substance=heat
 K:surface=decoturf
 K:school=entrance
+E:voltage-high
+E:voltage-low
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 
 ; see josm tickets: 17770 15309 15774 16315 16658 16793 19982

resources/data/validator/numeric.mapcss

@@ -372,7 +372,10 @@ way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|wa
   assertNoMatch: "way distance=7 mi";
 }
 
-way[voltage][voltage =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/] {
+way[voltage][voltage =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/],
+way[voltage:primary][voltage:primary =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/],
+way[voltage:secondary][voltage:secondary =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/],
+way[voltage:tertiary][voltage:tertiary =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/] {
   throwWarning: tr("voltage should be in volts with no units/delimiter/spaces");
   assertMatch: "way voltage=medium";
   assertNoMatch: "way voltage=15000";