more changes in classificator

4 files changed, 47 insertions, 66 deletions

diff --git a/data/categories.txt b/data/categories.txt
index 398f015c0f..2feb76b582 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -345,7 +345,7 @@ ja:噴水|泉|泉水
 cs:kašna|fontána
 nl:fontein
 
-amenity-grave_yard|natural-cemetery|landuse-cemetery
+amenity-grave_yard|landuse-cemetery
 en:graveyard
 ru:кладбище
 de:Friedhof
@@ -752,7 +752,7 @@ ja:パス
 cs:cesta
 nl:pad
 
-highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-pedestrian|highway-unclassified|highway-minor|highway-motorway_link|highway-motorway
+highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-pedestrian|highway-unclassified|highway-motorway_link|highway-motorway
 en:street|st|str|ave
 ru:улица|переулок|проезд|тракт|проспект|ул
 de:Strasse|Weg|Avenue|Gasse|str
@@ -818,7 +818,7 @@ ja:湖|池
 cs:jezero|vodní nádrž|voda
 nl:meer|water
 
-natural-forest|natural-wood|landuse-forest|landuse-wood
+natural-wood|landuse-forest
 en:forest
 ru:лес
 de:Wald
diff --git a/data/classificator.txt b/data/classificator.txt
index 53cef3d496..e61a984d3f 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -162,9 +162,7 @@ world  +
             bridge  -
             cutting  -
             destination  -
-            dyke  -
             embankment  -
-            levee  -
             no-access  -
             permissive  -
             private  -
@@ -191,7 +189,6 @@ world  +
             bridge  -
             cutting  -
             destination  -
-            dyke  -
             permissive  -
             private  -
             tunnel  -
@@ -205,10 +202,8 @@ world  +
             demanding_mountain_hiking  -
             destination  -
             difficult_alpine_hiking  -
-            dyke  -
             embankment  -
             hiking  -
-            levee  -
             mountain_hiking  -
             no-access  -
             permissive  -
@@ -225,12 +220,11 @@ world  +
             area  -
             bridge  -
             cutting  -
-            dyke  -
             embankment  -
-            levee  -
             oneway  -
             tunnel  -
             {}
+        motorway_junction  -
         motorway_link  +
             area  -
             bridge  -
@@ -252,12 +246,10 @@ world  +
             demanding_mountain_hiking  -
             destination  -
             difficult_alpine_hiking  -
-            dyke  -
             embankment  -
             hiking  -
             horse  -
             horse-tunnel  -
-            levee  -
             mountain_hiking  -
             no-access  -
             permissive  -
@@ -288,14 +280,12 @@ world  +
             oneway  -
             private  -
             tunnel  -
-            turning_circle  -
             {}
         road  +
             area  -
             bridge  -
             oneway  -
             tunnel  -
-            turning_circle  -
             {}
         secondary  +
             area  -
@@ -319,9 +309,7 @@ world  +
                 bridge  -
                 tunnel  -
                 {}
-            dyke  -
             embankment  -
-            levee  -
             oneway  -
             parking_aisle  +
                 area  -
@@ -334,9 +322,6 @@ world  +
             area  -
             bridge  -
             cutting  -
-            dyke  -
-            embankment  -
-            levee  -
             tunnel  -
             {}
         tertiary  +
@@ -356,7 +341,6 @@ world  +
             bridge  -
             cutting  -
             destination  -
-            dyke  -
             embankment  -
             grade1  +
                 area  -
@@ -385,7 +369,6 @@ world  +
                 permissive  -
                 private  -
                 {}
-            levee  -
             no-access  -
             oneway  -
             permissive  -
@@ -398,9 +381,7 @@ world  +
             area  -
             bridge  -
             cutting  -
-            dyke  -
             embankment  -
-            levee  -
             oneway  -
             tunnel  -
             {}
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 3d57d78f25..09bf8914e5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -118,7 +118,7 @@ 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];x;name;int_name;121
+highway|motorway_junction;[highway=motorway_junction];;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=guidepost];;name;int_name;124
@@ -493,11 +493,11 @@ 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?];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|dyke;[highway=track][dyke?];x;name;int_name;496
 highway|track|grade3|area;[highway=track][tracktype=grade3][area?];;name;int_name;497
 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|path|dyke;[highway=path][dyke?];x;name;int_name;500
 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
@@ -524,7 +524,7 @@ 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?];x;name;int_name;526
-highway|footway|dyke;[highway=footway][man_made][dyke?];;name;int_name;527
+highway|footway|dyke;[highway=footway][dyke?];x;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];x;name;int_name;530
@@ -534,7 +534,7 @@ leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533
 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|dyke;[highway=cycleway][dyke?];x;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
@@ -592,7 +592,7 @@ highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permiss
 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];x;name;int_name;594
-highway|service|dyke;[highway=service][man_made][dyke?];;name;int_name;595
+highway|service|dyke;[highway=service][man_made][dyke?];x;name;int_name;595
 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?];x;name;int_name;598
@@ -665,7 +665,7 @@ leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissi
 railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665
 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|residential|turning_circle;[highway=residential][turning_circle?];x;name;int_name;668
 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
@@ -687,14 +687,14 @@ natural|vineyard;[natural=vineyard];;name;int_name;686
 highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687
 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
+highway|road|turning_circle;[highway=road][turning_circle?];x;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
+highway|service|levee;[highway=service][levee?];x;name;int_name;692
 natural|orchard;[natural=orchard];;name;int_name;693
 natural|retail;[natural=retail];x;name;int_name;694
 communication|line|underground;[communication=line][location=underground];;name;int_name;695
 natural|cemetery;[natural=cemetery];x;name;int_name;696
-highway|track|levee;[highway=track][levee?];?;name;int_name;697
+highway|track|levee;[highway=track][levee?];x;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?];x;name;int_name;700
@@ -735,12 +735,12 @@ 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][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
+building|address;[building=address];;addr:housenumber;name;738
 amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739
 highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740
-highway|bridleway|dyke;[highway=bridleway][dyke?];?;name;int_name;741
+highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741
 highway|bridleway|embankment;[highway=bridleway][embankment?];;name;int_name;742
-highway|bridleway|levee;[highway=bridleway][levee?];?;name;int_name;743
+highway|bridleway|levee;[highway=bridleway][levee?];x;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?];x;name;int_name;746
@@ -763,7 +763,7 @@ 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|levee;[highway=footway][levee?];x;name;int_name;766
 highway|footway|no-access;[highway=footway][access=no];;name;int_name;767
 highway|footway|t1;[highway=footway][t1];x;name;int_name;768
 highway|footway|t3;[highway=footway][t3];x;name;int_name;769
@@ -779,9 +779,9 @@ 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|dyke;[highway=motorway][dyke?];x;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|levee;[highway=motorway][levee?];x;name;int_name;784
 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
@@ -793,7 +793,7 @@ highway|path|bridge-horse;[highway=path][bridge?][horse?];;name;int_name;792
 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|levee;[highway=path][levee?];x;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
@@ -810,9 +810,9 @@ highway|secondary_link|cycleway-motorroad;[highway=secondary_link][cycleway?][mo
 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|steps|dyke;[highway=steps][dyke?];x;name;int_name;813
+highway|steps|embankment;[highway=steps][embankment?];x;name;int_name;814
+highway|steps|levee;[highway=steps][levee?];x;name;int_name;815
 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
@@ -826,9 +826,9 @@ highway|track|race;[highway=raceway];;name;int_name;825
 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|dyke;[highway=trunk][dyke?];x;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|levee;[highway=trunk][levee?];x;name;int_name;831
 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
diff --git a/data/types.txt b/data/types.txt
index 6b8b0e3091..5ac44d4738 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -118,7 +118,7 @@ amenity|post_office
 landuse|quarry
 amenity|pharmacy
 man_made|pier
-mapswithme
+highway|motorway_junction
 amenity|telephone
 waterway|stream|tunnel
 tourism|information|guidepost
@@ -493,11 +493,11 @@ highway|bridleway|private
 highway|tertiary_link|bridge
 mapswithme
 amenity|parking|park_and_ride
-highway|track|dyke
+mapswithme
 highway|track|grade3|area
 mapswithme
 waterway|lock
-highway|path|dyke
+mapswithme
 mapswithme
 mapswithme
 highway|trunk_link|tunnel
@@ -524,7 +524,7 @@ mapswithme
 railway|monorail|tunnel
 railway|funicular|bridge
 mapswithme
-highway|footway|dyke
+mapswithme
 highway|primary_link|tunnel
 highway|footway|alpine_hiking
 mapswithme
@@ -534,7 +534,7 @@ leisure|landscape_reserve
 mapswithme
 highway|secondary_link|motorroad
 boundary|administrative|state
-highway|cycleway|dyke
+mapswithme
 highway|cycleway|area
 railway|funicular|tunnel
 barrier|cycle_barrier
@@ -592,7 +592,7 @@ highway|track|grade3|permissive
 highway|track|grade4|private
 highway|byway|permissive
 mapswithme
-highway|service|dyke
+mapswithme
 mapswithme
 boundary|administrative|region
 mapswithme
@@ -665,7 +665,7 @@ leisure|recreation_ground|permissive
 railway|yard|bridge
 mapswithme
 mapswithme
-highway|residential|turning_circle
+mapswithme
 mapswithme
 mapswithme
 mapswithme
@@ -687,14 +687,14 @@ natural|vineyard
 mapswithme
 mapswithme
 mapswithme
-highway|road|turning_circle
+mapswithme
 boundary|administrative|country
-highway|service|levee
+mapswithme
 natural|orchard
 mapswithme
 communication|line|underground
 mapswithme
-highway|track|levee
+mapswithme
 mapswithme
 highway|tertiary_link|area
 mapswithme
@@ -738,9 +738,9 @@ place|state|USA
 building|address
 amenity|parking|no-access
 mapswithme
-highway|bridleway|dyke
+mapswithme
 highway|bridleway|embankment
-highway|bridleway|levee
+mapswithme
 highway|bridleway|no-access
 highway|byway|area
 mapswithme
@@ -763,7 +763,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|footway|levee
+mapswithme
 highway|footway|no-access
 mapswithme
 mapswithme
@@ -779,9 +779,9 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|motorway|dyke
+mapswithme
 highway|motorway|embankment
-highway|motorway|levee
+mapswithme
 mapswithme
 highway|path|area-bicycle
 highway|path|area-horse
@@ -793,7 +793,7 @@ highway|path|bridge-horse
 mapswithme
 mapswithme
 highway|path|horse-tunnel
-highway|path|levee
+mapswithme
 highway|path|no-access
 mapswithme
 mapswithme
@@ -810,9 +810,9 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|steps|dyke
-highway|steps|embankment
-highway|steps|levee
+mapswithme
+mapswithme
+mapswithme
 mapswithme
 mapswithme
 mapswithme
@@ -826,9 +826,9 @@ highway|track|race
 mapswithme
 mapswithme
 mapswithme
-highway|trunk|dyke
+mapswithme
 highway|trunk|embankment
-highway|trunk|levee
+mapswithme
 mapswithme
 mapswithme
 mapswithme