Changeset 15715 in josm

Timestamp:

2020-01-17T21:00:40+01:00 (4 years ago)

Author:

Klumbumbus

Message:

• fix #18571 - deprecate unnamed=yes in favor of noname=yes
• fix #18572, see #16458 - add guidepost role to other route relation presets too
• fix #18573 - add isced:level to education presets

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (10 diffs)
• validator/deprecated.mapcss (modified) (1 diff)
• validator/ignoretags.cfg (modified) (1 diff)
• validator/numeric.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -468 +468 @@
      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
+     <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
   </chunk>
   <chunk id="route_start_stop_roles">
@@ -3676 +3677 @@
             <reference ref="min_age" />
             <reference ref="max_age" />
+            <combo key="isced:level" text="ISCED level" values="0" />
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
@@ -3685 +3687 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="min_age" />
+            <multiselect key="isced:level" text="ISCED level" values="0;1;2;3;4" />
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
@@ -3693 +3696 @@
             <key key="amenity" value="university" />
             <reference ref="name_operator_oh_wheelchair" />
+            <multiselect key="isced:level" text="ISCED level" values="4;5;6;7;8" />
             <reference ref="link_contact_address" />
         </item> <!-- University -->
@@ -3700 +3704 @@
             <key key="amenity" value="college" />
             <reference ref="name_operator_oh_wheelchair" />
+            <multiselect key="isced:level" text="ISCED level" values="3;4;5;6;7" />
             <reference ref="link_contact_address" />
         </item> <!-- College -->
@@ -7750 +7755 @@
                     <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
                     <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
+                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
                 </roles>
             </item> <!-- Riding Route -->
@@ -7770 +7776 @@
                     <role key="variant" text="variant segment" requisite="optional" type="way" />
                     <role key="start" text="entry points" requisite="optional" type="node" />
+                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
                 </roles>
             </item> <!-- Piste Route -->
@@ -7790 +7797 @@
                     <role key="variant" text="variant segment" requisite="optional" type="way" />
                     <role key="start" text="entry points" requisite="optional" type="node" />
+                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
                 </roles>
             </item> <!-- Ski Route -->
@@ -7807 +7815 @@
                     <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
                     <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
+                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
                 </roles>
             </item> <!-- Detour Route -->
@@ -7844 +7853 @@
                     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/>
                     <role key="link" text="link segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/>
+                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
                 </roles>
             </item> <!-- Road Route -->

trunk/data/validator/deprecated.mapcss

@@ -1879 +1879 @@
   group: tr("deprecated tagging");
 }
+
+/* #18571 */
+*[unnamed=yes] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "noname=yes";
+  fixChangeKey: "unnamed => noname";
+  group: tr("deprecated tagging");
+}

trunk/data/validator/ignoretags.cfg

@@ -72 +72 @@
 E:rcn_ref
 E:lcn_ref
+E:isced:level
 E:place_name
 E:cycleway

trunk/data/validator/numeric.mapcss

@@ -398 +398 @@
   assertMatch: "way aeroway=aerodrome icao=EQQQ";
 }
+
+/* #18573 */
+*[isced:level][isced:level !~ /^(0|1|2|3|4|5|6|7|8)((;|-)(1|2|3|4|5|6|7|8))*$/] {
+  throwWarning: tr("unusual value of {0}", "{0.key}");
+  assertMatch: "node isced:level=secondary";
+  assertMatch: "node isced:level=0,1,2,3";
+  assertMatch: "node isced:level=9";
+  assertMatch: "node isced:level=10";
+  assertNoMatch: "node isced:level=0;1;2;3";
+  assertNoMatch: "node isced:level=0";
+  assertNoMatch: "node isced:level=5";
+  assertNoMatch: "node isced:level=0-3";
+}