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

Timestamp:

2020-10-24T18:52:34+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #19383 - Add line_management to power support presets, warn about line_management on ways, deprecate pole:type and power related tower:type values

Location:

trunk/resources/data/validator

Files:

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

trunk/resources/data/validator/deprecated.mapcss

@@ -1800 +1800 @@
 }
 
-/* #17984 */
+/* #17984, #19383 */
 *[tower:type=anchor],
 *[tower:type=suspension] {
@@ -1806 +1806 @@
   suggestAlternative: concat("line_attachment=", "{0.value}");
   fixChangeKey: "tower:type => line_attachment";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=branch][branch:type=split],
+*[tower:type=branch][branch:type=loop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=split";
+  fixAdd: "line_management=split";
+  fixRemove: "tower:type";
+  fixRemove: "branch:type";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=branch][!branch:type],
+*[tower:type=branch][branch:type=tap] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=branch";
+  fixAdd: "line_management=branch";
+  fixRemove: "tower:type";
+  fixRemove: "branch:type";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=branch][branch:type=cross] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=cross";
+  fixAdd: "line_management=cross";
+  fixRemove: "tower:type";
+  fixRemove: "branch:type";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=termination] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=termination";
+  fixAdd: "line_management=termination";
+  fixRemove: "tower:type";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=transposing] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=transpose";
+  fixAdd: "line_management=transpose";
+  fixRemove: "tower:type";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type=crossing] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "height=* + design=*";
+  set power_tower_type_warning;
+  group: tr("deprecated tagging");
+}
+*[tower:type][power][power=~/^(tower|pole|insulator|portal|terminal)$/]!.power_tower_type_warning {
+  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
+  suggestAlternative: "design";
+  suggestAlternative: "structure";
+  suggestAlternative: "line_management";
+  suggestAlternative: "line_attachment";
+  set generic_power_tower_type_warning;
   group: tr("deprecated tagging");
 }
@@ -1813 +1874 @@
   suggestAlternative: concat("line_attachment=", "{0.value}");
   fixChangeKey: "pole:type => line_attachment";
+  set power_pole_type_warning;
+  group: tr("deprecated tagging");
+}
+node[pole:type=branch][branch:type=split],
+node[pole:type=branch][branch:type=loop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=split";
+  fixAdd: "line_management=split";
+  fixRemove: "pole:type";
+  fixRemove: "branch:type";
+  set power_pole_type_warning;
+  group: tr("deprecated tagging");
+}
+node[pole:type=branch][!branch:type],
+node[pole:type=branch][branch:type=tap] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=branch";
+  fixAdd: "line_management=branch";
+  fixRemove: "pole:type";
+  fixRemove: "branch:type";
+  set power_pole_type_warning;
+  group: tr("deprecated tagging");
+}
+node[pole:type=branch][branch:type=cross] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=cross";
+  fixAdd: "line_management=cross";
+  fixRemove: "pole:type";
+  fixRemove: "branch:type";
+  set power_pole_type_warning;
+  group: tr("deprecated tagging");
+}
+node[pole:type=termination] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "line_management=termination";
+  fixAdd: "line_management=termination";
+  fixRemove: "pole:type";
+  set power_pole_type_warning;
+  group: tr("deprecated tagging");
+}
+*[pole:type][power][power=~/^(tower|pole|insulator|portal|terminal)$/]!.power_pole_type_warning!.generic_power_tower_type_warning {
+  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
+  suggestAlternative: "line_management";
+  suggestAlternative: "line_attachment";
   group: tr("deprecated tagging");
 }

trunk/resources/data/validator/geometry.mapcss

@@ -97 +97 @@
 /* {0} on a way, should be a node */
 way[line_attachment],
+way[line_management],
 way[emergency=fire_hydrant],
 way[emergency=defibrillator],

trunk/resources/data/validator/ignoretags.cfg

@@ -665 +665 @@
 E:recycling:metal
 K:shop=dog_grooming
-K:tower:type=anchor
-K:tower:type=suspension
-K:pole:type=anchor
-K:pole:type=suspension
 K:man_made=pipeline_marker
 K:pipeline=marker
@@ -706 +702 @@
 K:cuisine=bbq
 K:cuisine=BBQ
+E:pole:type
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)