Changeset 19467 in josm for trunk/resources/data/validator

Timestamp:

2026-01-16T11:11:30+01:00 (2 days ago)

Author:

stoecker

Message:

improve Power circuits relations presets and validation, fix #24456 - patch by francois.lacombe

Location:

trunk/resources/data/validator

Files:

• combinations.mapcss (modified) (2 diffs)
• deprecated.mapcss (modified) (1 diff)
• geometry.mapcss (modified) (2 diffs)
• ignoretags.cfg (modified) (1 diff)
• relation.mapcss (modified) (1 diff)

trunk/resources/data/validator/combinations.mapcss

@@ -307 +307 @@
 node[power=transformer][voltage],
 node[transformer=distribution][voltage][power=pole],
+relation[power=circuit][wires],
+relation[power=line_section][wires],
 *[amenity=vending_machine][shop],
 *[noname?][name],
@@ -1138 +1140 @@
   assertNoMatch: "way highway=primary oneway=yes bicycle:lanes=no|designated|yes cycleway:lanes=|lane|no";
 }
+
+/* Prevent redundancy between relation and members, see #24456, #24457 */
+relation[power=circuit] > way[power=line][frequency],
+relation[power=circuit] > way[power=minor_line][frequency],
+relation[power=circuit] > way[power=cable][frequency] {
+  throwWarning: tr("Frequency tag should be on the circuit relation only, not on the power segment");
+  group: tr("redundant tagging");
+}
+relation[power=circuit] > relation[power=line_section][frequency] {  
+  throwWarning: tr("Frequency tag should be on the circuit relation only, not on the power section");
+  group: tr("redundant tagging");
+}
+
+/* Invalid topology with power circuit relation, see #24456 */
+relation[power=circuit][topology][topology!~/^(linear|branched)$/] {
+       throwError: tr("power=circuit relations should have a topology tag with value linear or branched");
+       assertMatch: "relation type=power power=circuit topology=branch";
+       assertNoMatch: "relation type=power power=circuit topology=branched";

trunk/resources/data/validator/deprecated.mapcss

@@ -2584 +2584 @@
 }
 
+/* route=power is deprecated, see #24456 */
+relation[route=power] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "type=power + power=circuit";
+}
+relation[power=branch] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "type=power + power=line_section";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/geometry.mapcss

@@ -91 +91 @@
 node[interval],
 node[route],
-node[restriction] {
+node[restriction],
+node[power=circuit],
+node[power=line_section] {
   throwError: tr("{0} on a node. Should be used in a relation", "{0.tag}"); 
 }
@@ -140 +142 @@
 way[type=multipolygon],
 way[interval][route!=ferry],
-way[route=bus] {
+way[route=bus],
+way[power=circuit],
+way[power=line_section] {
   throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 
 }
 
 /* {0} on a closed way, should be a unclosed way; #19981 */
-way:closed[power=line] {
+way:closed[power=line],
+way:closed[power=cable],
+way:closed[power=minor_line] {
   throwWarning: tr("{0} on a closed way. Should be used on an unclosed way.", "{1.tag}"); 
 }

trunk/resources/data/validator/ignoretags.cfg

@@ -826 +826 @@
 ; This seems to be a region specific tag.
 K:valley=balka
+K:route=power
+K:power=branch
 
 ; These tags should probably have better software support, but maybe they can be in the appropriate section in this file.

trunk/resources/data/validator/relation.mapcss

@@ -72 +72 @@
   group: tr("suspicious tag combination");
 }
+
+/* Power relations, #24456 */
+relation[type=power][!power],
+relation[type=power][power][power!~/^(circuit|line_section)$/] {
+       throwError: tr("Power relation misses or combined to wrong power=* value");
+       assertMatch: "relation type=power";
+  assertMatch: "relation type=power power=line";
+       assertNoMatch: "relation type=power power=circuit";
+}