Regenerated styles

1 files changed, 344 insertions, 344 deletions

diff --git a/data/visibility.txt b/data/visibility.txt
index 8d87d4dfef..8babd4335c 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -1,64 +1,64 @@
 world  00000000000000000000  +
     aerialway  00000000000000000000  +
-        cable_car  00000000000011111111  -
-        chair_lift  00000000000011111111  -
-        drag_lift  00000000000011111111  -
-        gondola  00000000000011111111  -
-        mixed_lift  00000000000011111111  -
-        station  00000000000011111111  -
+        cable_car  00000000000000011111  -
+        chair_lift  00000000000000011111  -
+        drag_lift  00000000000000011111  -
+        gondola  00000000000000011111  -
+        mixed_lift  00000000000000011111  -
+        station  00000000000000011111  -
         {}
     aeroway  00000000000000000000  +
         aerodrome  00000000001111111111  +
             international  00000000001111111111  -
             {}
         apron  00000000000000000000  -
-        gate  00000000000000000111  -
-        helipad  00000000000000000111  -
-        runway  00000000000011111111  -
-        taxiway  00000000000000111111  -
+        gate  00000000000000000000  -
+        helipad  00000000000000000000  -
+        runway  00000000000000000000  -
+        taxiway  00000000000000000000  -
         terminal  00000000000000111111  -
         {}
-    amenity  00000000000000000001  +
-        atm  00000000000000000011  -
-        bank  00000000000000001111  -
-        bar  00000000000000011111  -
-        bbq  00000000000000000011  -
-        bench  00000000000000000011  -
-        bicycle_parking  00000000000000000111  -
-        bicycle_rental  00000000000000000111  -
-        brothel  00000000000000000001  -
-        bureau_de_change  00000000000000000111  -
-        bus_station  00000000000011111111  -
+    amenity  00000000000000000000  +
+        atm  00000000000000000000  -
+        bank  00000000000000000111  -
+        bar  00000000000000000000  -
+        bbq  00000000000000000000  -
+        bench  00000000000000000000  -
+        bicycle_parking  00000000000000000000  -
+        bicycle_rental  00000000000000000000  -
+        brothel  00000000000000000000  -
+        bureau_de_change  00000000000000000000  -
+        bus_station  00000000000000111111  -
         cafe  00000000000000011111  -
         car_rental  00000000000000000011  -
         car_sharing  00000000000000000011  -
         car_wash  00000000000000000111  -
-        casino  00000000000000000111  -
+        casino  00000000000000000000  -
         charging_station  00000000000000111111  -
-        childcare  00000000000000000111  -
-        cinema  00000000000000000111  -
-        clinic  00000000000000000111  -
-        college  00000000000000000111  -
-        community_centre  00000000000000111111  -
-        courthouse  00000000000000000111  -
-        dentist  00000000000000000111  -
-        doctors  00000000000000111111  -
-        drinking_water  00000000000000011111  -
-        embassy  00000000000000000111  -
-        fast_food  00000000000000011111  -
-        ferry_terminal  00000000000111111111  -
-        fire_station  00000000000000000011  -
+        childcare  00000000000000000000  -
+        cinema  00000000000000000000  -
+        clinic  00000000000000000000  -
+        college  00000000000000000000  -
+        community_centre  00000000000000000000  -
+        courthouse  00000000000000000000  -
+        dentist  00000000000000000000  -
+        doctors  00000000000000000000  -
+        drinking_water  00000000000000000000  -
+        embassy  00000000000000000000  -
+        fast_food  00000000000000000111  -
+        ferry_terminal  00000000000000011111  -
+        fire_station  00000000000000000000  -
         fountain  00000000000000001111  -
-        fuel  00000000000000111111  -
+        fuel  00000000000011111111  -
         grave_yard  00000000000000111111  +
             christian  00000000000000111111  -
             {}
-        hospital  00000000000000111111  -
-        hunting_stand  00000000000000000011  -
-        kindergarten  00000000000000000111  -
-        library  00000000000000000011  -
-        marketplace  00000000000000001111  -
-        nightclub  00000000000000001111  -
+        hospital  00000000000000001111  -
+        hunting_stand  00000000000000000000  -
+        kindergarten  00000000000000000000  -
+        library  00000000000000000000  -
+        marketplace  00000000000000000000  -
+        nightclub  00000000000000000000  -
         parking  00000000000000011111  +
             fee  00000000000000011111  -
             multi-storey  00000000000000011111  +
@@ -74,49 +74,49 @@ world  00000000000000000000  +
                 fee  00000000000000011111  -
                 {}
             {}
-        pharmacy  00000000000000001111  -
-        place_of_worship  00000000000000111111  +
-            buddhist  00000000000000111111  -
-            christian  00000000000000111111  -
-            hindu  00000000000000111111  -
-            jewish  00000000000000111111  -
-            muslim  00000000000000111111  -
-            shinto  00000000000000111111  -
-            taoist  00000000000000111111  -
-            {}
-        police  00000000000000000111  -
-        post_box  00000000000000000011  -
-        post_office  00000000000000000111  -
-        pub  00000000000000011111  -
-        public_bookcase  00000000000000000001  -
-        recycling  00000000000000000111  -
-        restaurant  00000000000000011111  -
-        school  00000000000000000111  -
-        shelter  00000000000000001111  -
-        speed_trap  00000000000000000001  -
-        taxi  00000000000000001111  -
-        telephone  00000000000000000111  -
-        theatre  00000000000000111111  -
-        toilets  00000000000000000011  -
-        townhall  00000000000000000001  -
-        university  00000000000000111111  -
+        pharmacy  00000000000000000000  -
+        place_of_worship  00000000000000001111  +
+            buddhist  00000000000000001111  -
+            christian  00000000000000001111  -
+            hindu  00000000000000001111  -
+            jewish  00000000000000001111  -
+            muslim  00000000000000001111  -
+            shinto  00000000000000001111  -
+            taoist  00000000000000001111  -
+            {}
+        police  00000000000000000000  -
+        post_box  00000000000000000000  -
+        post_office  00000000000000000000  -
+        pub  00000000000000000000  -
+        public_bookcase  00000000000000000000  -
+        recycling  00000000000000000000  -
+        restaurant  00000000000000001111  -
+        school  00000000000000000000  -
+        shelter  00000000000000000000  -
+        speed_trap  00000000000000000000  -
+        taxi  00000000000000000000  -
+        telephone  00000000000000000000  -
+        theatre  00000000000000000000  -
+        toilets  00000000000000000000  -
+        townhall  00000000000000000000  -
+        university  00000000000000001111  -
         vending_machine  00000000000000000000  +
             cigarettes  00000000000000000111  -
             drinks  00000000000000000111  -
             parking_tickets  00000000000000000111  -
             public_transport_tickets  00000000000000000111  -
             {}
-        veterinary  00000000000000001111  -
-        waste_basket  00000000000000000011  -
-        waste_disposal  00000000000000000011  -
+        veterinary  00000000000000000000  -
+        waste_basket  00000000000000000000  -
+        waste_disposal  00000000000000000000  -
         {}
     area:highway  00000000000000000000  +
         cycleway  00000000000000000000  -
-        footway  00000000000000111111  -
-        living_street  00000000000000111111  -
+        footway  00000000000000000000  -
+        living_street  00000000000000000000  -
         motorway  00000000000000000000  -
         path  00000000000000000000  -
-        pedestrian  00000000000000111111  -
+        pedestrian  00000000000000000000  -
         primary  00000000000000000000  -
         residential  00000000000000000000  -
         secondary  00000000000000000000  -
@@ -128,18 +128,18 @@ world  00000000000000000000  +
         unclassified  00000000000000000000  -
         {}
     barrier  00000000000000000000  +
-        block  00000000000000001111  -
-        bollard  00000000000000001111  -
+        block  00000000000000000000  -
+        bollard  00000000000000000000  -
         border_control  00000000000000011111  -
         city_wall  00000000000000001111  -
         cycle_barrier  00000000000000000000  -
-        entrance  00000000000000001111  -
+        entrance  00000000000000000000  -
         fence  00000000000000001111  -
-        gate  00000000000000001111  -
+        gate  00000000000000000000  -
         hedge  00000000000000001111  -
         lift_gate  00000000000000001111  -
-        retaining_wall  00000000000000001111  -
-        stile  00000000000000001111  -
+        retaining_wall  00000000000000000000  -
+        stile  00000000000000000000  -
         toll_booth  00000000000011111111  -
         wall  00000000000000001111  -
         {}
@@ -168,11 +168,11 @@ world  00000000000000000000  +
             {}
         national_park  00000000000111111111  -
         {}
-    building  00000000000000111111  +
+    building  00000000000000011111  +
         address  00000000000000001111  -
-        garage  00000000000000111111  -
-        has_parts  00000000000000111111  -
-        train_station  00000000000001111111  -
+        garage  00000000000000011111  -
+        has_parts  00000000000000011111  -
+        train_station  00000000000111111111  -
         {}
     building:part  00000000000000001111  -
     communication  00000000000000000000  +
@@ -181,51 +181,51 @@ world  00000000000000000000  +
             {}
         {}
     craft  00000000000000000000  +
-        brewery  00000000000000000011  -
-        carpenter  00000000000000000011  -
-        electrician  00000000000000000011  -
-        gardener  00000000000000000011  -
-        hvac  00000000000000000011  -
-        metal_construction  00000000000000000011  -
-        painter  00000000000000000011  -
-        photographer  00000000000000000011  -
-        plumber  00000000000000000011  -
-        shoemaker  00000000000000000011  -
-        tailor  00000000000000000011  -
+        brewery  00000000000000000000  -
+        carpenter  00000000000000000000  -
+        electrician  00000000000000000000  -
+        gardener  00000000000000000000  -
+        hvac  00000000000000000000  -
+        metal_construction  00000000000000000000  -
+        painter  00000000000000000000  -
+        photographer  00000000000000000000  -
+        plumber  00000000000000000000  -
+        shoemaker  00000000000000000000  -
+        tailor  00000000000000000000  -
         {}
     earthquake:damage  00000000000000000000  +
         spontaneous_camp  00000000000000000000  -
         {}
     emergency  00000000000000000000  +
-        phone  00000000000000000111  -
+        phone  00000000000000000000  -
         {}
-    entrance  00000000000000000011  -
+    entrance  00000000000000000000  -
     highway  00000000000000000000  +
-        bridleway  00000000000000111111  +
-            bridge  00000000000000111111  -
-            permissive  00000000000000111111  -
-            tunnel  00000000000000111111  -
+        bridleway  00000000000000000000  +
+            bridge  00000000000000000000  -
+            permissive  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
-        bus_stop  00000000000000001111  -
+        bus_stop  00000000000000000000  -
         construction  00000000000001111111  -
-        cycleway  00000000000001111111  +
-            bridge  00000000000001111111  -
-            permissive  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        cycleway  00000000000000000000  +
+            bridge  00000000000000000000  -
+            permissive  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
-        footway  00000000000000111111  +
-            alpine_hiking  00000000000000111111  -
-            area  00000000000000111111  -
-            bridge  00000000000000111111  -
-            demanding_alpine_hiking  00000000000000111111  -
-            demanding_mountain_hiking  00000000000000111111  -
-            difficult_alpine_hiking  00000000000000111111  -
-            hiking  00000000000000111111  -
-            mountain_hiking  00000000000000111111  -
-            permissive  00000000000000111111  -
-            tunnel  00000000000000111111  -
+        footway  00000000000000000000  +
+            alpine_hiking  00000000000000000000  -
+            area  00000000000000000000  -
+            bridge  00000000000000000000  -
+            demanding_alpine_hiking  00000000000000000000  -
+            demanding_mountain_hiking  00000000000000000000  -
+            difficult_alpine_hiking  00000000000000000000  -
+            hiking  00000000000000000000  -
+            mountain_hiking  00000000000000000000  -
+            permissive  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
-        ford  00000000000001111111  -
+        ford  00000000000000000000  -
         living_street  00000000000011111111  +
             bridge  00000000000011111111  -
             tunnel  00000000000011111111  -
@@ -239,23 +239,23 @@ world  00000000000000000000  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        path  00000000000000111111  +
-            alpine_hiking  00000000000000111111  -
-            bicycle  00000000000000111111  -
-            bridge  00000000000000111111  -
-            demanding_alpine_hiking  00000000000000111111  -
-            demanding_mountain_hiking  00000000000000111111  -
-            difficult_alpine_hiking  00000000000000111111  -
-            hiking  00000000000000111111  -
-            horse  00000000000000111111  -
-            mountain_hiking  00000000000000111111  -
-            permissive  00000000000000111111  -
-            tunnel  00000000000000111111  -
+        path  00000000000000000000  +
+            alpine_hiking  00000000000000000000  -
+            bicycle  00000000000000000000  -
+            bridge  00000000000000000000  -
+            demanding_alpine_hiking  00000000000000000000  -
+            demanding_mountain_hiking  00000000000000000000  -
+            difficult_alpine_hiking  00000000000000000000  -
+            hiking  00000000000000000000  -
+            horse  00000000000000000000  -
+            mountain_hiking  00000000000000000000  -
+            permissive  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
-        pedestrian  00000000000001111111  +
-            area  00000000000001111111  -
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        pedestrian  00000000000000000000  +
+            area  00000000000000000000  -
+            bridge  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
         platform  00000000000000000000  -
         primary  00000000111111111111  +
@@ -267,7 +267,7 @@ world  00000000000000000000  +
             tunnel  00000000001111111111  -
             {}
         proposed  00000000000001111111  -
-        raceway  00000000000000111111  -
+        raceway  00000000000000000000  -
         residential  00000000000111111111  +
             area  00000000000111111111  -
             bridge  00000000000111111111  -
@@ -286,21 +286,21 @@ world  00000000000000000000  +
             bridge  00000000000000111111  -
             tunnel  00000000000000111111  -
             {}
-        service  00000000000000011111  +
-            area  00000000000000011111  -
-            bridge  00000000000000011111  -
-            driveway  00000000000000001111  +
-                area  00000000000000001111  -
-                bridge  00000000000000001111  -
-                tunnel  00000000000000001111  -
+        service  00000000000000111111  +
+            area  00000000000000111111  -
+            bridge  00000000000000111111  -
+            driveway  00000000000000101111  +
+                area  00000000000000101111  -
+                bridge  00000000000000101111  -
+                tunnel  00000000000000101111  -
                 {}
-            parking_aisle  00000000000000011111  -
-            tunnel  00000000000000011111  -
+            parking_aisle  00000000000000111111  -
+            tunnel  00000000000000111111  -
             {}
-        speed_camera  00000000000000001111  -
-        steps  00000000000000001111  +
-            bridge  00000000000000001111  -
-            tunnel  00000000000000001111  -
+        speed_camera  00000000000001111111  -
+        steps  00000000000000000000  +
+            bridge  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
         tertiary  00000000000111111111  +
             bridge  00000000000111111111  -
@@ -310,26 +310,26 @@ world  00000000000000000000  +
             bridge  00000000000000011111  -
             tunnel  00000000000000011111  -
             {}
-        track  00000000000000111111  +
-            area  00000000000000111111  -
-            bridge  00000000000000111111  -
-            grade1  00000000000000111111  -
-            grade2  00000000000000111111  -
-            grade3  00000000000000111111  +
-                no-access  00000000000000111111  -
-                permissive  00000000000000111111  -
+        track  00000000000000000000  +
+            area  00000000000000000000  -
+            bridge  00000000000000000000  -
+            grade1  00000000000000000000  -
+            grade2  00000000000000000000  -
+            grade3  00000000000000000000  +
+                no-access  00000000000000000000  -
+                permissive  00000000000000000000  -
                 {}
-            grade4  00000000000000111111  +
-                no-access  00000000000000111111  -
-                permissive  00000000000000111111  -
+            grade4  00000000000000000000  +
+                no-access  00000000000000000000  -
+                permissive  00000000000000000000  -
                 {}
-            grade5  00000000000000111111  +
-                no-access  00000000000000111111  -
-                permissive  00000000000000111111  -
+            grade5  00000000000000000000  +
+                no-access  00000000000000000000  -
+                permissive  00000000000000000000  -
                 {}
-            no-access  00000000000000111111  -
-            permissive  00000000000000111111  -
-            tunnel  00000000000000111111  -
+            no-access  00000000000000000000  -
+            permissive  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
         traffic_signals  00000000000000000000  -
         trunk  00000001111111111111  +
@@ -349,20 +349,20 @@ world  00000000000000000000  +
         world_towns_level  00000011110000000000  -
         {}
     historic  00000000000000000000  +
-        archaeological_site  00000000000000000111  -
+        archaeological_site  00000000000000000000  -
         battlefield  00000000000000000000  -
-        boundary_stone  00000000000000001111  -
-        castle  00000000000011111111  -
-        citywalls  00000000000000001111  -
-        fort  00000000000011111111  -
-        memorial  00000000000000011111  -
-        monument  00000000000001111111  -
-        museum  00000000000000001111  -
-        ruins  00000000000000000111  -
-        ship  00000000000000001111  -
-        tomb  00000000000000001111  -
-        wayside_cross  00000000000000001111  -
-        wayside_shrine  00000000000000001111  -
+        boundary_stone  00000000000000000000  -
+        castle  00000000000000000000  -
+        citywalls  00000000000000000000  -
+        fort  00000000000000000000  -
+        memorial  00000000000000000000  -
+        monument  00000000000000000000  -
+        museum  00000000000000000000  -
+        ruins  00000000000000000000  -
+        ship  00000000000000000000  -
+        tomb  00000000000000000000  -
+        wayside_cross  00000000000000000000  -
+        wayside_shrine  00000000000000000000  -
         {}
     hwtag  00000000000000000000  +
         bidir_bicycle  00000000000000000000  -
@@ -383,35 +383,35 @@ world  00000000000000000000  +
         roundabout  00000000000000000000  -
         {}
     landuse  00000000000000000000  +
-        allotments  00000000000011111111  -
+        allotments  00000000000000111111  -
         basin  00000000000011111111  -
         brownfield  00000000000000000000  -
         cemetery  00000000000000111111  +
             christian  00000000000000111111  -
             {}
-        commercial  00000000000000000111  -
+        commercial  00000000000000000000  -
         construction  00000000000000011111  -
         farm  00000000000000000000  -
-        farmland  00000000000011111111  -
+        farmland  00000000000000111111  -
         farmyard  00000000000000000000  -
-        field  00000000000011111111  -
+        field  00000000000000111111  -
         forest  00000000001111111111  +
             coniferous  00000000001111111111  -
             deciduous  00000000001111111111  -
             mixed  00000000001111111111  -
             {}
-        garages  00000000000000111111  -
-        grass  00000000000011111111  -
+        garages  00000000000000011111  -
+        grass  00000000000000111111  -
         greenfield  00000000000000000000  -
         greenhouse_horticulture  00000000000000000000  -
         industrial  00000000000000011111  -
         landfill  00000000000000011111  -
-        meadow  00000000000011111111  -
-        military  00000000000000001111  -
-        orchard  00000000000011111111  -
+        meadow  00000000000000111111  -
+        military  00000000000000000000  -
+        orchard  00000000000000111111  -
         quarry  00000000000000011111  -
         railway  00000000000000011111  -
-        recreation_ground  00000000000011111111  -
+        recreation_ground  00000000000000111111  -
         reservoir  00000000001111111111  -
         residential  00000000000000000000  +
             rural  00000000000000000000  -
@@ -419,53 +419,53 @@ world  00000000000000000000  +
             {}
         retail  00000000000000000000  -
         salt_pond  11111111111111111111  -
-        village_green  00000000000011111111  -
-        vineyard  00000000000011111111  -
+        village_green  00000000000000111111  -
+        vineyard  00000000000000111111  -
         {}
     leisure  00000000000000000000  +
-        common  00000000000000000111  -
-        dog_park  00000000000000001111  +
-            tennis  00000000000000001111  -
+        common  00000000000000000000  -
+        dog_park  00000000000000000000  +
+            tennis  00000000000000000000  -
             {}
-        fitness_centre  00000000000000000111  -
+        fitness_centre  00000000000000000000  -
         garden  00000000000011111111  -
-        golf_course  00000000000011111111  -
-        landscape_reserve  00000000000000000111  -
+        golf_course  00000000000000111111  -
+        landscape_reserve  00000000000000000000  -
         nature_reserve  00000000001111111111  -
         park  00000000001111111111  +
             no-access  00000000001111111111  -
             permissive  00000000001111111111  -
             private  00000000001111111111  -
             {}
-        pitch  00000000000000011111  +
-            tennis  00000000000000011111  -
+        pitch  00000000000000000000  +
+            tennis  00000000000000000000  -
             {}
-        playground  00000000000000000111  +
-            tennis  00000000000000000111  -
+        playground  00000000000000000000  +
+            tennis  00000000000000000000  -
             {}
         playing_fields  00000000000000000000  +
-            tennis  00000000000000000111  -
-            {}
-        recreation_ground  00000000000000000111  -
-        sauna  00000000000000000111  -
-        slipway  00000000000000000111  -
-        sports_centre  00000000000000000111  +
-            climbing  00000000000000000111  -
-            shooting  00000000000000000111  -
-            swimming  00000000000000000111  -
-            yoga  00000000000000000111  -
-            {}
-        stadium  00000000000001111111  -
+            tennis  00000000000000000000  -
+            {}
+        recreation_ground  00000000000000000000  -
+        sauna  00000000000000000000  -
+        slipway  00000000000000000000  -
+        sports_centre  00000000000000000000  +
+            climbing  00000000000000000000  -
+            shooting  00000000000000000000  -
+            swimming  00000000000000000000  -
+            yoga  00000000000000000000  -
+            {}
+        stadium  00000000000000011111  -
         swimming_pool  00000000000001111111  -
-        track  00000000000000111111  -
-        water_park  00000000000000001111  -
+        track  00000000000000000000  -
+        water_park  00000000000000000000  -
         {}
     man_made  00000000000000000000  +
         breakwater  00000000000011111111  -
         cairn  00000000000000000000  -
-        chimney  00000000000000000011  -
+        chimney  00000000000000000000  -
         cutline  00000000000000111111  -
-        lighthouse  00000000000000111111  -
+        lighthouse  00000000000000000000  -
         pier  00000000000011111111  -
         pipeline  00000000000000000000  +
             overground  00000000000000000000  -
@@ -474,7 +474,7 @@ world  00000000000000000000  +
         wastewater_plant  00000000000000000000  -
         water_tower  00000000000000000000  -
         water_well  00000000000000000000  -
-        windmill  00000000000000001111  -
+        windmill  00000000000000000000  -
         {}
     mapswithme  00000000000000000000  +
         grid  00000000000000000000  -
@@ -491,30 +491,30 @@ world  00000000000000000000  +
         bunker  00000000000000000000  -
         {}
     natural  00000000000000000000  +
-        bare_rock  00000000000000011111  -
+        bare_rock  00000000000000000000  -
         bay  00000000001111111111  -
         beach  00000000001111111111  -
         cape  00000000000000111111  -
-        cave_entrance  00000000000111111111  -
+        cave_entrance  00000000000000000000  -
         cliff  00000000000000000000  -
         coastline  11111111111111111111  -
         glacier  11111111111111111111  -
-        grassland  00000000000011111111  -
-        heath  00000000000011111111  -
+        grassland  00000000000000111111  -
+        heath  00000000000000111111  -
         lake  11111111111111111111  -
         land  11111111111111111111  -
         meadow  00000000000000000000  -
         orchard  00000000000000000000  -
-        peak  00000000000011111111  -
+        peak  00000000000000000000  -
         pond  11111111111111111111  -
-        rock  00000000000000011111  -
+        rock  00000000000000000000  -
         salt_pond  11111111111111111111  -
-        scrub  00000000000011111111  -
-        spring  00000000000000111111  -
+        scrub  00000000000000111111  -
+        spring  00000000000000000000  -
         tree  00000000000000000000  -
         tree_row  00000000000000000000  -
         vineyard  00000000000000000000  -
-        volcano  00000000001111111111  -
+        volcano  00000000000000000000  -
         water  11111111111111111111  -
         wetland  00000000000111111111  +
             bog  00000000000111111111  -
@@ -529,12 +529,12 @@ world  00000000000000000000  +
     noexit  00000000000000000000  +
         motor_vehicle  00000000000000000000  -
         {}
-    office  00000000000000000011  +
-        company  00000000000000000011  -
-        estate_agent  00000000000000000011  -
-        government  00000000000000000011  -
-        lawyer  00000000000000000111  -
-        telecommunication  00000000000000000011  -
+    office  00000000000000000000  +
+        company  00000000000000000000  -
+        estate_agent  00000000000000000000  -
+        government  00000000000000000000  -
+        lawyer  00000000000000000000  -
+        telecommunication  00000000000000000000  -
         {}
     olympics  00000000000000000000  +
         attraction  00000000000000000000  -
@@ -553,23 +553,23 @@ world  00000000000000000000  +
         water_sport  00000000000000000000  -
         {}
     piste:lift  00000000000000000000  +
-        j-bar  00000000000011111111  -
-        magic_carpet  00000000000011111111  -
-        platter  00000000000011111111  -
-        rope_tow  00000000000011111111  -
-        t-bar  00000000000011111111  -
+        j-bar  00000000000000000000  -
+        magic_carpet  00000000000000000000  -
+        platter  00000000000000000000  -
+        rope_tow  00000000000000000000  -
+        t-bar  00000000000000000000  -
         {}
     piste:type  00000000000000000000  +
-        downhill  00000000000000111111  +
-            advanced  00000000000000111111  -
-            easy  00000000000000111111  -
-            expert  00000000000000111111  -
-            freeride  00000000000000111111  -
-            intermediate  00000000000000111111  -
-            novice  00000000000000111111  -
+        downhill  00000000000000000000  +
+            advanced  00000000000000000000  -
+            easy  00000000000000000000  -
+            expert  00000000000000000000  -
+            freeride  00000000000000000000  -
+            intermediate  00000000000000000000  -
+            novice  00000000000000000000  -
             {}
-        nordic  00000000000000111111  -
-        sled  00000000000000111111  -
+        nordic  00000000000000000000  -
+        sled  00000000000000000000  -
         {}
     place  00000000000000000000  +
         city  00001111111111111111  +
@@ -591,11 +591,11 @@ world  00000000000000000000  +
         county  00000000000000000000  -
         farm  00000000000000111111  -
         hamlet  00000000000001111111  -
-        island  00000000000011111111  -
+        island  00000000000011100000  -
         islet  00000000001111111111  -
         isolated_dwelling  00000000000000111111  -
         locality  00000000000001111111  -
-        neighbourhood  00000000000001111111  -
+        neighbourhood  00000000000001111000  -
         ocean  01111111111111111111  -
         region  00000000110000000000  -
         sea  00001111111111111111  -
@@ -612,14 +612,14 @@ world  00000000000000000000  +
             photovoltaic  00000000000000000000  -
             wind  00000000000000000000  -
             {}
-        line  00000000000000000001  +
-            underground  00000000000000000001  -
+        line  00000000000000000000  +
+            underground  00000000000000000000  -
             {}
         minor_line  00000000000000000000  -
         pole  00000000000000000000  -
-        station  00000000000000000111  -
-        substation  00000000000000000111  -
-        tower  00000000000000001111  -
+        station  00000000000000000000  -
+        substation  00000000000000000000  -
+        tower  00000000000000000000  -
         {}
     psurface  00000000000000000000  +
         paved_bad  00000000000000000000  -
@@ -628,7 +628,7 @@ world  00000000000000000000  +
         unpaved_good  00000000000000000000  -
         {}
     public_transport  00000000000000000000  +
-        platform  00000000000000001111  -
+        platform  00000000000000000000  -
         {}
     railway  00000000000000000000  +
         abandoned  00000000000000001111  +
@@ -638,9 +638,9 @@ world  00000000000000000000  +
         construction  00000000000000001111  -
         crossing  00000000000000000000  -
         disused  00000000000000001111  -
-        funicular  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        funicular  00000000000000000000  +
+            bridge  00000000000000000000  -
+            tunnel  00000000000000000000  -
             {}
         halt  00000000000111111111  -
         incline  00000000000000000000  +
@@ -660,7 +660,7 @@ world  00000000000000000000  +
             bridge  00000000000000011111  -
             tunnel  00000000000000011111  -
             {}
-        platform  00000000000000001111  -
+        platform  00000000000000000000  -
         preserved  00000000000000001111  +
             bridge  00000000000000001111  -
             tunnel  00000000000000001111  -
@@ -680,34 +680,34 @@ world  00000000000000000000  +
             bridge  00000000000000000000  -
             tunnel  00000000000000000000  -
             {}
-        station  00000000000001111111  +
-            light_rail  00000000000001111111  -
-            monorail  00000000000001111111  -
-            subway  00000000000001111111  +
-                barcelona  00000000000001111111  -
-                berlin  00000000000001111111  -
-                blue  00000000000001111111  -
-                brown  00000000000001111111  -
-                darkgreen  00000000000001111111  -
-                gray  00000000000001111111  -
-                green  00000000000001111111  -
-                grey  00000000000001111111  -
-                kiev  00000000000001111111  -
-                lightblue  00000000000001111111  -
-                lightgreen  00000000000001111111  -
-                london  00000000000001111111  -
-                madrid  00000000000001111111  -
-                minsk  00000000000001111111  -
+        station  00000000000011111111  +
+            light_rail  00000000000011111111  -
+            monorail  00000000000011111111  -
+            subway  00000000000011111111  +
+                barcelona  00000000000011111111  -
+                berlin  00000000000011111111  -
+                blue  00000000000011111111  -
+                brown  00000000000011111111  -
+                darkgreen  00000000000011111111  -
+                gray  00000000000011111111  -
+                green  00000000000011111111  -
+                grey  00000000000011111111  -
+                kiev  00000000000011111111  -
+                lightblue  00000000000011111111  -
+                lightgreen  00000000000011111111  -
+                london  00000000000011111111  -
+                madrid  00000000000011111111  -
+                minsk  00000000000011111111  -
                 moscow  00000000000111111111  -
-                newyork  00000000000001111111  -
-                orange  00000000000001111111  -
-                paris  00000000000001111111  -
-                purple  00000000000001111111  -
-                red  00000000000001111111  -
-                roma  00000000000001111111  -
+                newyork  00000000000011111111  -
+                orange  00000000000011111111  -
+                paris  00000000000011111111  -
+                purple  00000000000011111111  -
+                red  00000000000011111111  -
+                roma  00000000000011111111  -
                 spb  00000000000111111111  -
-                violet  00000000000001111111  -
-                yellow  00000000000001111111  -
+                violet  00000000000011111111  -
+                yellow  00000000000011111111  -
                 {}
             {}
         subway  00000000000000000000  +
@@ -740,20 +740,20 @@ world  00000000000000000000  +
             roma  00000000000000001111  -
             spb  00000000000000001111  -
             {}
-        tram  00000000000001111111  +
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        tram  00000000000000001111  +
+            bridge  00000000000000001111  -
+            tunnel  00000000000000001111  -
             {}
-        tram_stop  00000000000000111111  -
+        tram_stop  00000000000000000111  -
         yard  00000000000111111111  +
             bridge  00000000000111111111  -
             tunnel  00000000000111111111  -
             {}
         {}
     route  00000000000000000000  +
-        ferry  00000000001111111111  +
-            motor_vehicle  00000000001111111111  -
-            motorcar  00000000001111111111  -
+        ferry  00000000000000000000  +
+            motor_vehicle  00000000000000000000  -
+            motorcar  00000000000000000000  -
             {}
         shuttle_train  00000000000000000000  -
         {}
@@ -792,7 +792,7 @@ world  00000000000000000000  +
         jewelry  00000000000000001111  -
         kiosk  00000000000000001111  -
         laundry  00000000000000001111  -
-        mall  00000000000000111111  -
+        mall  00000000000011111111  -
         mobile_phone  00000000000000001111  -
         optician  00000000000000001111  -
         outdoor  00000000000000001111  -
@@ -801,7 +801,7 @@ world  00000000000000000000  +
         seafood  00000000000000001111  -
         shoes  00000000000000001111  -
         sports  00000000000000001111  -
-        supermarket  00000000000000001111  -
+        supermarket  00000000000000111111  -
         ticket  00000000000000001111  -
         toys  00000000000000001111  -
         travel_agency  00000000000000001111  -
@@ -825,53 +825,53 @@ world  00000000000000000000  +
         opentable  00000000000000000000  -
         {}
     sport  00000000000000000000  +
-        american_football  00000000000000000111  -
-        archery  00000000000000000111  -
-        athletics  00000000000000000111  -
-        australian_football  00000000000000000111  -
-        baseball  00000000000000000111  -
-        basketball  00000000000000000111  -
-        bowls  00000000000000000111  -
-        cricket  00000000000000000111  -
-        curling  00000000000000000111  -
-        diving  00000000000000000111  -
-        equestrian  00000000000000001111  -
-        football  00000000000000000111  -
-        golf  00000000000000000111  -
-        gymnastics  00000000000000000111  -
-        handball  00000000000000000111  -
-        multi  00000000000000000111  -
-        scuba_diving  00000000000000000111  -
-        shooting  00000000000000000111  -
-        skiing  00000000000000000111  -
-        soccer  00000000000000001111  -
-        swimming  00000000000000000111  -
-        tennis  00000000000000000111  -
+        american_football  00000000000000000000  -
+        archery  00000000000000000000  -
+        athletics  00000000000000000000  -
+        australian_football  00000000000000000000  -
+        baseball  00000000000000000000  -
+        basketball  00000000000000000000  -
+        bowls  00000000000000000000  -
+        cricket  00000000000000000000  -
+        curling  00000000000000000000  -
+        diving  00000000000000000000  -
+        equestrian  00000000000000000000  -
+        football  00000000000000000000  -
+        golf  00000000000000000000  -
+        gymnastics  00000000000000000000  -
+        handball  00000000000000000000  -
+        multi  00000000000000000000  -
+        scuba_diving  00000000000000000000  -
+        shooting  00000000000000000000  -
+        skiing  00000000000000000000  -
+        soccer  00000000000000000000  -
+        swimming  00000000000000000000  -
+        tennis  00000000000000000000  -
         {}
     tourism  00000000000000000000  +
-        alpine_hut  00000000000000111111  -
-        apartment  00000000000000111111  -
-        artwork  00000000000000011111  -
-        attraction  00000000000000111111  -
-        camp_site  00000000000000011111  -
-        caravan_site  00000000000000001111  -
-        chalet  00000000000000111111  -
-        gallery  00000000000000011111  -
-        guest_house  00000000000000111111  -
-        hostel  00000000000000111111  -
-        hotel  00000000000000111111  -
-        information  00000000000000001111  +
-            board  00000000000000001111  -
-            guidepost  00000000000000001111  -
-            map  00000000000000001111  -
-            office  00000000000000001111  -
-            {}
-        motel  00000000000000111111  -
-        museum  00000000000001111111  -
-        picnic_site  00000000000000001111  -
-        resort  00000000000000111111  -
-        viewpoint  00000000000000111111  -
-        zoo  00000000000001111111  -
+        alpine_hut  00000000000000000000  -
+        apartment  00000000000000000000  -
+        artwork  00000000000000000000  -
+        attraction  00000000000000000000  -
+        camp_site  00000000000000000000  -
+        caravan_site  00000000000000000000  -
+        chalet  00000000000000000000  -
+        gallery  00000000000000000000  -
+        guest_house  00000000000000000000  -
+        hostel  00000000000000000000  -
+        hotel  00000000000000000000  -
+        information  00000000000000000000  +
+            board  00000000000000000000  -
+            guidepost  00000000000000000000  -
+            map  00000000000000000000  -
+            office  00000000000000000000  -
+            {}
+        motel  00000000000000000000  -
+        museum  00000000000000000000  -
+        picnic_site  00000000000000000000  -
+        resort  00000000000000000000  -
+        viewpoint  00000000000000000000  -
+        zoo  00000000000000000000  -
         {}
     traffic_calming  00000000000000000000  +
         bump  00000000000000000000  -
@@ -879,28 +879,28 @@ world  00000000000000000000  +
         {}
     waterway  00000000000000000000  +
         canal  00000000000001111111  +
-            tunnel  00000000000000000000  -
+            tunnel  00000000000001111111  -
             {}
         dam  00000000000000011111  -
         ditch  00000000000000000111  +
-            tunnel  00000000000000000000  -
+            tunnel  00000000000000000111  -
             {}
         dock  11111111111111111111  -
         drain  00000000000000000111  +
-            tunnel  00000000000000000000  -
+            tunnel  00000000000000000111  -
             {}
         lock  00000000000000001111  -
         lock_gate  00000000000000001111  -
         river  00000000001111111111  +
-            tunnel  00000000000000000000  -
+            tunnel  00000000001111111111  -
             {}
         riverbank  11111111111111111111  -
         stream  00000000000001111111  +
             ephemeral  00000000000001111111  -
             intermittent  00000000000001111111  -
-            tunnel  00000000000000000000  -
+            tunnel  00000000000001111111  -
             {}
-        waterfall  00000000000111111111  -
+        waterfall  00000000000000000000  -
         weir  00000000000000011111  -
         {}
     wheelchair  00000000000000000000  +