deprecated some features from classificator

1 files changed, 72 insertions, 72 deletions

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index f45ac48c06..35b8db01bd 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -21,9 +21,9 @@ natural|coastline;[natural=coastline];;name;int_name;20
 place|village;[place=village];;name;int_name;21
 highway|residential|oneway;[highway=residential][oneway?];;name;int_name;22
 waterway|river;[waterway=river];;name;int_name;23
-addr:interpolation|even;[addr:interpolation=even];;name;int_name;24
-addr:interpolation|odd;[addr:interpolation=odd];;name;int_name;25
-amenity|parking;[amenity=parking];;name;int_name;26
+addr:interpolation|even;[addr:interpolation=even];x;name;int_name;24
+addr:interpolation|odd;[addr:interpolation=odd];x;name;int_name;25
+amenity|parking;[amenity=parking][access?], [amenity=parking][!access];;name;int_name;26
 highway|primary;[highway=primary]; ;name;int_name;27
 railway|rail;[railway=rail];;name;int_name;28
 highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29
@@ -34,7 +34,7 @@ natural|wetland;[natural=wetland];;name;int_name;33
 highway|track|grade3;[highway=track][tracktype=grade3];;name;int_name;34
 boundary|administrative|8;[boundary=administrative][admin_level=8];;name;int_name;35
 amenity|school;[amenity=school];;name;int_name;36
-highway|cycleway;[highway][cycleway?];;name;int_name;37
+highway|cycleway;[highway=cycleway];;name;int_name;37
 landuse|farm;[landuse=farm];;name;int_name;38
 amenity|place_of_worship;[amenity=place_of_worship];;name;int_name;39
 highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40
@@ -160,8 +160,8 @@ tourism|picnic_site;[tourism=picnic_site];;name;int_name;159
 shop|supermarket;[shop=supermarket];;name;int_name;160
 shop|convenience;[shop=convenience];;name;int_name;161
 shop|bakery;[shop=bakery];;name;int_name;162
-highway|construction;[highway][construction?];;name;int_name;163
-highway|cycleway|bridge;[highway][cycleway?][bridge?];;name;int_name;164
+highway|construction;[highway=construction];;name;int_name;163
+highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164
 leisure|sports_centre;[leisure=sports_centre];;name;int_name;165
 highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166
 tourism|camp_site;[tourism=camp_site];;name;int_name;167
@@ -208,7 +208,7 @@ amenity|doctors;[amenity=doctors];;name;int_name;207
 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];;name;int_name;211
+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
@@ -229,7 +229,7 @@ amenity|bus_station;[amenity=bus_station];;name;int_name;228
 highway|track|permissive;[highway=track][access=permissive];;name;int_name;229
 waterway|drain|tunnel;[waterway=drain][tunnel?];;name;int_name;230
 landuse|cemetery|christian;[landuse=cemetery][religion=christian];;name;int_name;231
-highway|cycleway|tunnel;[highway][cycleway?][tunnel?];;name;int_name;232
+highway|cycleway|tunnel;[highway=cycleway][tunnel?];;name;int_name;232
 amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;233
 boundary|administrative|5;[boundary=administrative][admin_level=5];;name;int_name;234
 highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235
@@ -276,7 +276,7 @@ tourism|alpine_hut;[tourism=alpine_hut];;name;int_name;275
 highway|footway|area;[highway=footway][area?];;name;int_name;276
 tourism|hostel;[tourism=hostel];;name;int_name;277
 waterway|river|tunnel;[waterway=river][tunnel?];;name;int_name;278
-boundary|administrative|county;[boundary=administrative][place=county];;name;int_name;279
+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
@@ -350,7 +350,7 @@ place|country;[place=country];;name;int_name;349
 highway|path|alpine_hiking;[highway=path][sac_scale][sac_scale=alpine_hiking];;name;int_name;350
 highway|footway|destination;[highway=footway][access=destination];;name;int_name;351
 sport|scuba_diving;[sport=scuba_diving];;name;int_name;352
-highway|cycleway|permissive;[highway][cycleway?][access=permissive];;name;int_name;353
+highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353
 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
@@ -389,7 +389,7 @@ 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
 sport|american_football;[sport=american_football];;name;int_name;391
-highway|cycleway|destination;[highway][cycleway?][access=destination];;name;int_name;392
+highway|cycleway|destination;[highway=cycleway][access=destination];;name;int_name;392
 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
@@ -400,7 +400,7 @@ highway|footway|cutting;[highway=footway][cutting?];;name;int_name;399
 railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400
 highway|living_street|area;[highway=living_street][area?];;name;int_name;401
 piste:type|sled;[piste:type=sled];;name;int_name;402
-aerialway|chair_lift|4;[aerialway=chair_lift][piste:lift:occupancy=4];;name;int_name;403
+aerialway|chair_lift|4;[aerialway=chair_lift][piste:lift:occupancy=4];x;name;int_name;403
 leisure|dog_park;[leisure=dog_park];;name;int_name;404
 aerialway|gondola;[aerialway=gondola];;name;int_name;405
 historic|museum;[historic=museum];;name;int_name;406
@@ -436,21 +436,21 @@ highway|primary|construction;[highway=primary][construction?];;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|cycleway|private;[highway][cycleway?][access=private];;name;int_name;439
+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
 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
-highway|cycleway|cutting;[highway][cycleway?][cutting?];;name;int_name;446
+highway|cycleway|cutting;[highway=cycleway][cutting?];;name;int_name;446
 railway|yard;[railway=yard];;name;int_name;447
 highway|trunk|cutting;[highway=trunk][cutting?];;name;int_name;448
 natural|meadow;[natural=meadow];;name;int_name;449
 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];;name;int_name;453
+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|orchard;[landuse=orchard];;name;int_name;455
 highway|track|grade1|area;[highway=track][tracktype=grade1][area?];;name;int_name;456
@@ -459,7 +459,7 @@ highway|secondary|construction;[highway=secondary][construction?];;name;int_name
 highway|living_street|junction;[highway=living_street][junction?];;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][place=city];;name;int_name;462
+boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462
 piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463
 amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464
 communication|line|submarine;[communication=line][location=submarine];;name;int_name;465
@@ -478,17 +478,17 @@ 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
 railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480
-noexit|vehicle;[noexit=vehicle];;name;int_name;481
-highway|disused;[highway][disused?];;name;int_name;482
+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|cycleway|disused;[highway=cycleway][disused?];;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|cycleway|construction;[highway=cycleway][construction?];;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
@@ -501,7 +501,7 @@ 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|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503
-highway|footpath;[highway=footpath];;name;int_name;504
+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
@@ -519,7 +519,7 @@ 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][place=suburb];;name;int_name;522
+boundary|administrative|suburb;[boundary=administrative][border_type=suburb];;name;int_name;522
 natural|quarry;[natural=quarry];;name;int_name;523
 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524
 railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525
@@ -533,9 +533,9 @@ man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];;name;int_name;5
 leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533
 leisure|playing_fields;[leisure=playing_fields];;name;int_name;534
 highway|secondary_link|motorroad;[highway=secondary_link][motorroad];;name;int_name;535
-boundary|administrative|state;[boundary=administrative][place=state];;name;int_name;536
-highway|cycleway|dyke;[highway][cycleway?][man_made][dyke?];;name;int_name;537
-highway|cycleway|area;[highway][cycleway?][area?];;name;int_name;538
+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
@@ -543,7 +543,7 @@ 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=vegan];;name;int_name;546
+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|bridleway|cutting;[highway=bridleway][cutting?];;name;int_name;549
@@ -568,7 +568,7 @@ landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];;name;int_nam
 highway|secondary|disused;[highway=secondary][disused?];;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
-aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];;name;int_name;571
+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
 highway|motorway|area;[highway=motorway][area?];;name;int_name;574
@@ -594,13 +594,13 @@ highway|byway|permissive;[highway=byway][access=permissive];;name;int_name;593
 natural|railway;[natural=railway];;name;int_name;594
 highway|service|dyke;[highway=service][man_made][dyke?];;name;int_name;595
 railway|incline;[railway=incline];;name;int_name;596
-boundary|administrative|region;[boundary=administrative][place=region];;name;int_name;597
+boundary|administrative|region;[boundary=administrative][border_type=region];;name;int_name;597
 highway|pedestrian|construction;[highway=pedestrian][construction?];;name;int_name;598
-highway|path|t1;[highway=path][t1];?;name;int_name;599
+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
-highway|footpath|private;[highway=footpath][access=private];;name;int_name;603
+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
@@ -615,11 +615,11 @@ highway|unsurfaced|destination;[highway=unsurfaced][access=destination];;name;in
 natural|brownfield;[natural=brownfield];;name;int_name;615
 natural|village_green;[natural=village_green];;name;int_name;616
 highway|track|embankment;[highway=track][embankment?];;name;int_name;617
-highway|footpath|bridge;[highway=footpath][bridge?];;name;int_name;618
+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
 highway|bridleway|area;[highway=bridleway][area?];;name;int_name;621
-natural|military;[natural=military];;name;int_name;622
+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
@@ -632,30 +632,30 @@ highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permiss
 landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];;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];;name;int_name;635
-highway|footpath|permissive;[highway=footpath][access=permissive];;name;int_name;636
+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|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
 leisure|park|destination;[leisure=park][access=destination];;name;int_name;641
-highway|footway|t2;[highway=footway][t2];;name;int_name;642
+highway|footway|t2;[highway=footway][t2];x;name;int_name;642
 landuse|raceway|disused;[landuse=raceway][disused?];;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
-highway|track|dike;[highway=track][dike?];;name;int_name;648
+highway|track|dike;[highway=track][dike?];x;name;int_name;648
 natural|forest|coniferous;[natural=forest][wood=coniferous];;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];?;name;int_name;652
-highway|path|t3;[highway=path][t3];?;name;int_name;653
+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_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][place=municipality];;name;int_name;657
-highway|path|t2;[highway=path][t2];?;name;int_name;658
+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
 communication|line;[communication=line];;name;int_name;661
@@ -684,23 +684,23 @@ highway|residential|cycleway;[highway=residential][cycleway];;name;int_name;683
 natural|commercial;[natural=commercial];;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?];;name;int_name;687
-man_made|pipeline|water|overground;[man_made=pipeline][type=water][location=overground];;name;int_name;688
-highway|footpath|area;[highway=footpath][area?];;name;int_name;689
+highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687
+man_made|pipeline|water|overground;ppp;;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][place=country];;name;int_name;691
+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
 communication|line|underground;[communication=line][location=underground];;name;int_name;695
 natural|cemetery;[natural=cemetery];;name;int_name;696
 highway|track|levee;[highway=track][levee?];?;name;int_name;697
-highway|path|dike;[highway=path][dike?];?;name;int_name;698
+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|secondary_link|area;[highway=secondary_link][area?];;name;int_name;701
 natural|allotments;[natural=allotments];;name;int_name;702
-railway|station|subway;[railway=station][railway=subway];;name;int_name;703
+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
 amenity|taxi;[amenity=taxi];;name;int_name;706
@@ -733,11 +733,11 @@ sport|skiing;[sport=skiing];;name;int_name;732
 tourism|museum;[tourism=museum];;name;int_name;733
 tourism|guest_house;[tourism=guest_house];;name;int_name;734
 tourism|motel;[tourism=motel];;name;int_name;735
-boundary|administrative|4|state;[boundary=administrative][admin_level=4][place=state];;name;int_name;736
+boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736
 place|state|USA;[place=state][addr:country=US];;name;int_name;737
 building|address;[building=address];;name;int_name;738
 amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739
-highway|bridleway|dike;[highway=bridleway][dike?];?;name;int_name;740
+highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740
 highway|bridleway|dyke;[highway=bridleway][dyke?];?;name;int_name;741
 highway|bridleway|embankment;[highway=bridleway][embankment?];;name;int_name;742
 highway|bridleway|levee;[highway=bridleway][levee?];?;name;int_name;743
@@ -753,23 +753,23 @@ highway|cycleroad|construction;[highway=cycleroad][construction?];;name;int_name
 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|footpath|construction;[highway=footpath][construction?];;name;int_name;759
-highway|footpath|cycleway;[highway=footpath][cycleway?];;name;int_name;760
-highway|footpath|destination;[highway=footpath][access=destination];;name;int_name;761
-highway|footpath|disused;[highway=footpath][disused?];;name;int_name;762
-highway|footpath|no-access;[highway=footpath][access=no];;name;int_name;763
-highway|footpath|tunnel;[highway=footpath][tunnel?];;name;int_name;764
-highway|footway|dike;[highway=footway][dike?];?;name;int_name;765
+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|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
+highway|footpath|disused;[highway=footpath][disused?];x;name;int_name;762
+highway|footpath|no-access;[highway=footpath][access=no];x;name;int_name;763
+highway|footpath|tunnel;[highway=footpath][tunnel?];x;name;int_name;764
+highway|footway|dike;[highway=footway][dike?];x;name;int_name;765
 highway|footway|levee;[highway=footway][levee?];?;name;int_name;766
 highway|footway|no-access;[highway=footway][access=no];;name;int_name;767
-highway|footway|t1;[highway=footway][t1];?;name;int_name;768
-highway|footway|t3;[highway=footway][t3];?;name;int_name;769
-highway|footway|t4;[highway=footway][t4];?;name;int_name;770
-highway|footway|t5;[highway=footway][t5];?;name;int_name;771
-highway|footway|t6;[highway=footway][t6];?;name;int_name;772
+highway|footway|t1;[highway=footway][t1];x;name;int_name;768
+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
@@ -778,15 +778,15 @@ 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|motorway|dike;[highway=motorway][dike?];?;name;int_name;781
+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|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|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-construction;[highway=path][bicycle?][construction?];;name;int_name;789
 highway|path|bicycle-disused;[highway=path][bicycle?][disused?];;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
@@ -795,8 +795,8 @@ highway|path|disused-horse;[highway=path][disused?][horse?];;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];?;name;int_name;798
-highway|path|t6;[highway=path][t6];?;name;int_name;799
+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
@@ -808,8 +808,8 @@ highway|secondary|cycleway-motorroad;[highway=secondary][cycleway?][motorroad?];
 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|service|dike;[highway=service][dike?];?;name;int_name;811
-highway|steps|dike;[highway=steps][dike?];?;name;int_name;812
+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
@@ -825,7 +825,7 @@ 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|dike;[highway=trunk][dike?];?;name;int_name;828
+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
@@ -874,7 +874,7 @@ area:highway|pedestrian;[area:highway=pedestrian];;name;int_name;873
 area:highway|unclassified;[area:highway=unclassified];;name;int_name;874
 area:highway|steps;[area:highway=steps];;name;int_name;875
 area:highway|living_street;[area:highway=living_street];;name;int_name;876
-area:highway|cycleway;[area:highway][cycleway?];;name;int_name;877
+area:highway|cycleway;[area:highway=cycleway];;name;int_name;877
 area:highway|track;[area:highway=track];;name;int_name;878
 area:highway|motorway;[area:highway=motorway];;name;int_name;879
 area:highway|trunk;[area:highway=trunk];;name;int_name;880