Changeset 12418 in josm for trunk

Timestamp:

2017-06-20T21:21:58+02:00 (7 years ago)

Author:

Klumbumbus

Message:

fix #14779 - improve highway=road warning message; update preset wiki links

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (7 diffs)
• validator/highway.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -1129 +1129 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=cycleway"
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=cycleway"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=cycleway"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=cycleway"
@@ -1635 +1636 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:mountain_pass"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:mountain_pass"
-                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Key:mountain_pass" />
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Key:mountain_pass"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:mountain_pass" />
             <key key="mountain_pass" value="yes" />
             <optional>
@@ -3786 +3788 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=navigationaid"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aeroway=navigationaid"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=navigationaid"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=navigationaid" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=navigationaid"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=navigationaid" />
             <key key="aeroway" value="navigationaid" />
         </item> <!-- Navigationaid -->
@@ -6412 +6414 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:sport=soccer"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=soccer"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=soccer"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=soccer"
@@ -7069 +7072 @@
         <item name="Beacon" icon="presets/landmark/beacon.svg" name_context="man_made" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=beacon"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=beacon"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <space />
@@ -7725 +7731 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=ruins"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=ruins"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:historic=ruins"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=ruins"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=ruins"
@@ -10135 +10142 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree"
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:natural=tree"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=tree"

trunk/data/validator/highway.mapcss

@@ -63 +63 @@
 
 way[highway=road] {
-  throwWarning: tr("temporary highway type");
+  throwWarning: tr("Unspecific highway type");
   assertMatch: "way highway=road";
   assertNoMatch: "way highway=residential";