diff -ru org/trunk/data/defaultpresets.xml new/trunk/data/defaultpresets.xml
org
|
new
|
|
2699 | 2699 | <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/> |
2700 | 2700 | <label text="Edit Route master"/> |
2701 | 2701 | <key key="type" value="route_master"/> |
2702 | | <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/> |
| 2702 | <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/> |
2703 | 2703 | <text key="name" text="Name"/> |
2704 | 2704 | <text key="ref" text="Reference"/> |
2705 | 2705 | <optional> |
diff -ru org/trunk/data/tagchecker.cfg new/trunk/data/tagchecker.cfg
org
|
new
|
|
82 | 82 | * : W : highway == * && waterway == * && waterway != dam # unusual tag combination (highway & waterway) |
83 | 83 | * : W : highway == * && natural == * # unusual tag combination (highway & natural) |
84 | 84 | |
85 | | * : W : natural == water && leisure == swimming_pool # natural water used for swimming pool |
86 | | * : W : natural == water && amenity == swimming_pool # natural water used for swimming pool |
| 85 | * : W : natural == water && leisure == swimming_pool # natural water used for swimming pool |
| 86 | * : W : natural == water && amenity == swimming_pool # natural water used for swimming pool |
87 | 87 | |
88 | | * : W : /\d+/ == * # numerical key |
| 88 | * : W : /\d+/ == * # numerical key |
| 89 | |
| 90 | # see #9071 |
| 91 | relation : W : type == route_master && route_master != * # route_master relation without route_master=* |
89 | 92 | |
90 | 93 | ######################################## |
91 | 94 | # Rules derived from Taginfo statistics |
… |
… |
|
93 | 96 | |
94 | 97 | # see ticket #5017 |
95 | 98 | # 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; |
96 | | * : W : incline == * && highway != * # incline without highway |
| 99 | * : W : incline == * && highway != * && railway != * # incline without highway or railway |
97 | 100 | way : W : junction == * && highway != * # junction without highway |
98 | 101 | * : W : lanes == * && highway != * # lanes without highway |
99 | 102 | * : W : lcn == * && highway != * # lcn without highway |
… |
… |
|
103 | 106 | * : W : median == * && highway != * # median without highway |
104 | 107 | * : W : motorroad == * && highway != * # motorroad without highway |
105 | 108 | * : W : ntd_id == * && highway != * # ntd_id without highway |
106 | | * : W : oneway == * && highway != * # oneway without highway |
| 109 | * : W : oneway == * && highway != * && railway != * # oneway without highway or railway |
107 | 110 | * : W : sac_scale == * && highway != * # sac_scale without highway |
108 | 111 | * : W : segregated == * && highway != * # segregated without highway |
109 | 112 | * : W : sidewalk == * && highway != * # sidewalk without highway |