Ticket #9071: josm_9071_v2.diff

trunk/data/defaultpresets.xml

@@ -2699 +2699 @@
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/>
             <label text="Edit Route master"/>
             <key key="type" value="route_master"/>
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
+            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
             <text key="name" text="Name"/>
             <text key="ref" text="Reference"/>
             <optional>

trunk/data/tagchecker.cfg

@@ -82 +82 @@
 *    : W : highway == * && waterway == * && waterway != dam    # unusual tag combination (highway & waterway)
 *    : W : highway == * && natural == *                        # unusual tag combination (highway & natural)
 
-*    : W : natural == water && leisure == swimming_pool       # natural water used for swimming pool
-*    : W : natural == water && amenity == swimming_pool       # natural water used for swimming pool
+*    : W : natural == water && leisure == swimming_pool        # natural water used for swimming pool
+*    : W : natural == water && amenity == swimming_pool        # natural water used for swimming pool
 
-*    : W : /\d+/ == *                                         # numerical key
+*    : W : /\d+/ == *                                          # numerical key
+
+# see #9071
+relation : W : route_master == * && route != route_master      # route_master without route=route_master
 
 ########################################
 # Rules derived from Taginfo statistics
@@ -93 +96 @@
 
 # see ticket #5017
 # Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000;
-*    : W : incline              == * && highway != *                                   # incline without highway
+*    : W : incline              == * && highway != * && railway != *                   # incline without highway or railway
 way  : W : junction             == * && highway != *                                   # junction without highway
 *    : W : lanes                == * && highway != *                                   # lanes without highway
 *    : W : lcn                  == * && highway != *                                   # lcn without highway
@@ -103 +106 @@
 *    : W : median               == * && highway != *                                   # median without highway
 *    : W : motorroad            == * && highway != *                                   # motorroad without highway
 *    : W : ntd_id               == * && highway != *                                   # ntd_id without highway
-*    : W : oneway               == * && highway != *                                   # oneway without highway
+*    : W : oneway               == * && highway != * && railway != *                   # oneway without highway
 *    : W : sac_scale            == * && highway != *                                   # sac_scale without highway
 *    : W : segregated           == * && highway != *                                   # segregated without highway
 *    : W : sidewalk             == * && highway != *                                   # sidewalk without highway