diff options
| author | Darafei Praliaskouski <komzpa@gmail.com> | 2013-02-19 18:41:45 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:08 +0300 |
| commit | 4068a71264aaac998653e6c2521413ff9a7fd07b (patch) | |
| tree | 4f97274464b910e6c9c42fc04ba81a002b9684ae /data | |
| parent | d454c374834a7091540dee308dc4294f85cf4f7e (diff) | |
more classificator cleanup
Diffstat (limited to 'data')
| -rw-r--r-- | data/classificator.txt | 234 | ||||
| -rw-r--r-- | data/mapcss-mapping.csv | 418 | ||||
| -rw-r--r-- | data/types.txt | 408 |
3 files changed, 419 insertions, 641 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index f55e453cca..53cef3d496 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -160,10 +160,8 @@ world + bridleway + area - bridge - - construction - cutting - destination - - disused - dyke - embankment - levee - @@ -176,9 +174,7 @@ world + byway + area - bridge - - construction - destination - - disused - no-access - permissive - private - @@ -190,25 +186,12 @@ world + uncontrolled - zebra - {} - cycleroad + - area - - bridge - - construction - - disused - - junction - - tunnel - - {} cycleway + area - bridge - - construction - cutting - destination - - disused - dyke - - embankment - - levee - - no-access - permissive - private - tunnel - @@ -217,14 +200,11 @@ world + alpine_hiking - area - bridge - - construction - cutting - - cycleway - demanding_alpine_hiking - demanding_mountain_hiking - destination - difficult_alpine_hiking - - disused - dyke - embankment - hiking - @@ -235,50 +215,25 @@ world + private - tunnel - {} - ford + - cycleway - - {} + ford - living_street + area - bridge - - construction - - disused - - junction - tunnel - {} - minor + - area - - bridge - - construction - - cycleway - - disused - - junction - - oneway - - tunnel - - turning_circle - - {} motorway + area - bridge - - construction - cutting - - cycleway - - disused - dyke - embankment - - junction - levee - oneway - tunnel - {} - motorway_junction - motorway_link + area - bridge - - construction - - cycleway - - disused - - junction - oneway - tunnel - {} @@ -289,20 +244,14 @@ world + area-horse - bicycle - bicycle-bridge - - bicycle-construction - - bicycle-disused - bicycle-tunnel - bridge - bridge-horse - - construction - - construction-horse - cutting - demanding_alpine_hiking - demanding_mountain_hiking - destination - difficult_alpine_hiking - - disused - - disused-horse - dyke - embankment - hiking - @@ -318,47 +267,24 @@ world + pedestrian + area - bridge - - construction - - cycleway - - disused - - junction - tunnel - {} primary + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} primary_link + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} - raceway + - dismantled - - disused - - {} + raceway - residential + area - bridge - - construction - - cycleway - - disused - - junction - oneway - private - tunnel - @@ -367,8 +293,6 @@ world + road + area - bridge - - cycleway - - junction - oneway - tunnel - turning_circle - @@ -376,23 +300,12 @@ world + secondary + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} secondary_link + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - motorroad - oneway - tunnel - @@ -400,10 +313,7 @@ world + service + area - bridge - - construction - cutting - - cycleway - - disused - driveway + area - bridge - @@ -423,9 +333,7 @@ world + steps + area - bridge - - construction - cutting - - disused - dyke - embankment - levee - @@ -434,34 +342,20 @@ world + tertiary + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} tertiary_link + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} track + area - bridge - - construction - cutting - destination - - disused - dyke - embankment - grade1 + @@ -491,7 +385,6 @@ world + permissive - private - {} - junction - levee - no-access - oneway - @@ -504,55 +397,24 @@ world + trunk + area - bridge - - construction - cutting - - cycleway - - cycleway-motorroad - - disused - dyke - embankment - - junction - levee - - motorroad - oneway - tunnel - {} trunk_link + area - bridge - - construction - - cycleway - - cycleway-motorroad - - disused - - junction - - motorroad - oneway - tunnel - {} unclassified + area - bridge - - construction - - cycleway - - disused - - junction - oneway - tunnel - - turning_circle - - {} - unsurfaced + - area - - bridge - - construction - - cycleway - - destination - - disused - - junction - - no-access - - oneway - - permissive - - private - - tunnel - {} {} historic + @@ -566,11 +428,7 @@ world + {} landuse + allotments - - basin + - detention - - infiltration - - retention - - {} + basin - brownfield - cemetery + christian - @@ -602,39 +460,15 @@ world + military - orchard - quarry - - raceway + - dismantled - - disused - - {} + raceway - railway - recreation_ground - - reservoir + - cooling - - evaporator - - sewage - - tailings - - water_storage - - {} + reservoir - residential - retail - - runway + - dismantled - - disused - - {} salt_pond - - scrub + - coniferous - - deciduous - - mixed - - {} - street - village_green - vineyard - - wood + - coniferous - - deciduous - - mixed - - {} {} leisure + common - @@ -643,7 +477,6 @@ world + {} garden - golf_course - - green - landscape_reserve - nature_reserve - park + @@ -683,28 +516,7 @@ world + lighthouse - pier - pipeline + - gas + - overground - - {} - heat + - overground - - {} - hot_water + - overground - - {} - natural_gas + - overground - - {} - oil + - overground - - {} overground - - sewage + - overground - - {} - water + - overground - - {} {} survey_point - wastewater_plant - @@ -717,54 +529,26 @@ world + bunker - {} natural + - allotments - - basin - bay - beach - - brownfield - cave_entrance - - cemetery - coastline - - commercial - - construction - - farm - - farmland - - farmyard - - forest + - coniferous - - deciduous - - mixed - - {} - garages - glacier - grass - greenfield - greenhouse_horticulture - heath - - industrial - lake - land - - landfill - marsh - meadow - orchard - peak - pond - - quarry - - railway - - recreation_ground - - reservoir - - retail - salt_pond - - scrub + - coniferous - - deciduous - - mixed - - {} + scrub - spring - - street - tree - - village_green - vineyard - volcano - water - @@ -779,7 +563,6 @@ world + {} noexit + motor_vehicle - - motorcar - {} piste:lift + j-bar - @@ -848,7 +631,6 @@ world + crossing - dismantled + bridge - - tunnel - {} disused + bridge - @@ -876,10 +658,6 @@ world + bridge - tunnel - {} - planned + - bridge - - tunnel - - {} platform - preserved + bridge - diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 35b8db01bd..3d57d78f25 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -118,10 +118,10 @@ amenity|post_office;[amenity=post_office];;name;int_name;117 landuse|quarry;[landuse=quarry];;name;int_name;118 amenity|pharmacy;[amenity=pharmacy];;name;int_name;119 man_made|pier;[man_made=pier];;name;int_name;120 -highway|motorway_junction;[highway=motorway_junction];;name;int_name;121 +highway|motorway_junction;[highway=motorway_junction];x;name;int_name;121 amenity|telephone;[amenity=telephone];;name;int_name;122 waterway|stream|tunnel;[waterway=stream][tunnel?];;name;int_name;123 -tourism|information|guidepost;[tourism=information][information][information=guidepost];;name;int_name;124 +tourism|information|guidepost;[tourism=information][information=guidepost];;name;int_name;124 amenity|parking|fee;[amenity=parking][fee?];;name;int_name;125 amenity|kindergarten;[amenity=kindergarten];;name;int_name;126 power|generator|wind;[power=generator][power_source=wind];;name;int_name;127 @@ -134,7 +134,7 @@ sport|tennis;[sport=tennis];;name;int_name;133 landuse|vineyard;[landuse=vineyard];;name;int_name;134 aeroway|taxiway;[aeroway=taxiway];;name;int_name;135 aeroway|aerodrome;[aeroway=aerodrome];;name;int_name;136 -highway|secondary|junction;[highway=secondary][junction?];;name;int_name;137 +highway|secondary|junction;[highway=secondary][junction?];x;name;int_name;137 amenity|fire_station;[amenity=fire_station];;name;int_name;138 landuse|retail;[landuse=retail];;name;int_name;139 leisure|nature_reserve;[leisure=nature_reserve];;name;int_name;140 @@ -145,14 +145,14 @@ railway|abandoned;[railway=abandoned];;name;int_name;144 amenity|parking|private;[amenity=parking][access=private];;name;int_name;145 boundary|administrative|7;[boundary=administrative][admin_level=7];;name;int_name;146 tourism|attraction;[tourism=attraction];;name;int_name;147 -highway|tertiary|junction;[highway=tertiary][junction?];;name;int_name;148 +highway|tertiary|junction;[highway=tertiary][junction?];x;name;int_name;148 highway|track|private;[highway=track][access=private];;name;int_name;149 railway|tram;[railway=tram];;name;int_name;150 amenity|toilets;[amenity=toilets];;name;int_name;151 -highway|residential|junction;[highway=residential][junction?];;name;int_name;152 +highway|residential|junction;[highway=residential][junction?];x;name;int_name;152 highway|footway|permissive;[highway=footway][access=permissive];;name;int_name;153 -highway|primary|junction;[highway=primary][junction?];;name;int_name;154 -landuse|construction;[landuse][construction?];;name;int_name;155 +highway|primary|junction;[highway=primary][junction?];x;name;int_name;154 +landuse|construction;[landuse=construction];;name;int_name;155 tourism|viewpoint;[tourism=viewpoint];;name;int_name;156 amenity|atm;[amenity=atm];;name;int_name;157 highway|pedestrian|area;[highway=pedestrian][area?];;name;int_name;158 @@ -205,17 +205,17 @@ power|minor_line;[power=minor_line];;name;int_name;204 natural|marsh;[natural=marsh];;name;int_name;205 leisure|stadium;[leisure=stadium];;name;int_name;206 amenity|doctors;[amenity=doctors];;name;int_name;207 -railway|disused;[railway][disused?];;name;int_name;208 +railway|disused;[railway=disused];;name;int_name;208 aeroway|runway;[aeroway=runway];;name;int_name;209 railway|halt;[railway=halt];;name;int_name;210 addr:interpolation|all;[addr:interpolation=all];x;name;int_name;211 railway|rail|tunnel;[railway=rail][tunnel?];;name;int_name;212 man_made|wastewater_plant;[man_made=wastewater_plant];;name;int_name;213 -highway|trunk|motorroad;[highway=trunk][motorroad?];;name;int_name;214 +highway|trunk|motorroad;[highway=trunk][motorroad?];x;name;int_name;214 place|county;[place=county];;name;int_name;215 highway|footway|private;[highway=footway][access=private];;name;int_name;216 landuse|conservation;[landuse=conservation];;name;int_name;217 -highway|unclassified|junction;[highway=unclassified][junction?];;name;int_name;218 +highway|unclassified|junction;[highway=unclassified][junction?];x;name;int_name;218 power|station;[power=station];;name;int_name;219 sport|swimming;[sport=swimming];;name;int_name;220 leisure|track;[leisure=track];;name;int_name;221 @@ -234,7 +234,7 @@ amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;2 boundary|administrative|5;[boundary=administrative][admin_level=5];;name;int_name;234 highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235 highway|track|destination;[highway=track][access=destination];;name;int_name;236 -highway|trunk|junction;[highway=trunk][junction?];;name;int_name;237 +highway|trunk|junction;[highway=trunk][junction?];x;name;int_name;237 highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238 aeroway|helipad;[aeroway=helipad];;name;int_name;239 highway|path|permissive;[highway=path][access=permissive];;name;int_name;240 @@ -252,10 +252,10 @@ amenity|grave_yard;[amenity=grave_yard];;name;int_name;251 waterway|canal|tunnel;[waterway=canal][tunnel?];;name;int_name;252 piste:type|downhill|easy;[piste:type=downhill][piste:difficulty=easy];;name;int_name;253 waterway|ditch|tunnel;[waterway=ditch][tunnel?];;name;int_name;254 -landuse|wood;[landuse=wood];;name;int_name;255 +landuse|wood;[landuse=wood];x;name;int_name;255 piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256 railway|subway_entrance;[railway=subway_entrance];;name;int_name;257 -highway|trunk_link|motorroad;[highway=trunk_link][motorroad?];;name;int_name;258 +highway|trunk_link|motorroad;[highway=trunk_link][motorroad?];x;name;int_name;258 man_made|pipeline;[man_made=pipeline];;name;int_name;259 route|ferry;[route=ferry];;name;int_name;260 highway|trunk_link|bridge;[highway=trunk_link][bridge?];;name;int_name;261 @@ -279,7 +279,7 @@ waterway|river|tunnel;[waterway=river][tunnel?];;name;int_name;278 boundary|administrative|county;[boundary=administrative][border_type=county];;name;int_name;279 highway|road|bridge;[highway=road][bridge?];;name;int_name;280 boundary|administrative|3;[boundary=administrative][admin_level=3];;name;int_name;281 -man_made|pipeline|water;[man_made=pipeline][water];;name;int_name;282 +man_made|pipeline|water;[man_made=pipeline][water];x;name;int_name;282 boundary|administrative;[boundary=administrative];;name;int_name;283 highway|road|oneway;[highway=road][oneway?];;name;int_name;284 highway|path|destination;[highway=path][access=destination];;name;int_name;285 @@ -298,13 +298,13 @@ highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297 railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298 man_made|lighthouse;[man_made=lighthouse];;name;int_name;299 highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300 -highway|primary|motorroad;[highway=primary][motorroad?];;name;int_name;301 +highway|primary|motorroad;[highway=primary][motorroad?];x;name;int_name;301 amenity|restaurant|hotel;[amenity=restaurant][hotel];;name;int_name;302 power|generator;[power=generator];;name;int_name;303 highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304 man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305 amenity|parking|destination;[amenity=parking][access=destination];;name;int_name;306 -highway|unsurfaced;[highway=unsurfaced];;name;int_name;307 +highway|unsurfaced;[highway=unsurfaced];x;name;int_name;307 highway|raceway;[highway=raceway];;name;int_name;308 highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309 highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310 @@ -339,7 +339,7 @@ amenity|parking|permissive|fee;[amenity=parking][access=permissive][fee?];;name; railway|disused|bridge;[railway][disused?][bridge?];;name;int_name;339 tourism|zoo;[tourism=zoo];;name;int_name;340 sport|gymnastics;[sport=gymnastics];;name;int_name;341 -highway|trunk_link|junction;[highway=trunk_link][junction?];;name;int_name;342 +highway|trunk_link|junction;[highway=trunk_link][junction?];x;name;int_name;342 railway|subway|bridge;[railway=subway][bridge?];;name;int_name;343 railway|light_rail|bridge;[railway=light_rail][bridge?];;name;int_name;344 aeroway|terminal;[aeroway=terminal];;name;int_name;345 @@ -355,7 +355,7 @@ highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354 natural|volcano;[natural=volcano];;name;int_name;355 amenity|parking|underground|fee;[amenity=parking][location=underground][fee?];;name;int_name;356 amenity|parking|underground;[amenity=parking][location=underground];;name;int_name;357 -man_made|pipeline|gas;[man_made=pipeline][gas];;name;int_name;358 +man_made|pipeline|gas;[man_made=pipeline][gas];x;name;int_name;358 amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359 leisure|recreation_ground|private;[leisure=recreation_ground][access=private];;name;int_name;360 highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361 @@ -365,26 +365,26 @@ leisure|track|area;[leisure=track][area?];;name;int_name;364 highway|byway;[highway=byway];;name;int_name;365 piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366 railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367 -noexit|motorcar;[noexit=motorcar];;name;int_name;368 +noexit|motorcar;[noexit=motorcar];x;name;int_name;368 highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];;name;int_name;369 highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370 -railway|construction;[railway][construction?];;name;int_name;371 -highway|primary_link|junction;[highway=primary_link][junction?];;name;int_name;372 +railway|construction;[railway=construction];;name;int_name;371 +highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372 landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373 -highway|primary_link|motorroad;[highway=primary_link][motorroad?];;name;int_name;374 +highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374 amenity|bureau_de_change;[amenity=bureau_de_change];;name;int_name;375 power|generator|photovoltaic;[power=generator][generator:type=photovoltaic];;name;int_name;376 -highway|motorway_link|junction;[highway=motorway_link][junction?];;name;int_name;377 +highway|motorway_link|junction;[highway=motorway_link][junction?];x;name;int_name;377 highway|bridleway|bridge;[highway=bridleway][bridge?];;name;int_name;378 highway|service|driveway|tunnel;[highway=service][service=driveway][tunnel?];;name;int_name;379 highway|track|cutting;[highway=track][cutting?];;name;int_name;380 -landuse|basin|retention;[landuse=basin][basin=retention];;name;int_name;381 +landuse|basin|retention;[landuse=basin][basin=retention];x;name;int_name;381 railway|narrow_gauge|tunnel;[railway=narrow_gauge][tunnel?];;name;int_name;382 -railway|dismantled;[railway=dismantled];;name;int_name;383 +railway|dismantled;[railway=dismantled];x;name;int_name;383 waterway|dock;[waterway=dock];;name;int_name;384 -natural|forest;[natural=forest];;name;int_name;385 +natural|forest;[natural=forest];x;name;int_name;385 highway|service|driveway|area;[highway=service][service=driveway][area?];;name;int_name;386 -man_made|pipeline|heat;[man_made=pipeline][type=heat];;name;int_name;387 +man_made|pipeline|heat;[man_made=pipeline][type=heat];x;name;int_name;387 place|city|capital;[place=city][capital?];;name;int_name;388 aerialway|cable_car;[aerialway=cable_car];;name;int_name;389 piste:type|downhill;[piste:type=downhill];;name;int_name;390 @@ -393,7 +393,7 @@ highway|cycleway|destination;[highway=cycleway][access=destination];;name;int_na man_made|cairn;[man_made=cairn];;name;int_name;393 railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394 highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395 -landuse|basin|infiltration;[landuse=basin][basin=infiltration];;name;int_name;396 +landuse|basin|infiltration;[landuse=basin][basin=infiltration];x;name;int_name;396 highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397 railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398 highway|footway|cutting;[highway=footway][cutting?];;name;int_name;399 @@ -407,19 +407,19 @@ historic|museum;[historic=museum];;name;int_name;406 highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407 highway|service|cutting;[highway=service][cutting?];;name;int_name;408 railway|monorail;[railway=monorail];;name;int_name;409 -highway|road|junction;[highway=road][junction?];;name;int_name;410 -man_made|pipeline|oil;[man_made=pipeline][type=oil];;name;int_name;411 +highway|road|junction;[highway=road][junction?];x;name;int_name;410 +man_made|pipeline|oil;[man_made=pipeline][type=oil];x;name;int_name;411 leisure|park|private;[leisure=park][access=private];;name;int_name;412 -highway|secondary|motorroad;[highway=secondary][motorroad?];;name;int_name;413 +highway|secondary|motorroad;[highway=secondary][motorroad?];x;name;int_name;413 noexit|motor_vehicle;[noexit=motor_vehicle];;name;int_name;414 highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];;name;int_name;415 highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416 railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417 highway|service|parking_aisle|area;[highway=service][service=parking_aisle][area?];;name;int_name;418 -highway|residential|construction;[highway=residential][construction?];;name;int_name;419 -highway|motorway|construction;[highway=motorway][construction?];;name;int_name;420 +highway|residential|construction;[highway=residential][construction?];x;name;int_name;419 +highway|motorway|construction;[highway=motorway][construction?];x;name;int_name;420 highway|path|cutting;[highway=path][cutting?];;name;int_name;421 -landuse|scrub;[landuse=scrub];;name;int_name;422 +landuse|scrub;[landuse=scrub];x;name;int_name;422 highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423 sport|archery;[sport=archery];;name;int_name;424 railway|construction|bridge;[railway][construction?][bridge?];;name;int_name;425 @@ -428,18 +428,18 @@ highway|ford;[highway=ford];;name;int_name;427 highway|path|area;[highway=path][area?];;name;int_name;428 railway|siding;[railway=siding];;name;int_name;429 highway|track|area;[highway=track][area?];;name;int_name;430 -highway|minor;[highway=minor];;name;int_name;431 +highway|minor;[highway=minor];x;name;int_name;431 railway|funicular;[railway=funicular];;name;int_name;432 amenity|parking|public|fee;[amenity=parking][access=public][fee?];;name;int_name;433 historic|battlefield;[historic=battlefield];;name;int_name;434 -highway|primary|construction;[highway=primary][construction?];;name;int_name;435 +highway|primary|construction;[highway=primary][construction?];x;name;int_name;435 sport|australian_football;[sport=australian_football];;name;int_name;436 railway|disused|tunnel;[railway][disused?][tunnel?];;name;int_name;437 -highway|secondary_link|junction;[highway=secondary_link][junction?];;name;int_name;438 +highway|secondary_link|junction;[highway=secondary_link][junction?];x;name;int_name;438 highway|cycleway|private;[highway=cycleway][access=private];;name;int_name;439 highway|steps|cutting;[highway=steps][cutting?];;name;int_name;440 piste:lift|t-bar;[piste:lift=t-bar];;name;int_name;441 -highway|trunk|construction;[highway=trunk][construction?];;name;int_name;442 +highway|trunk|construction;[highway=trunk][construction?];x;name;int_name;442 amenity|parking|public;[amenity=parking][access=public];;name;int_name;443 highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444 earthquake:damage|spontaneous_camp;[earthquake:damage=spontaneous_camp];;name;int_name;445 @@ -451,12 +451,12 @@ highway|motorway|cutting;[highway=motorway][cutting?];;name;int_name;450 railway|razed;[railway=razed];;name;int_name;451 highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452 aerialway|chair_lift|6;[aerialway=chair_lift][piste:lift:occupancy=6];x;name;int_name;453 -landuse|basin|detention;[landuse=basin][basin=detention];;name;int_name;454 +landuse|basin|detention;[landuse=basin][basin=detention];x;name;int_name;454 landuse|orchard;[landuse=orchard];;name;int_name;455 highway|track|grade1|area;[highway=track][tracktype=grade1][area?];;name;int_name;456 highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457 -highway|secondary|construction;[highway=secondary][construction?];;name;int_name;458 -highway|living_street|junction;[highway=living_street][junction?];;name;int_name;459 +highway|secondary|construction;[highway=secondary][construction?];x;name;int_name;458 +highway|living_street|junction;[highway=living_street][junction?];x;name;int_name;459 railway|construction|tunnel;[railway][construction?][tunnel?];;name;int_name;460 sport|handball;[sport=handball];;name;int_name;461 boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462 @@ -465,241 +465,241 @@ amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int communication|line|submarine;[communication=line][location=submarine];;name;int_name;465 piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466 landuse|salt_pond;[landuse=salt_pond];;name;int_name;467 -landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];;name;int_name;468 +landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];x;name;int_name;468 railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469 highway|steps|area;[highway=steps][area?];;name;int_name;470 railway|proposed;[railway=proposed];;name;int_name;471 -highway|tertiary|construction;[highway=tertiary][construction?];;name;int_name;472 -landuse|wood|deciduous;[landuse=wood][wood=deciduous];;name;int_name;473 +highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472 +landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473 natural|grass;[natural=grass];;name;int_name;474 highway|road|area;[highway=road][area?];;name;int_name;475 highway|tertiary|area;[highway=tertiary][area?];;name;int_name;476 piste:lift|platter;[piste:lift=platter];;name;int_name;477 -man_made|pipeline|natural_gas;[man_made=pipeline][type=natural_gas];;name;int_name;478 -highway|unclassified|disused;[highway=unclassified][disused?];;name;int_name;479 +man_made|pipeline|natural_gas;[man_made=pipeline][type=natural_gas];x;name;int_name;478 +highway|unclassified|disused;[highway=unclassified][disused?];x;name;int_name;479 railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480 noexit|vehicle;[noexit=vehicle];x;name;int_name;481 highway|disused;[highway=disused];x;name;int_name;482 -highway|unclassified|construction;[highway=unclassified][construction?];;name;int_name;483 -highway|service|disused;[highway=service][disused?];;name;int_name;484 -highway|service|construction;[highway=service][construction?];;name;int_name;485 -highway|cycleway|disused;[highway=cycleway][disused?];;name;int_name;486 +highway|unclassified|construction;[highway=unclassified][construction?];x;name;int_name;483 +highway|service|disused;[highway=service][disused?];x;name;int_name;484 +highway|service|construction;[highway=service][construction?];x;name;int_name;485 +highway|cycleway|disused;[highway=cycleway][disused?];x;name;int_name;486 leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487 highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488 highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489 -highway|residential|disused;[highway=residential][disused?];;name;int_name;490 -highway|cycleway|construction;[highway=cycleway][construction?];;name;int_name;491 +highway|residential|disused;[highway=residential][disused?];x;name;int_name;490 +highway|cycleway|construction;[highway=cycleway][construction?];x;name;int_name;491 highway|bridleway|private;[highway=bridleway][access=private];;name;int_name;492 highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493 -highway|footway|construction;[highway=footway][construction?];;name;int_name;494 +highway|footway|construction;[highway=footway][construction?];x;name;int_name;494 amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495 highway|track|dyke;[highway=track][man_made][dyke?];;name;int_name;496 highway|track|grade3|area;[highway=track][tracktype=grade3][area?];;name;int_name;497 -landuse|wood|mixed;[landuse=wood][wood=mixed];;name;int_name;498 +landuse|wood|mixed;[landuse=wood][wood=mixed];x;name;int_name;498 waterway|lock;[waterway=lock];;name;int_name;499 highway|path|dyke;[highway=path][man_made][dyke?];;name;int_name;500 -highway|motorway|junction;[highway=motorway][junction?];;name;int_name;501 -highway|motorway_link|construction;[highway=motorway_link][construction?];;name;int_name;502 +highway|motorway|junction;[highway=motorway][junction?];x;name;int_name;501 +highway|motorway_link|construction;[highway=motorway_link][construction?];x;name;int_name;502 highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503 highway|footpath;[highway=footpath];x;name;int_name;504 -highway|path|disused;[highway=path][disused?];;name;int_name;505 -highway|tertiary|motorroad;[highway=tertiary][motorroad?];;name;int_name;506 -leisure|green;[leisure=green];;name;int_name;507 -landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];;name;int_name;508 +highway|path|disused;[highway=path][disused?];x;name;int_name;505 +highway|tertiary|motorroad;[highway=tertiary][motorroad?];x;name;int_name;506 +leisure|green;[leisure=green];x;name;int_name;507 +landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];x;name;int_name;508 railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509 -highway|track|disused;[highway=track][disused?];;name;int_name;510 -highway|tertiary_link|junction;[highway=tertiary_link][junction?];;name;int_name;511 +highway|track|disused;[highway=track][disused?];x;name;int_name;510 +highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_name;511 highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];;name;int_name;512 sport|curling;[sport=curling];;name;int_name;513 -landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];;name;int_name;514 -landuse|wood|coniferous;[landuse=wood][wood=coniferous];;name;int_name;515 -natural|scrub|deciduous;[natural=scrub][wood=deciduous];;name;int_name;516 -highway|footway|disused;[highway=footway][disused?];;name;int_name;517 +landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514 +landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515 +natural|scrub|deciduous;[natural=scrub][wood=deciduous];x;name;int_name;516 +highway|footway|disused;[highway=footway][disused?];x;name;int_name;517 leisure|playground|tennis;[leisure=playground][sport=tennis];;name;int_name;518 highway|secondary|area;[highway=secondary][area?];;name;int_name;519 sport|diving;[sport=diving];;name;int_name;520 highway|track|grade3|private;[highway=track][tracktype=grade3][access=private];;name;int_name;521 boundary|administrative|suburb;[boundary=administrative][border_type=suburb];;name;int_name;522 -natural|quarry;[natural=quarry];;name;int_name;523 +natural|quarry;[natural=quarry];x;name;int_name;523 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524 railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525 -highway|trunk_link|construction;[highway=trunk_link][construction?];;name;int_name;526 +highway|trunk_link|construction;[highway=trunk_link][construction?];x;name;int_name;526 highway|footway|dyke;[highway=footway][man_made][dyke?];;name;int_name;527 highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528 highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529 -natural|scrub|mixed;[natural=scrub][wood=mixed];;name;int_name;530 +natural|scrub|mixed;[natural=scrub][wood=mixed];x;name;int_name;530 highway|byway|bridge;[highway=byway][bridge?];;name;int_name;531 -man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];;name;int_name;532 +man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];x;name;int_name;532 leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533 -leisure|playing_fields;[leisure=playing_fields];;name;int_name;534 +leisure|playing_fields;[leisure=playing_fields];x;name;int_name;534 highway|secondary_link|motorroad;[highway=secondary_link][motorroad];;name;int_name;535 boundary|administrative|state;[boundary=administrative][border_type=state];;name;int_name;536 highway|cycleway|dyke;[highway=cycleway][dyke?];;name;int_name;537 highway|cycleway|area;[highway=cycleway][area?];;name;int_name;538 railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539 barrier|cycle_barrier;[barrier=cycle_barrier];;name;int_name;540 -highway|unsurfaced|bridge;[highway=unsurfaced][bridge?];;name;int_name;541 +highway|unsurfaced|bridge;[highway=unsurfaced][bridge?];x;name;int_name;541 amenity|speed_trap;[amenity=speed_trap];;name;int_name;542 highway|track|grade4|area;[highway=track][tracktype=grade4][area?];;name;int_name;543 highway|primary|area;[highway=primary][area?];;name;int_name;544 power|line|underground;[power=line][location=underground];;name;int_name;545 amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];;name;int_name;546 -highway|track|construction;[highway=track][construction?];;name;int_name;547 -highway|minor|oneway;[highway=minor][oneway?];;name;int_name;548 +highway|track|construction;[highway=track][construction?];x;name;int_name;547 +highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548 highway|bridleway|cutting;[highway=bridleway][cutting?];;name;int_name;549 waterway|lock_gate;[waterway=lock_gate];;name;int_name;550 railway|proposed|tunnel;[railway=proposed][tunnel?];;name;int_name;551 -highway|primary|disused;[highway=primary][disused?];;name;int_name;552 -highway|unsurfaced|private;[highway=unsurfaced][access=private];;name;int_name;553 -highway|path|construction;[highway=path][construction?];;name;int_name;554 +highway|primary|disused;[highway=primary][disused?];x;name;int_name;552 +highway|unsurfaced|private;[highway=unsurfaced][access=private];x;name;int_name;553 +highway|path|construction;[highway=path][construction?];x;name;int_name;554 highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555 railway|proposed|bridge;[railway=proposed][bridge?];;name;int_name;556 highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];;name;int_name;557 -landuse|runway;[landuse=runway];;name;int_name;558 -natural|farm;[natural=farm];;name;int_name;559 -highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];;name;int_name;560 -highway|motorway_link|disused;[highway=motorway_link][disused?];;name;int_name;561 -highway|crossing|uncontrolled;[highway=crossing=uncontrolled];;name;int_name;562 -highway|track|junction;[highway=track][junction?];;name;int_name;563 +landuse|runway;[landuse=runway];x;name;int_name;558 +natural|farm;[natural=farm];x;name;int_name;559 +highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];x;name;int_name;560 +highway|motorway_link|disused;[highway=motorway_link][disused?];x;name;int_name;561 +highway|crossing|uncontrolled;[highway=crossing][crossing=uncontrolled];;name;int_name;562 +highway|track|junction;[highway=track][junction?];x;name;int_name;563 natural|lake;[natural=lake];;name;int_name;564 -man_made|pipeline|sewage;[man_made=pipeline][type=sewage];;name;int_name;565 -highway|primary_link|construction;[highway=primary_link][construction?];;name;int_name;566 -landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];;name;int_name;567 -highway|secondary|disused;[highway=secondary][disused?];;name;int_name;568 +man_made|pipeline|sewage;[man_made=pipeline][type=sewage];x;name;int_name;565 +highway|primary_link|construction;[highway=primary_link][construction?];x;name;int_name;566 +landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];x;name;int_name;567 +highway|secondary|disused;[highway=secondary][disused?];x;name;int_name;568 highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];;name;int_name;569 -natural|basin;[natural=basin];;name;int_name;570 +natural|basin;[natural=basin];x;name;int_name;570 aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];x;name;int_name;571 -natural|reservoir;[natural=reservoir];;name;int_name;572 -highway|steps|construction;[highway=steps][construction?];;name;int_name;573 +natural|reservoir;[natural=reservoir];x;name;int_name;572 +highway|steps|construction;[highway=steps][construction?];x;name;int_name;573 highway|motorway|area;[highway=motorway][area?];;name;int_name;574 piste:lift|rope_tow;[piste:lift=rope_tow];;name;int_name;575 natural|pond;[natural=pond];;name;int_name;576 -natural|industrial;[natural=industrial];;name;int_name;577 +natural|industrial;[natural=industrial];x;name;int_name;577 highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578 -highway|pedestrian|junction;[highway=pedestrian][junction?];;name;int_name;579 +highway|pedestrian|junction;[highway=pedestrian][junction?];x;name;int_name;579 highway|track|grade5|private;[highway=track][tracktype=grade5][access=private];;name;int_name;580 highway|track|grade5|area;[highway=track][tracktype=grade5][area?];;name;int_name;581 -natural|forest|deciduous;[natural=forest][wood=deciduous];;name;int_name;582 -highway|living_street|construction;[highway=living_street][construction?];;name;int_name;583 +natural|forest|deciduous;[natural=forest][wood=deciduous];x;name;int_name;582 +highway|living_street|construction;[highway=living_street][construction?];x;name;int_name;583 highway|track|racetrack;[highway=raceway];;name;int_name;584 -highway|tertiary|disused;[highway=tertiary][disused?];;name;int_name;585 -highway|steps|disused;[highway=steps][disused?];;name;int_name;586 +highway|tertiary|disused;[highway=tertiary][disused?];x;name;int_name;585 +highway|steps|disused;[highway=steps][disused?];x;name;int_name;586 aerialway|mixed_lift;[aerialway=mixed_lift];;name;int_name;587 -railway|planned;[railway=planned];;name;int_name;588 -highway|footway|cycleway;[highway=footway][cycleway?];;name;int_name;589 +railway|planned;[railway=planned];x;name;int_name;588 +highway|footway|cycleway;[highway=footway][cycleway?];x;name;int_name;589 power|line|submarine;[power=line][location=submarine];;name;int_name;590 highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];;name;int_name;591 highway|track|grade4|private;[highway=track][tracktype=grade4][access=private];;name;int_name;592 highway|byway|permissive;[highway=byway][access=permissive];;name;int_name;593 -natural|railway;[natural=railway];;name;int_name;594 +natural|railway;[natural=railway];x;name;int_name;594 highway|service|dyke;[highway=service][man_made][dyke?];;name;int_name;595 -railway|incline;[railway=incline];;name;int_name;596 +railway|incline;[railway=incline];x;name;int_name;596 boundary|administrative|region;[boundary=administrative][border_type=region];;name;int_name;597 -highway|pedestrian|construction;[highway=pedestrian][construction?];;name;int_name;598 +highway|pedestrian|construction;[highway=pedestrian][construction?];x;name;int_name;598 highway|path|t1;[highway=path][t1];x;name;int_name;599 landuse|raceway;[landuse=raceway];;name;int_name;600 place|continent;[place=continent];;name;int_name;601 -natural|farmland;[natural=farmland];;name;int_name;602 +natural|farmland;[natural=farmland];x;name;int_name;602 highway|footpath|private;[highway=footpath][access=private];x;name;int_name;603 boundary|administrative|nation;[boundary=administrative][type=nation];;name;int_name;604 railway|dismantled|bridge;[railway=dismantled][bridge?];;name;int_name;605 -natural|landfill;[natural=landfill];;name;int_name;606 +natural|landfill;[natural=landfill];x;name;int_name;606 highway|byway|tunnel;[highway=byway][tunnel?];;name;int_name;607 piste:lift|magic_carpet;[piste:lift=magic_carpet];;name;int_name;608 -natural|scrub|coniferous;[natural=scrub][wood=coniferous];;name;int_name;609 -highway|unsurfaced|permissive;[highway=unsurfaced][access=permissive];;name;int_name;610 +natural|scrub|coniferous;[natural=scrub][wood=coniferous];x;name;int_name;609 +highway|unsurfaced|permissive;[highway=unsurfaced][access=permissive];x;name;int_name;610 highway|bridleway|destination;[highway=bridleway][access=destination];;name;int_name;611 -highway|motorway|disused;[highway=motorway][disused?];;name;int_name;612 -landuse|runway|disused;[landuse=runway][disused?];;name;int_name;613 -highway|unsurfaced|destination;[highway=unsurfaced][access=destination];;name;int_name;614 -natural|brownfield;[natural=brownfield];;name;int_name;615 -natural|village_green;[natural=village_green];;name;int_name;616 +highway|motorway|disused;[highway=motorway][disused?];x;name;int_name;612 +landuse|runway|disused;[landuse=runway][disused?];x;name;int_name;613 +highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614 +natural|brownfield;[natural=brownfield];x;name;int_name;615 +natural|village_green;[natural=village_green];x;name;int_name;616 highway|track|embankment;[highway=track][embankment?];;name;int_name;617 highway|footpath|bridge;[highway=footpath][bridge?];x;name;int_name;618 piste:lift|j-bar;[piste:lift=j-bar];;name;int_name;619 -landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];;name;int_name;620 +landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];x;name;int_name;620 highway|bridleway|area;[highway=bridleway][area?];;name;int_name;621 natural|military;[natural=military];x;name;int_name;622 highway|byway|private;[highway=byway][access=private];;name;int_name;623 -natural|forest|mixed;[natural=forest][wood=mixed];;name;int_name;624 -highway|raceway|disused;[highway=raceway][disused?];;name;int_name;625 +natural|forest|mixed;[natural=forest][wood=mixed];x;name;int_name;624 +highway|raceway|disused;[highway=raceway][disused?];x;name;int_name;625 railway|siding|bridge;[railway=siding][bridge?];;name;int_name;626 highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627 -man_made|pipeline|oil|overground;[man_made=pipeline][type=oil][location=overground];;name;int_name;628 +man_made|pipeline|oil|overground;[man_made=pipeline][type=oil][location=overground];x;name;int_name;628 highway|primary_link|area;[highway=primary_link][area?];;name;int_name;629 -highway|primary_link|disused;[highway=primary_link][disused?];;name;int_name;630 +highway|primary_link|disused;[highway=primary_link][disused?];x;name;int_name;630 highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];;name;int_name;631 -landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];;name;int_name;632 +landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];x;name;int_name;632 aeroway|airport;[aeroway=airport];;name;int_name;633 highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634 man_made|piste:halfpipe;[man_made=piste:halfpipe];x;name;int_name;635 highway|footpath|permissive;[highway=footpath][access=permissive];x;name;int_name;636 -highway|tertiary|cycleway;[highway=tertiary][cycleway?];;name;int_name;637 +highway|tertiary|cycleway;[highway=tertiary][cycleway?];x;name;int_name;637 highway|trunk|area;[highway=trunk][area?];;name;int_name;638 -highway|secondary_link|construction;[highway=secondary_link][construction?];;name;int_name;639 -landuse|street;[landuse=street];;name;int_name;640 +highway|secondary_link|construction;[highway=secondary_link][construction?];x;name;int_name;639 +landuse|street;[landuse=street];x;name;int_name;640 leisure|park|destination;[leisure=park][access=destination];;name;int_name;641 highway|footway|t2;[highway=footway][t2];x;name;int_name;642 -landuse|raceway|disused;[landuse=raceway][disused?];;name;int_name;643 +landuse|raceway|disused;[landuse=raceway][disused?];x;name;int_name;643 highway|motorway_link|area;[highway=motorway_link][area?];;name;int_name;644 -natural|recreation_ground;[natural=recreation_ground];;name;int_name;645 -highway|minor|bridge;[highway=minor][bridge?];;name;int_name;646 -highway|secondary|cycleway;[highway=secondary][cycleway?];;name;int_name;647 +natural|recreation_ground;[natural=recreation_ground];x;name;int_name;645 +highway|minor|bridge;[highway=minor][bridge?];x;name;int_name;646 +highway|secondary|cycleway;[highway=secondary][cycleway?];x;name;int_name;647 highway|track|dike;[highway=track][dike?];x;name;int_name;648 -natural|forest|coniferous;[natural=forest][wood=coniferous];;name;int_name;649 +natural|forest|coniferous;[natural=forest][wood=coniferous];x;name;int_name;649 highway|footway|embankment;[highway=footway][embankment?];;name;int_name;650 railway|spur|tunnel;[railway=spur][tunnel?];;name;int_name;651 highway|path|t5;[highway=path][t5];x;name;int_name;652 highway|path|t3;[highway=path][t3];x;name;int_name;653 -highway|trunk|disused;[highway=trunk][disused?];;name;int_name;654 +highway|trunk|disused;[highway=trunk][disused?];x;name;int_name;654 highway|trunk_link|area;[highway=trunk_link][area?];;name;int_name;655 railway|incline|tunnel;[railway=incline][tunnel?];;name;int_name;656 boundary|administrative|municipality;[boundary=administrative][border_type=municipality];;name;int_name;657 highway|path|t2;[highway=path][t2];x;name;int_name;658 highway|byway|destination;[highway=byway][access=destination];;name;int_name;659 -natural|construction;[natural][construction?];;name;int_name;660 +natural|construction;[natural][construction?];x;name;int_name;660 communication|line;[communication=line];;name;int_name;661 -highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];;name;int_name;662 -railway|dismantled|tunnel;[railway=dismantled][tunnel?];;name;int_name;663 +highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662 +railway|dismantled|tunnel;[railway=dismantled][tunnel?];x;name;int_name;663 leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];;name;int_name;664 railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665 -landuse|raceway|dismantled;[landuse=raceway][dismantled?];;name;int_name;666 -railway|planned|tunnel;[railway=planned][tunnel?];;name;int_name;667 +landuse|raceway|dismantled;[landuse=raceway][dismantled?];x;name;int_name;666 +railway|planned|tunnel;[railway=planned][tunnel?];x;name;int_name;667 highway|residential|turning_circle;[highway=residential][turning_circle?];;name;int_name;668 -highway|bridleway|disused;[highway=bridleway][disused?];;name;int_name;669 -highway|service|cycleway;[highway=service][cycleway?];;name;int_name;670 -highway|pedestrian|disused;[highway=pedestrian][disused?];;name;int_name;671 -highway|unsurfaced|area;[highway=unsurfaced][area?];;name;int_name;672 -highway|minor|tunnel;[highway=minor][tunnel?];;name;int_name;673 -highway|minor|area;[highway=minor][area?];;name;int_name;674 +highway|bridleway|disused;[highway=bridleway][disused?];x;name;int_name;669 +highway|service|cycleway;[highway=service][cycleway?];x;name;int_name;670 +highway|pedestrian|disused;[highway=pedestrian][disused?];x;name;int_name;671 +highway|unsurfaced|area;[highway=unsurfaced][area?];x;name;int_name;672 +highway|minor|tunnel;[highway=minor][tunnel?];x;name;int_name;673 +highway|minor|area;[highway=minor][area?];x;name;int_name;674 highway|track|grade4|permissive;[highway=track][tracktype=grade4][access=permissive];;name;int_name;675 highway|crossing|zebra;[highway=crossing][crossing=zebra];;name;int_name;676 -landuse|runway|dismantled;[landuse=runway][dismantled?];;name;int_name;677 -highway|bridleway|construction;[highway=bridleway][construction?];;name;int_name;678 -railway|planned|bridge;[railway=planned][bridge?];;name;int_name;679 +landuse|runway|dismantled;[landuse=runway][dismantled?];x;name;int_name;677 +highway|bridleway|construction;[highway=bridleway][construction?];x;name;int_name;678 +railway|planned|bridge;[railway=planned][bridge?];x;name;int_name;679 highway|service|embankment;[highway=service][embankment?];;name;int_name;680 highway|crossing|island;[highway=crossing][crossing=island];;name;int_name;681 -highway|unclassified|cycleway;[highway=unclassified][cycleway];;name;int_name;682 -highway|residential|cycleway;[highway=residential][cycleway];;name;int_name;683 -natural|commercial;[natural=commercial];;name;int_name;684 +highway|unclassified|cycleway;[highway=unclassified][cycleway];x;name;int_name;682 +highway|residential|cycleway;[highway=residential][cycleway];x;name;int_name;683 +natural|commercial;[natural=commercial];x;name;int_name;684 highway|path|embankment;[highway=path][embankment?];;name;int_name;685 natural|vineyard;[natural=vineyard];;name;int_name;686 highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687 -man_made|pipeline|water|overground;ppp;;name;int_name;688 +man_made|pipeline|water|overground;[man_made=pipeline][type=water][location=overground];x;name;int_name;688 highway|footpath|area;[highway=footpath][area?];x;name;int_name;689 highway|road|turning_circle;[highway=road][turning_circle?];;name;int_name;690 boundary|administrative|country;[boundary=administrative][border_type=country];;name;int_name;691 highway|service|levee;[highway=service][levee?];?;name;int_name;692 natural|orchard;[natural=orchard];;name;int_name;693 -natural|retail;[natural=retail];;name;int_name;694 +natural|retail;[natural=retail];x;name;int_name;694 communication|line|underground;[communication=line][location=underground];;name;int_name;695 -natural|cemetery;[natural=cemetery];;name;int_name;696 +natural|cemetery;[natural=cemetery];x;name;int_name;696 highway|track|levee;[highway=track][levee?];?;name;int_name;697 highway|path|dike;[highway=path][dike?];x;name;int_name;698 highway|tertiary_link|area;[highway=tertiary_link][area?];;name;int_name;699 -highway|unsurfaced|tunnel;[highway=unsurfaced][tunnel?];;name;int_name;700 +highway|unsurfaced|tunnel;[highway=unsurfaced][tunnel?];x;name;int_name;700 highway|secondary_link|area;[highway=secondary_link][area?];;name;int_name;701 -natural|allotments;[natural=allotments];;name;int_name;702 +natural|allotments;[natural=allotments];x;name;int_name;702 railway|station|subway;[railway=station][transport=subway];;name;int_name;703 amenity|police;[amenity=police];;name;int_name;704 amenity|car_rental;[amenity=car_rental];;name;int_name;705 @@ -743,19 +743,19 @@ highway|bridleway|embankment;[highway=bridleway][embankment?];;name;int_name;742 highway|bridleway|levee;[highway=bridleway][levee?];?;name;int_name;743 highway|bridleway|no-access;[highway=bridleway][access=no];;name;int_name;744 highway|byway|area;[highway=byway][area?];;name;int_name;745 -highway|byway|construction;[highway=byway][construction?];;name;int_name;746 -highway|byway|disused;[highway=byway][disused?];;name;int_name;747 +highway|byway|construction;[highway=byway][construction?];x;name;int_name;746 +highway|byway|disused;[highway=byway][disused?];x;name;int_name;747 highway|byway|no-access;[highway=byway][access=no];;name;int_name;748 -highway|cycleroad;[highway=cycleroad];;name;int_name;749 -highway|cycleroad|area;[highway=cycleroad][area?];;name;int_name;750 -highway|cycleroad|bridge;[highway=cycleroad][bridge?];;name;int_name;751 -highway|cycleroad|construction;[highway=cycleroad][construction?];;name;int_name;752 -highway|cycleroad|disused;[highway=cycleroad][disused?];;name;int_name;753 -highway|cycleroad|junction;[highway=cycleroad][junction?];;name;int_name;754 -highway|cycleroad|tunnel;[highway=cycleroad][tunnel?];;name;int_name;755 -highway|cycleway|embankment;[highway=cycleway][embankment?];;name;int_name;756 -highway|cycleway|levee;[highway=cycleway][levee?];;name;int_name;757 -highway|cycleway|no-access;[highway=cycleway][access=no];;name;int_name;758 +highway|cycleroad;[highway=cycleroad];x;name;int_name;749 +highway|cycleroad|area;[highway=cycleroad][area?];x;name;int_name;750 +highway|cycleroad|bridge;[highway=cycleroad][bridge?];x;name;int_name;751 +highway|cycleroad|construction;[highway=cycleroad][construction?];x;name;int_name;752 +highway|cycleroad|disused;[highway=cycleroad][disused?];x;name;int_name;753 +highway|cycleroad|junction;[highway=cycleroad][junction?];x;name;int_name;754 +highway|cycleroad|tunnel;[highway=cycleroad][tunnel?];x;name;int_name;755 +highway|cycleway|embankment;[highway=cycleway][embankment?];x;name;int_name;756 +highway|cycleway|levee;[highway=cycleway][levee?];x;name;int_name;757 +highway|cycleway|no-access;[highway=cycleway][access=no];x;name;int_name;758 highway|footpath|construction;[highway=footpath][construction?];x;name;int_name;759 highway|footpath|cycleway;[highway=footpath][cycleway?];x;name;int_name;760 highway|footpath|destination;[highway=footpath][access=destination];x;name;int_name;761 @@ -770,96 +770,96 @@ highway|footway|t3;[highway=footway][t3];x;name;int_name;769 highway|footway|t4;[highway=footway][t4];x;name;int_name;770 highway|footway|t5;[highway=footway][t5];x;name;int_name;771 highway|footway|t6;[highway=footway][t6];x;name;int_name;772 -highway|ford|cycleway;[highway=ford][cycleway];?;name;int_name;773 -highway|living_street|disused;[highway=living_street][disused?];;name;int_name;774 -highway|minor|construction;[highway=minor][construction?];;name;int_name;775 -highway|minor|cycleway;[highway=minor][cycleway];;name;int_name;776 -highway|minor|disused;[highway=minor][disused?];;name;int_name;777 -highway|minor|junction;[highway=minor][junction?];;name;int_name;778 -highway|minor|turning_circle;[highway=minor][turning_circle?];;name;int_name;779 -highway|motorway|cycleway;[highway=motorway][cycleway];;name;int_name;780 +highway|ford|cycleway;[highway=ford][cycleway];x;name;int_name;773 +highway|living_street|disused;[highway=living_street][disused?];x;name;int_name;774 +highway|minor|construction;[highway=minor][construction?];x;name;int_name;775 +highway|minor|cycleway;[highway=minor][cycleway];x;name;int_name;776 +highway|minor|disused;[highway=minor][disused?];x;name;int_name;777 +highway|minor|junction;[highway=minor][junction?];x;name;int_name;778 +highway|minor|turning_circle;[highway=minor][turning_circle?];x;name;int_name;779 +highway|motorway|cycleway;[highway=motorway][cycleway];x;name;int_name;780 highway|motorway|dike;[highway=motorway][dike?];x;name;int_name;781 highway|motorway|dyke;[highway=motorway][dyke?];?;name;int_name;782 highway|motorway|embankment;[highway=motorway][embankment?];;name;int_name;783 highway|motorway|levee;[highway=motorway][levee?];?;name;int_name;784 -highway|motorway_link|cycleway;[highway=motorway_link][cycleway?];;name;int_name;785 +highway|motorway_link|cycleway;[highway=motorway_link][cycleway?];x;name;int_name;785 highway|path|area-bicycle;[highway=path][area?][bicycle?];;name;int_name;786 highway|path|area-horse;[highway=path][area?][horse?];;name;int_name;787 highway|path|bicycle-bridge;[highway=path][bicycle?][bridge?];;name;int_name;788 -highway|path|bicycle-construction;[highway=path][bicycle?][construction?];;name;int_name;789 -highway|path|bicycle-disused;[highway=path][bicycle?][disused?];;name;int_name;790 +highway|path|bicycle-construction;[highway=path][bicycle?][construction?];x;name;int_name;789 +highway|path|bicycle-disused;[highway=path][bicycle?][disused?];x;name;int_name;790 highway|path|bicycle-tunnel;[highway=path][bicycle?][tunnel?];;name;int_name;791 highway|path|bridge-horse;[highway=path][bridge?][horse?];;name;int_name;792 -highway|path|construction-horse;[highway=path][construction?][horse?];;name;int_name;793 -highway|path|disused-horse;[highway=path][disused?][horse?];;name;int_name;794 +highway|path|construction-horse;[highway=path][construction?][horse?];x;name;int_name;793 +highway|path|disused-horse;[highway=path][disused?][horse?];x;name;int_name;794 highway|path|horse-tunnel;[highway=path][horse?][tunnel?];;name;int_name;795 highway|path|levee;[highway=path][levee?];?;name;int_name;796 highway|path|no-access;[highway=path][access=no];;name;int_name;797 highway|path|t4;[highway=path][t4];x;name;int_name;798 highway|path|t6;[highway=path][t6];x;name;int_name;799 -highway|pedestrian|cycleway;[highway=pedestrian][cycleway];;name;int_name;800 -highway|primary|cycleway;[highway=primary][cycleway];;name;int_name;801 -highway|primary|cycleway-motorroad;[highway=primary][cycleway?][motorroad?];;name;int_name;802 -highway|primary_link|cycleway;[highway=primary_link][cycleway?];;name;int_name;803 -highway|primary_link|cycleway-motorroad;[highway=primary_link][cycleway?][motorroad?];;name;int_name;804 -highway|raceway|dismantled;[highway=raceway][dismantled?];;name;int_name;805 -highway|road|cycleway;[highway=road][cycleway];;name;int_name;806 -highway|secondary|cycleway-motorroad;[highway=secondary][cycleway?][motorroad?];;name;int_name;807 -highway|secondary_link|cycleway;[highway=secondary_link][cycleway?];;name;int_name;808 -highway|secondary_link|cycleway-motorroad;[highway=secondary_link][cycleway?][motorroad?];;name;int_name;809 -highway|secondary_link|disused;[highway=secondary_link][disused?]; ;name;int_name;810 +highway|pedestrian|cycleway;[highway=pedestrian][cycleway];x;name;int_name;800 +highway|primary|cycleway;[highway=primary][cycleway];x;name;int_name;801 +highway|primary|cycleway-motorroad;[highway=primary][cycleway?][motorroad?];x;name;int_name;802 +highway|primary_link|cycleway;[highway=primary_link][cycleway?];x;name;int_name;803 +highway|primary_link|cycleway-motorroad;[highway=primary_link][cycleway?][motorroad?];x;name;int_name;804 +highway|raceway|dismantled;[highway=raceway][dismantled?];x;name;int_name;805 +highway|road|cycleway;[highway=road][cycleway];x;name;int_name;806 +highway|secondary|cycleway-motorroad;[highway=secondary][cycleway?][motorroad?];x;name;int_name;807 +highway|secondary_link|cycleway;[highway=secondary_link][cycleway?];x;name;int_name;808 +highway|secondary_link|cycleway-motorroad;[highway=secondary_link][cycleway?][motorroad?];x;name;int_name;809 +highway|secondary_link|disused;[highway=secondary_link][disused?];x;name;int_name;810 highway|service|dike;[highway=service][dike?];x;name;int_name;811 highway|steps|dike;[highway=steps][dike?];x;name;int_name;812 highway|steps|dyke;[highway=steps][dyke?];?;name;int_name;813 highway|steps|embankment;[highway=steps][embankment?];;name;int_name;814 highway|steps|levee;[highway=steps][levee?];?;name;int_name;815 -highway|tertiary|cycleway-motorroad;[highway=tertiary][cycleway?][motorroad?];;name;int_name;816 -highway|tertiary_link|construction;[highway=tertiary_link][construction?];;name;int_name;817 -highway|tertiary_link|cycleway;[highway=tertiary_link][cycleway?];;name;int_name;818 -highway|tertiary_link|cycleway-motorroad;[highway=tertiary_link][cycleway?][motorroad?];;name;int_name;819 -highway|tertiary_link|disused;[highway=tertiary_link][disused?];;name;int_name;820 +highway|tertiary|cycleway-motorroad;[highway=tertiary][cycleway?][motorroad?];x;name;int_name;816 +highway|tertiary_link|construction;[highway=tertiary_link][construction?];x;name;int_name;817 +highway|tertiary_link|cycleway;[highway=tertiary_link][cycleway?];x;name;int_name;818 +highway|tertiary_link|cycleway-motorroad;[highway=tertiary_link][cycleway?][motorroad?];x;name;int_name;819 +highway|tertiary_link|disused;[highway=tertiary_link][disused?];x;name;int_name;820 highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];;name;int_name;821 highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];;name;int_name;822 highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];;name;int_name;823 highway|track|no-access;[highway=track][access=no];;name;int_name;824 highway|track|race;[highway=raceway];;name;int_name;825 -highway|trunk|cycleway;[highway=trunk][cycleway?];;name;int_name;826 -highway|trunk|cycleway-motorroad;[highway=trunk][cycleway?][motorroad?];;name;int_name;827 +highway|trunk|cycleway;[highway=trunk][cycleway?];x;name;int_name;826 +highway|trunk|cycleway-motorroad;[highway=trunk][cycleway?][motorroad?];x;name;int_name;827 highway|trunk|dike;[highway=trunk][dike?];x;name;int_name;828 highway|trunk|dyke;[highway=trunk][dyke?];?;name;int_name;829 highway|trunk|embankment;[highway=trunk][embankment?];;name;int_name;830 highway|trunk|levee;[highway=trunk][levee?];?;name;int_name;831 -highway|trunk_link|cycleway;[highway=trunk_link][cycleway?];;name;int_name;832 -highway|trunk_link|cycleway-motorroad;[highway=trunk_link][cycleway?][motorroad?];;name;int_name;833 -highway|trunk_link|disused;[highway=trunk_link][disused?];;name;int_name;834 -highway|unclassified|turning_circle;[highway=unclassified][turning_circle];?;name;int_name;835 -highway|unsurfaced|construction;[highway=unsurfaced][construction?];;name;int_name;836 -highway|unsurfaced|cycleway;[highway=unsurfaced][cycleway?];;name;int_name;837 -highway|unsurfaced|disused;[highway=unsurfaced][disused?];;name;int_name;838 -highway|unsurfaced|junction;[highway=unsurfaced][junction?];;name;int_name;839 -highway|unsurfaced|no-access;[highway=unsurfaced][access=no];;name;int_name;840 +highway|trunk_link|cycleway;[highway=trunk_link][cycleway?];x;name;int_name;832 +highway|trunk_link|cycleway-motorroad;[highway=trunk_link][cycleway?][motorroad?];x;name;int_name;833 +highway|trunk_link|disused;[highway=trunk_link][disused?];x;name;int_name;834 +highway|unclassified|turning_circle;[highway=unclassified][turning_circle];x;name;int_name;835 +highway|unsurfaced|construction;[highway=unsurfaced][construction?];x;name;int_name;836 +highway|unsurfaced|cycleway;[highway=unsurfaced][cycleway?];x;name;int_name;837 +highway|unsurfaced|disused;[highway=unsurfaced][disused?];x;name;int_name;838 +highway|unsurfaced|junction;[highway=unsurfaced][junction?];x;name;int_name;839 +highway|unsurfaced|no-access;[highway=unsurfaced][access=no];x;name;int_name;840 landuse|conservation|destination;[landuse=conservation][access=destination];;name;int_name;841 landuse|conservation|no-access;[landuse=conservation][access=no];;name;int_name;842 landuse|conservation|permissive;[landuse=conservation][access=permissive];;name;int_name;843 -landuse|scrub|coniferous;[landuse=scrub][wood=coniferous];;name;int_name;844 -landuse|scrub|mixed;[landuse=scrub][wood=mixed];;name;int_name;845 +landuse|scrub|coniferous;[landuse=scrub][wood=coniferous];x;name;int_name;844 +landuse|scrub|mixed;[landuse=scrub][wood=mixed];x;name;int_name;845 leisure|dog_park|tennis;[leisure=dog_park][sport=tennis];;name;int_name;846 leisure|park|no-access;[leisure=park][access=no];;name;int_name;847 leisure|playing_fields|tennis;[leisure=playing_fields][sport=tennis];;name;int_name;848 leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];;name;int_name;849 leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];;name;int_name;850 -man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];;name;int_name;851 -man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];;name;int_name;852 -man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];;name;int_name;853 -man_made|pipeline|natural_gas|overground;[man_made=pipeline][type=natural_gas][location=overground];;name;int_name;854 -man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=overground];;name;int_name;855 +man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];x;name;int_name;851 +man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];x;name;int_name;852 +man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];x;name;int_name;853 +man_made|pipeline|natural_gas|overground;[man_made=pipeline][type=natural_gas][location=overground];x;name;int_name;854 +man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=overground];x;name;int_name;855 mapswithme|grid;[mapswithme=grid];;name;int_name;856 -natural|farmyard;[natural=farmyard];;name;int_name;857 -natural|garages;[natural=garages];;name;int_name;858 +natural|farmyard;[natural=farmyard];x;name;int_name;857 +natural|garages;[natural=garages];x;name;int_name;858 natural|greenfield;[natural=greenfield];;name;int_name;859 natural|greenhouse_horticulture;[natural=greenhouse_horticulture];;name;int_name;860 natural|salt_pond;[natural=salt_pond];;name;int_name;861 -natural|street;[natural=street];;name;int_name;862 +natural|street;[natural=street];x;name;int_name;862 railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863 railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864 railway|yard|tunnel;[railway=yard][tunnel?];;name;int_name;865 diff --git a/data/types.txt b/data/types.txt index 7aae5100c7..6b8b0e3091 100644 --- a/data/types.txt +++ b/data/types.txt @@ -118,7 +118,7 @@ amenity|post_office landuse|quarry amenity|pharmacy man_made|pier -highway|motorway_junction +mapswithme amenity|telephone waterway|stream|tunnel tourism|information|guidepost @@ -134,7 +134,7 @@ sport|tennis landuse|vineyard aeroway|taxiway aeroway|aerodrome -highway|secondary|junction +mapswithme amenity|fire_station landuse|retail leisure|nature_reserve @@ -145,13 +145,13 @@ railway|abandoned amenity|parking|private boundary|administrative|7 tourism|attraction -highway|tertiary|junction +mapswithme highway|track|private railway|tram amenity|toilets -highway|residential|junction +mapswithme highway|footway|permissive -highway|primary|junction +mapswithme landuse|construction tourism|viewpoint amenity|atm @@ -211,11 +211,11 @@ railway|halt mapswithme railway|rail|tunnel man_made|wastewater_plant -highway|trunk|motorroad +mapswithme place|county highway|footway|private landuse|conservation -highway|unclassified|junction +mapswithme power|station sport|swimming leisure|track @@ -234,7 +234,7 @@ amenity|parking|permissive boundary|administrative|5 highway|unclassified|tunnel highway|track|destination -highway|trunk|junction +mapswithme highway|residential|tunnel aeroway|helipad highway|path|permissive @@ -252,10 +252,10 @@ amenity|grave_yard waterway|canal|tunnel piste:type|downhill|easy waterway|ditch|tunnel -landuse|wood +mapswithme piste:type|downhill|intermediate railway|subway_entrance -highway|trunk_link|motorroad +mapswithme man_made|pipeline route|ferry highway|trunk_link|bridge @@ -279,7 +279,7 @@ waterway|river|tunnel boundary|administrative|county highway|road|bridge boundary|administrative|3 -man_made|pipeline|water +mapswithme boundary|administrative highway|road|oneway highway|path|destination @@ -298,13 +298,13 @@ highway|secondary|tunnel railway|abandoned|bridge man_made|lighthouse highway|path|demanding_mountain_hiking -highway|primary|motorroad +mapswithme amenity|restaurant|hotel power|generator highway|pedestrian|bridge man_made|pipeline|overground amenity|parking|destination -highway|unsurfaced +mapswithme highway|raceway highway|primary|tunnel highway|primary_link|bridge @@ -339,7 +339,7 @@ amenity|parking|permissive|fee railway|disused|bridge tourism|zoo sport|gymnastics -highway|trunk_link|junction +mapswithme railway|subway|bridge railway|light_rail|bridge aeroway|terminal @@ -355,7 +355,7 @@ highway|unclassified|area natural|volcano amenity|parking|underground|fee amenity|parking|underground -man_made|pipeline|gas +mapswithme amenity|parking|multi-storey leisure|recreation_ground|private highway|footway|mountain_hiking @@ -365,26 +365,26 @@ leisure|track|area highway|byway piste:type|downhill|novice railway|narrow_gauge|bridge -noexit|motorcar +mapswithme highway|service|parking_aisle|tunnel highway|bridleway|permissive railway|construction -highway|primary_link|junction +mapswithme landuse|greenhouse_horticulture -highway|primary_link|motorroad +mapswithme amenity|bureau_de_change power|generator|photovoltaic -highway|motorway_link|junction +mapswithme highway|bridleway|bridge highway|service|driveway|tunnel highway|track|cutting -landuse|basin|retention +mapswithme railway|narrow_gauge|tunnel -railway|dismantled +mapswithme waterway|dock -natural|forest +mapswithme highway|service|driveway|area -man_made|pipeline|heat +mapswithme place|city|capital aerialway|cable_car piste:type|downhill @@ -393,7 +393,7 @@ highway|cycleway|destination man_made|cairn railway|preserved|bridge highway|path|demanding_alpine_hiking -landuse|basin|infiltration +mapswithme highway|secondary_link|bridge railway|tram|tunnel highway|footway|cutting @@ -407,19 +407,19 @@ historic|museum highway|living_street|bridge highway|service|cutting railway|monorail -highway|road|junction -man_made|pipeline|oil +mapswithme +mapswithme leisure|park|private -highway|secondary|motorroad +mapswithme noexit|motor_vehicle highway|service|parking_aisle|bridge highway|motorway|tunnel railway|light_rail|tunnel highway|service|parking_aisle|area -highway|residential|construction -highway|motorway|construction +mapswithme +mapswithme highway|path|cutting -landuse|scrub +mapswithme highway|road|tunnel sport|archery railway|construction|bridge @@ -428,18 +428,18 @@ highway|ford highway|path|area railway|siding highway|track|area -highway|minor +mapswithme railway|funicular amenity|parking|public|fee historic|battlefield -highway|primary|construction +mapswithme sport|australian_football railway|disused|tunnel -highway|secondary_link|junction +mapswithme highway|cycleway|private highway|steps|cutting piste:lift|t-bar -highway|trunk|construction +mapswithme amenity|parking|public highway|path|difficult_alpine_hiking earthquake:damage|spontaneous_camp @@ -451,12 +451,12 @@ highway|motorway|cutting railway|razed highway|footway|demanding_mountain_hiking mapswithme -landuse|basin|detention +mapswithme landuse|orchard highway|track|grade1|area highway|living_street|tunnel -highway|secondary|construction -highway|living_street|junction +mapswithme +mapswithme railway|construction|tunnel sport|handball boundary|administrative|city @@ -465,241 +465,241 @@ amenity|restaurant|vegetarian communication|line|submarine piste:type|downhill|expert landuse|salt_pond -landuse|reservoir|water_storage +mapswithme railway|monorail|bridge highway|steps|area railway|proposed -highway|tertiary|construction -landuse|wood|deciduous +mapswithme +mapswithme natural|grass highway|road|area highway|tertiary|area piste:lift|platter -man_made|pipeline|natural_gas -highway|unclassified|disused +mapswithme +mapswithme railway|preserved|tunnel mapswithme mapswithme -highway|unclassified|construction -highway|service|disused -highway|service|construction -highway|cycleway|disused +mapswithme +mapswithme +mapswithme +mapswithme leisure|park|permissive highway|bridleway|tunnel highway|motorway_link|tunnel -highway|residential|disused -highway|cycleway|construction +mapswithme +mapswithme highway|bridleway|private highway|tertiary_link|bridge -highway|footway|construction +mapswithme amenity|parking|park_and_ride highway|track|dyke highway|track|grade3|area -landuse|wood|mixed +mapswithme waterway|lock highway|path|dyke -highway|motorway|junction -highway|motorway_link|construction +mapswithme +mapswithme highway|trunk_link|tunnel mapswithme -highway|path|disused -highway|tertiary|motorroad -leisure|green -landuse|reservoir|sewage +mapswithme +mapswithme +mapswithme +mapswithme railway|spur|bridge -highway|track|disused -highway|tertiary_link|junction +mapswithme +mapswithme highway|track|grade3|destination sport|curling -landuse|reservoir|evaporator -landuse|wood|coniferous -natural|scrub|deciduous -highway|footway|disused +mapswithme +mapswithme +mapswithme +mapswithme leisure|playground|tennis highway|secondary|area sport|diving highway|track|grade3|private boundary|administrative|suburb -natural|quarry +mapswithme railway|monorail|tunnel railway|funicular|bridge -highway|trunk_link|construction +mapswithme highway|footway|dyke highway|primary_link|tunnel highway|footway|alpine_hiking -natural|scrub|mixed +mapswithme highway|byway|bridge -man_made|pipeline|hot_water +mapswithme leisure|landscape_reserve -leisure|playing_fields +mapswithme highway|secondary_link|motorroad boundary|administrative|state highway|cycleway|dyke highway|cycleway|area railway|funicular|tunnel barrier|cycle_barrier -highway|unsurfaced|bridge +mapswithme amenity|speed_trap highway|track|grade4|area highway|primary|area power|line|underground amenity|restaurant|vegan -highway|track|construction -highway|minor|oneway +mapswithme +mapswithme highway|bridleway|cutting waterway|lock_gate railway|proposed|tunnel -highway|primary|disused -highway|unsurfaced|private -highway|path|construction +mapswithme +mapswithme +mapswithme highway|footway|demanding_alpine_hiking railway|proposed|bridge highway|track|grade4|destination -landuse|runway -natural|farm -highway|unsurfaced|oneway -highway|motorway_link|disused +mapswithme +mapswithme +mapswithme +mapswithme highway|crossing|uncontrolled -highway|track|junction +mapswithme natural|lake -man_made|pipeline|sewage -highway|primary_link|construction -landuse|reservoir|tailings -highway|secondary|disused +mapswithme +mapswithme +mapswithme +mapswithme highway|track|grade5|destination -natural|basin mapswithme -natural|reservoir -highway|steps|construction +mapswithme +mapswithme +mapswithme highway|motorway|area piste:lift|rope_tow natural|pond -natural|industrial +mapswithme highway|secondary_link|tunnel -highway|pedestrian|junction +mapswithme highway|track|grade5|private highway|track|grade5|area -natural|forest|deciduous -highway|living_street|construction +mapswithme +mapswithme highway|track|racetrack -highway|tertiary|disused -highway|steps|disused +mapswithme +mapswithme aerialway|mixed_lift -railway|planned -highway|footway|cycleway +mapswithme +mapswithme power|line|submarine highway|track|grade3|permissive highway|track|grade4|private highway|byway|permissive -natural|railway +mapswithme highway|service|dyke -railway|incline +mapswithme boundary|administrative|region -highway|pedestrian|construction +mapswithme mapswithme landuse|raceway place|continent -natural|farmland +mapswithme mapswithme boundary|administrative|nation railway|dismantled|bridge -natural|landfill +mapswithme highway|byway|tunnel piste:lift|magic_carpet -natural|scrub|coniferous -highway|unsurfaced|permissive +mapswithme +mapswithme highway|bridleway|destination -highway|motorway|disused -landuse|runway|disused -highway|unsurfaced|destination -natural|brownfield -natural|village_green +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme highway|track|embankment mapswithme piste:lift|j-bar -landuse|scrub|deciduous +mapswithme highway|bridleway|area mapswithme highway|byway|private -natural|forest|mixed -highway|raceway|disused +mapswithme +mapswithme railway|siding|bridge highway|footway|difficult_alpine_hiking -man_made|pipeline|oil|overground +mapswithme highway|primary_link|area -highway|primary_link|disused +mapswithme highway|track|grade5|permissive -landuse|reservoir|cooling +mapswithme aeroway|airport highway|tertiary_link|tunnel mapswithme mapswithme -highway|tertiary|cycleway +mapswithme highway|trunk|area -highway|secondary_link|construction -landuse|street +mapswithme +mapswithme leisure|park|destination mapswithme -landuse|raceway|disused +mapswithme highway|motorway_link|area -natural|recreation_ground -highway|minor|bridge -highway|secondary|cycleway mapswithme -natural|forest|coniferous +mapswithme +mapswithme +mapswithme +mapswithme highway|footway|embankment railway|spur|tunnel mapswithme mapswithme -highway|trunk|disused +mapswithme highway|trunk_link|area railway|incline|tunnel boundary|administrative|municipality mapswithme highway|byway|destination -natural|construction +mapswithme communication|line -highway|tertiary_link|motorroad -railway|dismantled|tunnel +mapswithme +mapswithme leisure|recreation_ground|permissive railway|yard|bridge -landuse|raceway|dismantled -railway|planned|tunnel +mapswithme +mapswithme highway|residential|turning_circle -highway|bridleway|disused -highway|service|cycleway -highway|pedestrian|disused -highway|unsurfaced|area -highway|minor|tunnel -highway|minor|area +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme highway|track|grade4|permissive highway|crossing|zebra -landuse|runway|dismantled -highway|bridleway|construction -railway|planned|bridge +mapswithme +mapswithme +mapswithme highway|service|embankment highway|crossing|island -highway|unclassified|cycleway -highway|residential|cycleway -natural|commercial +mapswithme +mapswithme +mapswithme highway|path|embankment natural|vineyard mapswithme -man_made|pipeline|water|overground +mapswithme mapswithme highway|road|turning_circle boundary|administrative|country highway|service|levee natural|orchard -natural|retail +mapswithme communication|line|underground -natural|cemetery +mapswithme highway|track|levee mapswithme highway|tertiary_link|area -highway|unsurfaced|tunnel +mapswithme highway|secondary_link|area -natural|allotments +mapswithme railway|station|subway amenity|police amenity|car_rental @@ -743,19 +743,19 @@ highway|bridleway|embankment highway|bridleway|levee highway|bridleway|no-access highway|byway|area -highway|byway|construction -highway|byway|disused +mapswithme +mapswithme highway|byway|no-access -highway|cycleroad -highway|cycleroad|area -highway|cycleroad|bridge -highway|cycleroad|construction -highway|cycleroad|disused -highway|cycleroad|junction -highway|cycleroad|tunnel -highway|cycleway|embankment -highway|cycleway|levee -highway|cycleway|no-access +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme mapswithme mapswithme mapswithme @@ -770,96 +770,96 @@ mapswithme mapswithme mapswithme mapswithme -highway|ford|cycleway -highway|living_street|disused -highway|minor|construction -highway|minor|cycleway -highway|minor|disused -highway|minor|junction -highway|minor|turning_circle -highway|motorway|cycleway +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme mapswithme highway|motorway|dyke highway|motorway|embankment highway|motorway|levee -highway|motorway_link|cycleway +mapswithme highway|path|area-bicycle highway|path|area-horse highway|path|bicycle-bridge -highway|path|bicycle-construction -highway|path|bicycle-disused +mapswithme +mapswithme highway|path|bicycle-tunnel highway|path|bridge-horse -highway|path|construction-horse -highway|path|disused-horse +mapswithme +mapswithme highway|path|horse-tunnel highway|path|levee highway|path|no-access mapswithme mapswithme -highway|pedestrian|cycleway -highway|primary|cycleway -highway|primary|cycleway-motorroad -highway|primary_link|cycleway -highway|primary_link|cycleway-motorroad -highway|raceway|dismantled -highway|road|cycleway -highway|secondary|cycleway-motorroad -highway|secondary_link|cycleway -highway|secondary_link|cycleway-motorroad -highway|secondary_link|disused +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme mapswithme mapswithme highway|steps|dyke highway|steps|embankment highway|steps|levee -highway|tertiary|cycleway-motorroad -highway|tertiary_link|construction -highway|tertiary_link|cycleway -highway|tertiary_link|cycleway-motorroad -highway|tertiary_link|disused +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme highway|track|grade3|no-access highway|track|grade4|no-access highway|track|grade5|no-access highway|track|no-access highway|track|race -highway|trunk|cycleway -highway|trunk|cycleway-motorroad +mapswithme +mapswithme mapswithme highway|trunk|dyke highway|trunk|embankment highway|trunk|levee -highway|trunk_link|cycleway -highway|trunk_link|cycleway-motorroad -highway|trunk_link|disused -highway|unclassified|turning_circle -highway|unsurfaced|construction -highway|unsurfaced|cycleway -highway|unsurfaced|disused -highway|unsurfaced|junction -highway|unsurfaced|no-access +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme landuse|conservation|destination landuse|conservation|no-access landuse|conservation|permissive -landuse|scrub|coniferous -landuse|scrub|mixed +mapswithme +mapswithme leisure|dog_park|tennis leisure|park|no-access leisure|playing_fields|tennis leisure|recreation_ground|destination leisure|recreation_ground|no-access -man_made|pipeline|gas|overground -man_made|pipeline|heat|overground -man_made|pipeline|hot_water|overground -man_made|pipeline|natural_gas|overground -man_made|pipeline|sewage|overground +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme mapswithme|grid -natural|farmyard -natural|garages +mapswithme +mapswithme natural|greenfield natural|greenhouse_horticulture natural|salt_pond -natural|street +mapswithme railway|incline|bridge railway|siding|tunnel railway|yard|tunnel |