[styles] Built refactored styles

1 files changed, 515 insertions, 515 deletions

diff --git a/data/visibility.txt b/data/visibility.txt
index f584ecb860..8d87d4dfef 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -1,62 +1,62 @@
 world  00000000000000000000  +
     aerialway  00000000000000000000  +
-        cable_car  00000000000000011111  -
-        chair_lift  00000000000000011111  -
-        drag_lift  00000000000000000000  -
-        gondola  00000000000000011111  -
-        mixed_lift  00000000000000011111  -
-        station  00000000000001111111  -
+        cable_car  00000000000011111111  -
+        chair_lift  00000000000011111111  -
+        drag_lift  00000000000011111111  -
+        gondola  00000000000011111111  -
+        mixed_lift  00000000000011111111  -
+        station  00000000000011111111  -
         {}
     aeroway  00000000000000000000  +
-        aerodrome  00000000000111111111  +
-            international  00000000000111111111  -
+        aerodrome  00000000001111111111  +
+            international  00000000001111111111  -
             {}
-        apron  00000000000111111111  -
+        apron  00000000000000000000  -
         gate  00000000000000000111  -
-        helipad  00000000000000011111  -
+        helipad  00000000000000000111  -
         runway  00000000000011111111  -
-        taxiway  00000000000011111111  -
-        terminal  00000000000011111111  -
+        taxiway  00000000000000111111  -
+        terminal  00000000000000111111  -
         {}
-    amenity  00000000000000000111  +
-        atm  00000000000000000111  -
+    amenity  00000000000000000001  +
+        atm  00000000000000000011  -
         bank  00000000000000001111  -
-        bar  00000000000000001111  -
-        bbq  00000000000000000111  -
-        bench  00000000000000001111  -
+        bar  00000000000000011111  -
+        bbq  00000000000000000011  -
+        bench  00000000000000000011  -
         bicycle_parking  00000000000000000111  -
-        bicycle_rental  00000000000000001111  -
-        brothel  00000000000000000111  -
-        bureau_de_change  00000000000000001111  -
-        bus_station  00000000000000001111  -
-        cafe  00000000000000001111  -
-        car_rental  00000000000000001111  -
-        car_sharing  00000000000000001111  -
+        bicycle_rental  00000000000000000111  -
+        brothel  00000000000000000001  -
+        bureau_de_change  00000000000000000111  -
+        bus_station  00000000000011111111  -
+        cafe  00000000000000011111  -
+        car_rental  00000000000000000011  -
+        car_sharing  00000000000000000011  -
         car_wash  00000000000000000111  -
         casino  00000000000000000111  -
-        charging_station  00000000000000000111  -
+        charging_station  00000000000000111111  -
         childcare  00000000000000000111  -
-        cinema  00000000000000001111  -
+        cinema  00000000000000000111  -
         clinic  00000000000000000111  -
-        college  00000000000001111111  -
-        community_centre  00000000000000000111  -
+        college  00000000000000000111  -
+        community_centre  00000000000000111111  -
         courthouse  00000000000000000111  -
         dentist  00000000000000000111  -
-        doctors  00000000000000001111  -
-        drinking_water  00000000000000000111  -
-        embassy  00000000000000001111  -
-        fast_food  00000000000000001111  -
-        ferry_terminal  00000000000000001111  -
-        fire_station  00000000000000001111  -
+        doctors  00000000000000111111  -
+        drinking_water  00000000000000011111  -
+        embassy  00000000000000000111  -
+        fast_food  00000000000000011111  -
+        ferry_terminal  00000000000111111111  -
+        fire_station  00000000000000000011  -
         fountain  00000000000000001111  -
-        fuel  00000000000000011111  -
-        grave_yard  00000000000001111111  +
-            christian  00000000000001111111  -
-            {}
-        hospital  00000000000000000111  -
-        hunting_stand  00000000000000001111  -
-        kindergarten  00000000000001111111  -
-        library  00000000000000001111  -
+        fuel  00000000000000111111  -
+        grave_yard  00000000000000111111  +
+            christian  00000000000000111111  -
+            {}
+        hospital  00000000000000111111  -
+        hunting_stand  00000000000000000011  -
+        kindergarten  00000000000000000111  -
+        library  00000000000000000011  -
         marketplace  00000000000000001111  -
         nightclub  00000000000000001111  -
         parking  00000000000000011111  +
@@ -64,64 +64,64 @@ world  00000000000000000000  +
             multi-storey  00000000000000011111  +
                 fee  00000000000000011111  -
                 {}
-            no-access  00000000000000000111  -
+            no-access  00000000000000011111  -
             park_and_ride  00000000000000011111  -
-            permissive  00000000000000001111  +
-                fee  00000000000000001111  -
+            permissive  00000000000000011111  +
+                fee  00000000000000011111  -
                 {}
-            private  00000000000000001111  -
+            private  00000000000000011111  -
             underground  00000000000000011111  +
                 fee  00000000000000011111  -
                 {}
             {}
         pharmacy  00000000000000001111  -
-        place_of_worship  00000000000000001111  +
-            buddhist  00000000000000001111  -
-            christian  00000000000000001111  -
-            hindu  00000000000000001111  -
-            jewish  00000000000000001111  -
-            muslim  00000000000000001111  -
-            shinto  00000000000000001111  -
-            taoist  00000000000000001111  -
+        place_of_worship  00000000000000111111  +
+            buddhist  00000000000000111111  -
+            christian  00000000000000111111  -
+            hindu  00000000000000111111  -
+            jewish  00000000000000111111  -
+            muslim  00000000000000111111  -
+            shinto  00000000000000111111  -
+            taoist  00000000000000111111  -
             {}
         police  00000000000000000111  -
-        post_box  00000000000000000111  -
-        post_office  00000000000000001111  -
-        pub  00000000000000001111  -
-        public_bookcase  00000000000000000111  -
+        post_box  00000000000000000011  -
+        post_office  00000000000000000111  -
+        pub  00000000000000011111  -
+        public_bookcase  00000000000000000001  -
         recycling  00000000000000000111  -
-        restaurant  00000000000000001111  -
-        school  00000000000001111111  -
-        shelter  00000000000000111111  -
-        speed_trap  00000000000000001111  -
+        restaurant  00000000000000011111  -
+        school  00000000000000000111  -
+        shelter  00000000000000001111  -
+        speed_trap  00000000000000000001  -
         taxi  00000000000000001111  -
-        telephone  00000000000000001111  -
-        theatre  00000000000000001111  -
-        toilets  00000000000000000111  -
-        townhall  00000000000000001111  -
-        university  00000000000001111111  -
+        telephone  00000000000000000111  -
+        theatre  00000000000000111111  -
+        toilets  00000000000000000011  -
+        townhall  00000000000000000001  -
+        university  00000000000000111111  -
         vending_machine  00000000000000000000  +
             cigarettes  00000000000000000111  -
             drinks  00000000000000000111  -
             parking_tickets  00000000000000000111  -
             public_transport_tickets  00000000000000000111  -
             {}
-        veterinary  00000000000000000111  -
-        waste_basket  00000000000000000111  -
-        waste_disposal  00000000000000000111  -
+        veterinary  00000000000000001111  -
+        waste_basket  00000000000000000011  -
+        waste_disposal  00000000000000000011  -
         {}
     area:highway  00000000000000000000  +
         cycleway  00000000000000000000  -
-        footway  00000000000000011111  -
-        living_street  00000000000000000000  -
+        footway  00000000000000111111  -
+        living_street  00000000000000111111  -
         motorway  00000000000000000000  -
-        path  00000000000000011111  -
-        pedestrian  00000000000000011111  -
+        path  00000000000000000000  -
+        pedestrian  00000000000000111111  -
         primary  00000000000000000000  -
         residential  00000000000000000000  -
         secondary  00000000000000000000  -
         service  00000000000000000000  -
-        steps  00000000000000011111  -
+        steps  00000000000000000000  -
         tertiary  00000000000000000000  -
         track  00000000000000000000  -
         trunk  00000000000000000000  -
@@ -130,134 +130,134 @@ world  00000000000000000000  +
     barrier  00000000000000000000  +
         block  00000000000000001111  -
         bollard  00000000000000001111  -
-        border_control  00000000000000001111  -
+        border_control  00000000000000011111  -
         city_wall  00000000000000001111  -
         cycle_barrier  00000000000000000000  -
-        entrance  00000000000000000111  -
+        entrance  00000000000000001111  -
         fence  00000000000000001111  -
-        gate  00000000000000000111  -
+        gate  00000000000000001111  -
         hedge  00000000000000001111  -
         lift_gate  00000000000000001111  -
         retaining_wall  00000000000000001111  -
         stile  00000000000000001111  -
-        toll_booth  00000000000000001111  -
+        toll_booth  00000000000011111111  -
         wall  00000000000000001111  -
         {}
     boundary  00000000000000000000  +
         administrative  00000000000000000000  +
-            10  00000000000000011111  -
-            11  00000000000000000111  -
-            2  01111111111111111111  -
-            3  00001110000000000000  -
-            4  00001110001100000000  +
-                state  00001110001111111111  -
+            10  00000000000000000000  -
+            11  00000000000000000000  -
+            2  00111111111111111111  -
+            3  00001000000000000000  -
+            4  00000111111111111111  +
+                state  00000111111111111111  -
                 {}
-            5  00000000000000111111  -
-            6  00000000000000111111  -
-            7  00000000000000011111  -
-            8  00000000000000011111  -
-            9  00000000000000011111  -
-            city  00000000000000011111  -
-            country  00000000000011111111  -
-            county  00000000000000111111  -
-            municipality  00000000000000011111  -
-            nation  00000000000011111111  -
-            region  00000000000011111111  -
-            state  00000000001111111111  -
-            suburb  00000000000000011111  -
-            {}
-        national_park  00000000001111111111  -
-        {}
-    building  00000000000000011111  +
+            5  00000000000000000000  -
+            6  00000000000000000000  -
+            7  00000000000000000000  -
+            8  00000000000000000000  -
+            9  00000000000000000000  -
+            city  00000000000000000000  -
+            country  00000000000000000000  -
+            county  00000000000000000000  -
+            municipality  00000000000000000000  -
+            nation  00000000000000000000  -
+            region  00000000000000000000  -
+            state  00000000000000000000  -
+            suburb  00000000000000000000  -
+            {}
+        national_park  00000000000111111111  -
+        {}
+    building  00000000000000111111  +
         address  00000000000000001111  -
-        garage  00000000000000011111  -
-        has_parts  00000000000000011111  -
-        train_station  00000000000000011111  -
+        garage  00000000000000111111  -
+        has_parts  00000000000000111111  -
+        train_station  00000000000001111111  -
         {}
-    building:part  00000000000000011111  -
+    building:part  00000000000000001111  -
     communication  00000000000000000000  +
-        line  00000000000000001111  +
-            underground  00000000000000001111  -
+        line  00000000000000000000  +
+            underground  00000000000000000000  -
             {}
         {}
     craft  00000000000000000000  +
-        brewery  00000000000000000111  -
-        carpenter  00000000000000000111  -
-        electrician  00000000000000000111  -
-        gardener  00000000000000000111  -
-        hvac  00000000000000000111  -
-        metal_construction  00000000000000000111  -
-        painter  00000000000000000111  -
-        photographer  00000000000000000111  -
-        plumber  00000000000000000111  -
-        shoemaker  00000000000000000111  -
-        tailor  00000000000000000111  -
+        brewery  00000000000000000011  -
+        carpenter  00000000000000000011  -
+        electrician  00000000000000000011  -
+        gardener  00000000000000000011  -
+        hvac  00000000000000000011  -
+        metal_construction  00000000000000000011  -
+        painter  00000000000000000011  -
+        photographer  00000000000000000011  -
+        plumber  00000000000000000011  -
+        shoemaker  00000000000000000011  -
+        tailor  00000000000000000011  -
         {}
     earthquake:damage  00000000000000000000  +
-        spontaneous_camp  00000000000000111111  -
+        spontaneous_camp  00000000000000000000  -
         {}
     emergency  00000000000000000000  +
-        phone  00000000000000000000  -
+        phone  00000000000000000111  -
         {}
-    entrance  00000000000000000111  -
+    entrance  00000000000000000011  -
     highway  00000000000000000000  +
-        bridleway  00000000000001111111  +
-            bridge  00000000000001111111  -
-            permissive  00000000000001111111  -
-            tunnel  00000000000001111111  -
-            {}
-        bus_stop  00000000000000001111  -
-        construction  00000000000001111111  -
-        cycleway  00000000000000111111  +
+        bridleway  00000000000000111111  +
             bridge  00000000000000111111  -
             permissive  00000000000000111111  -
             tunnel  00000000000000111111  -
             {}
-        footway  00000000000001111111  +
-            alpine_hiking  00000000000001111111  -
-            area  00000000000001111111  -
+        bus_stop  00000000000000001111  -
+        construction  00000000000001111111  -
+        cycleway  00000000000001111111  +
             bridge  00000000000001111111  -
-            demanding_alpine_hiking  00000000000001111111  -
-            demanding_mountain_hiking  00000000000001111111  -
-            difficult_alpine_hiking  00000000000001111111  -
-            hiking  00000000000001111111  -
-            mountain_hiking  00000000000001111111  -
             permissive  00000000000001111111  -
             tunnel  00000000000001111111  -
             {}
+        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  -
+            {}
         ford  00000000000001111111  -
-        living_street  00000000000001111111  +
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        living_street  00000000000011111111  +
+            bridge  00000000000011111111  -
+            tunnel  00000000000011111111  -
             {}
         motorway  00000001111111111111  +
             bridge  00000001111111111111  -
             tunnel  00000001111111111111  -
             {}
-        motorway_junction  00000000000001111111  -
-        motorway_link  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        motorway_junction  00000000000000011111  -
+        motorway_link  00000000001111111111  +
+            bridge  00000000001111111111  -
+            tunnel  00000000001111111111  -
             {}
-        path  00000000000001111111  +
-            alpine_hiking  00000000000001111111  -
-            bicycle  00000000000001111111  -
+        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  -
+            {}
+        pedestrian  00000000000001111111  +
+            area  00000000000001111111  -
             bridge  00000000000001111111  -
-            demanding_alpine_hiking  00000000000001111111  -
-            demanding_mountain_hiking  00000000000001111111  -
-            difficult_alpine_hiking  00000000000001111111  -
-            hiking  00000000000001111111  -
-            horse  00000000000001111111  -
-            mountain_hiking  00000000000001111111  -
-            permissive  00000000000001111111  -
             tunnel  00000000000001111111  -
             {}
-        pedestrian  00000000000000011111  +
-            area  00000000000000011111  -
-            bridge  00000000000000011111  -
-            tunnel  00000000000000011111  -
-            {}
-        platform  00000000000000001111  -
+        platform  00000000000000000000  -
         primary  00000000111111111111  +
             bridge  00000000111111111111  -
             tunnel  00000000111111111111  -
@@ -266,70 +266,70 @@ world  00000000000000000000  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        proposed  00000000000000000111  -
-        raceway  00000000000011111111  -
-        residential  00000000000001111111  +
-            area  00000000000001111111  -
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        proposed  00000000000001111111  -
+        raceway  00000000000000111111  -
+        residential  00000000000111111111  +
+            area  00000000000111111111  -
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
         rest_area  00000000000000000000  -
-        road  00000000000001111111  +
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
-            {}
-        secondary  00000000011111111111  +
-            bridge  00000000011111111111  -
-            tunnel  00000000011111111111  -
+        road  00000000000011111111  +
+            bridge  00000000000011111111  -
+            tunnel  00000000000011111111  -
             {}
-        secondary_link  00000000001111111111  +
+        secondary  00000000001111111111  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        service  00000000000001111111  +
-            area  00000000000001111111  -
-            bridge  00000000000001111111  -
-            driveway  00000000000001111111  +
-                area  00000000000001111111  -
-                bridge  00000000000001111111  -
-                tunnel  00000000000001111111  -
-                {}
-            parking_aisle  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        secondary_link  00000000000000111111  +
+            bridge  00000000000000111111  -
+            tunnel  00000000000000111111  -
             {}
-        speed_camera  00000000000000011111  -
-        steps  00000000000000011111  +
+        service  00000000000000011111  +
+            area  00000000000000011111  -
             bridge  00000000000000011111  -
+            driveway  00000000000000001111  +
+                area  00000000000000001111  -
+                bridge  00000000000000001111  -
+                tunnel  00000000000000001111  -
+                {}
+            parking_aisle  00000000000000011111  -
             tunnel  00000000000000011111  -
             {}
-        tertiary  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        speed_camera  00000000000000001111  -
+        steps  00000000000000001111  +
+            bridge  00000000000000001111  -
+            tunnel  00000000000000001111  -
             {}
-        tertiary_link  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        tertiary  00000000000111111111  +
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
-        track  00000000000001111111  +
-            area  00000000000001111111  -
-            bridge  00000000000001111111  -
-            grade1  00000000000001111111  -
-            grade2  00000000000001111111  -
-            grade3  00000000000001111111  +
-                no-access  00000000000001111111  -
-                permissive  00000000000001111111  -
+        tertiary_link  00000000000000011111  +
+            bridge  00000000000000011111  -
+            tunnel  00000000000000011111  -
+            {}
+        track  00000000000000111111  +
+            area  00000000000000111111  -
+            bridge  00000000000000111111  -
+            grade1  00000000000000111111  -
+            grade2  00000000000000111111  -
+            grade3  00000000000000111111  +
+                no-access  00000000000000111111  -
+                permissive  00000000000000111111  -
                 {}
-            grade4  00000000000001111111  +
-                no-access  00000000000001111111  -
-                permissive  00000000000001111111  -
+            grade4  00000000000000111111  +
+                no-access  00000000000000111111  -
+                permissive  00000000000000111111  -
                 {}
-            grade5  00000000000001111111  +
-                no-access  00000000000001111111  -
-                permissive  00000000000001111111  -
+            grade5  00000000000000111111  +
+                no-access  00000000000000111111  -
+                permissive  00000000000000111111  -
                 {}
-            no-access  00000000000001111111  -
-            permissive  00000000000001111111  -
-            tunnel  00000000000001111111  -
+            no-access  00000000000000111111  -
+            permissive  00000000000000111111  -
+            tunnel  00000000000000111111  -
             {}
         traffic_signals  00000000000000000000  -
         trunk  00000001111111111111  +
@@ -340,29 +340,29 @@ world  00000000000000000000  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        unclassified  00000000000001111111  +
-            area  00000000000001111111  -
-            bridge  00000000000001111111  -
-            tunnel  00000000000001111111  -
+        unclassified  00000000000011111111  +
+            area  00000000000011111111  -
+            bridge  00000000000011111111  -
+            tunnel  00000000000011111111  -
             {}
-        world_level  00000000000000000000  -
-        world_towns_level  00000000000000000000  -
+        world_level  00001111110000000000  -
+        world_towns_level  00000011110000000000  -
         {}
     historic  00000000000000000000  +
-        archaeological_site  00000000000000001111  -
-        battlefield  00000000000000001111  -
-        boundary_stone  00000000000000000111  -
-        castle  00000000000000001111  -
+        archaeological_site  00000000000000000111  -
+        battlefield  00000000000000000000  -
+        boundary_stone  00000000000000001111  -
+        castle  00000000000011111111  -
         citywalls  00000000000000001111  -
-        fort  00000000000000000111  -
-        memorial  00000000000000001111  -
-        monument  00000000000000001111  -
+        fort  00000000000011111111  -
+        memorial  00000000000000011111  -
+        monument  00000000000001111111  -
         museum  00000000000000001111  -
-        ruins  00000000000000001111  -
-        ship  00000000000000011111  -
-        tomb  00000000000000000111  -
-        wayside_cross  00000000000000000111  -
-        wayside_shrine  00000000000000000111  -
+        ruins  00000000000000000111  -
+        ship  00000000000000001111  -
+        tomb  00000000000000001111  -
+        wayside_cross  00000000000000001111  -
+        wayside_shrine  00000000000000001111  -
         {}
     hwtag  00000000000000000000  +
         bidir_bicycle  00000000000000000000  -
@@ -370,14 +370,14 @@ world  00000000000000000000  +
         nobicycle  00000000000000000000  -
         nocar  00000000000000000000  -
         nofoot  00000000000000000000  -
-        oneway  00000000000000001111  -
+        oneway  00000000000000011111  -
         private  00000000000000000000  -
         yesbicycle  00000000000000000000  -
         yescar  00000000000000000000  -
         yesfoot  00000000000000000000  -
         {}
-    internet_access  00000000000000000111  +
-        wlan  00000000000000000111  -
+    internet_access  00000000000000000000  +
+        wlan  00000000000000000000  -
         {}
     junction  00000000000000000000  +
         roundabout  00000000000000000000  -
@@ -385,140 +385,140 @@ world  00000000000000000000  +
     landuse  00000000000000000000  +
         allotments  00000000000011111111  -
         basin  00000000000011111111  -
-        brownfield  00000000000011111111  -
-        cemetery  00000000000011111111  +
-            christian  00000000000011111111  -
+        brownfield  00000000000000000000  -
+        cemetery  00000000000000111111  +
+            christian  00000000000000111111  -
             {}
-        commercial  00000000000011111111  -
-        construction  00000000000011111111  -
-        farm  00000000000011111111  -
+        commercial  00000000000000000111  -
+        construction  00000000000000011111  -
+        farm  00000000000000000000  -
         farmland  00000000000011111111  -
-        farmyard  00000000000011111111  -
+        farmyard  00000000000000000000  -
         field  00000000000011111111  -
         forest  00000000001111111111  +
             coniferous  00000000001111111111  -
             deciduous  00000000001111111111  -
             mixed  00000000001111111111  -
             {}
-        garages  00000000000000011111  -
+        garages  00000000000000111111  -
         grass  00000000000011111111  -
-        greenfield  00000000000011111111  -
-        greenhouse_horticulture  00000000000000011111  -
-        industrial  00000000000011111111  -
-        landfill  00000000000001111111  -
+        greenfield  00000000000000000000  -
+        greenhouse_horticulture  00000000000000000000  -
+        industrial  00000000000000011111  -
+        landfill  00000000000000011111  -
         meadow  00000000000011111111  -
-        military  00000000000011111111  -
-        orchard  00000000000000011111  -
-        quarry  00000000000011111111  -
-        railway  00000000000011111111  -
+        military  00000000000000001111  -
+        orchard  00000000000011111111  -
+        quarry  00000000000000011111  -
+        railway  00000000000000011111  -
         recreation_ground  00000000000011111111  -
-        reservoir  00000000000011111111  -
+        reservoir  00000000001111111111  -
         residential  00000000000000000000  +
             rural  00000000000000000000  -
             urban  00000000000000000000  -
             {}
-        retail  00000000000011111111  -
-        salt_pond  00000000000000011111  -
+        retail  00000000000000000000  -
+        salt_pond  11111111111111111111  -
         village_green  00000000000011111111  -
-        vineyard  00000000000001111111  -
+        vineyard  00000000000011111111  -
         {}
     leisure  00000000000000000000  +
-        common  00000000000011111111  -
-        dog_park  00000000000011111111  +
-            tennis  00000000000011111111  -
+        common  00000000000000000111  -
+        dog_park  00000000000000001111  +
+            tennis  00000000000000001111  -
             {}
-        fitness_centre  00000000000000000000  -
+        fitness_centre  00000000000000000111  -
         garden  00000000000011111111  -
         golf_course  00000000000011111111  -
-        landscape_reserve  00000000000000000000  -
-        nature_reserve  00000000000000011111  -
+        landscape_reserve  00000000000000000111  -
+        nature_reserve  00000000001111111111  -
         park  00000000001111111111  +
             no-access  00000000001111111111  -
             permissive  00000000001111111111  -
             private  00000000001111111111  -
             {}
-        pitch  00000000000011111111  +
-            tennis  00000000000011111111  -
+        pitch  00000000000000011111  +
+            tennis  00000000000000011111  -
             {}
-        playground  00000000000011111111  +
-            tennis  00000000000011111111  -
+        playground  00000000000000000111  +
+            tennis  00000000000000000111  -
             {}
         playing_fields  00000000000000000000  +
-            tennis  00000000000001111111  -
+            tennis  00000000000000000111  -
             {}
-        recreation_ground  00000000000011111111  -
-        sauna  00000000000000000000  -
+        recreation_ground  00000000000000000111  -
+        sauna  00000000000000000111  -
         slipway  00000000000000000111  -
-        sports_centre  00000000000011111111  +
-            climbing  00000000000011111111  -
-            shooting  00000000000011111111  -
-            swimming  00000000000011111111  -
-            yoga  00000000000011111111  -
+        sports_centre  00000000000000000111  +
+            climbing  00000000000000000111  -
+            shooting  00000000000000000111  -
+            swimming  00000000000000000111  -
+            yoga  00000000000000000111  -
             {}
-        stadium  00000000000011111111  -
+        stadium  00000000000001111111  -
         swimming_pool  00000000000001111111  -
-        track  00000000000011111111  -
-        water_park  00000000000001111111  -
+        track  00000000000000111111  -
+        water_park  00000000000000001111  -
         {}
     man_made  00000000000000000000  +
-        breakwater  00000000000000011111  -
-        cairn  00000000000000000111  -
-        chimney  00000000000000000000  -
-        cutline  00000000000011111111  -
-        lighthouse  00000000000000000111  -
-        pier  00000000000000111111  -
-        pipeline  00000000000000001111  +
-            overground  00000000000000001111  -
+        breakwater  00000000000011111111  -
+        cairn  00000000000000000000  -
+        chimney  00000000000000000011  -
+        cutline  00000000000000111111  -
+        lighthouse  00000000000000111111  -
+        pier  00000000000011111111  -
+        pipeline  00000000000000000000  +
+            overground  00000000000000000000  -
             {}
         tower  00000000000000000000  -
-        wastewater_plant  00000000000011111111  -
-        water_tower  00000000000000011111  -
+        wastewater_plant  00000000000000000000  -
+        water_tower  00000000000000000000  -
         water_well  00000000000000000000  -
-        windmill  00000000000000000111  -
+        windmill  00000000000000001111  -
         {}
     mapswithme  00000000000000000000  +
-        grid  00000000000011111111  -
+        grid  00000000000000000000  -
         {}
     marking  00000000000000000000  +
-        sport  00000000000000011111  +
-            black  00000000000000011111  -
-            blue  00000000000000011111  -
-            red  00000000000000011111  -
-            white  00000000000000011111  -
+        sport  00000000000000000000  +
+            black  00000000000000000000  -
+            blue  00000000000000000000  -
+            red  00000000000000000000  -
+            white  00000000000000000000  -
             {}
         {}
     military  00000000000000000000  +
-        bunker  00000000000000000111  -
+        bunker  00000000000000000000  -
         {}
     natural  00000000000000000000  +
-        bare_rock  00000000000001111111  -
-        bay  00000000000000111111  -
-        beach  00000000000000111111  -
+        bare_rock  00000000000000011111  -
+        bay  00000000001111111111  -
+        beach  00000000001111111111  -
         cape  00000000000000111111  -
-        cave_entrance  00000000000000111111  -
+        cave_entrance  00000000000111111111  -
         cliff  00000000000000000000  -
         coastline  11111111111111111111  -
         glacier  11111111111111111111  -
         grassland  00000000000011111111  -
         heath  00000000000011111111  -
         lake  11111111111111111111  -
-        land  00000011111111111111  -
-        meadow  00000000000000011111  -
-        orchard  00000000000000011111  -
+        land  11111111111111111111  -
+        meadow  00000000000000000000  -
+        orchard  00000000000000000000  -
         peak  00000000000011111111  -
         pond  11111111111111111111  -
-        rock  00000000000011111111  -
-        salt_pond  00000000000000011111  -
+        rock  00000000000000011111  -
+        salt_pond  11111111111111111111  -
         scrub  00000000000011111111  -
         spring  00000000000000111111  -
-        tree  00000000000000001111  -
-        tree_row  00000000000000001111  -
-        vineyard  00000000000000011111  -
-        volcano  00000000000011111111  -
+        tree  00000000000000000000  -
+        tree_row  00000000000000000000  -
+        vineyard  00000000000000000000  -
+        volcano  00000000001111111111  -
         water  11111111111111111111  -
-        wetland  00000000000000111111  +
-            bog  00000000000011111111  -
-            marsh  00000000000000111111  -
+        wetland  00000000000111111111  +
+            bog  00000000000111111111  -
+            marsh  00000000000111111111  -
             {}
         wood  00000000001111111111  +
             coniferous  00000000001111111111  -
@@ -529,12 +529,12 @@ world  00000000000000000000  +
     noexit  00000000000000000000  +
         motor_vehicle  00000000000000000000  -
         {}
-    office  00000000000000000111  +
-        company  00000000000000000111  -
-        estate_agent  00000000000000000111  -
-        government  00000000000000000111  -
+    office  00000000000000000011  +
+        company  00000000000000000011  -
+        estate_agent  00000000000000000011  -
+        government  00000000000000000011  -
         lawyer  00000000000000000111  -
-        telecommunication  00000000000000000111  -
+        telecommunication  00000000000000000011  -
         {}
     olympics  00000000000000000000  +
         attraction  00000000000000000000  -
@@ -553,72 +553,72 @@ world  00000000000000000000  +
         water_sport  00000000000000000000  -
         {}
     piste:lift  00000000000000000000  +
-        j-bar  00000000000000111111  -
-        magic_carpet  00000000000000011111  -
-        platter  00000000000000111111  -
-        rope_tow  00000000000000011111  -
-        t-bar  00000000000000111111  -
+        j-bar  00000000000011111111  -
+        magic_carpet  00000000000011111111  -
+        platter  00000000000011111111  -
+        rope_tow  00000000000011111111  -
+        t-bar  00000000000011111111  -
         {}
     piste:type  00000000000000000000  +
-        downhill  00000000000001111111  +
-            advanced  00000000000001111111  -
-            easy  00000000000001111111  -
-            expert  00000000000001111111  -
-            freeride  00000000000001111111  -
-            intermediate  00000000000001111111  -
-            novice  00000000000001111111  -
+        downhill  00000000000000111111  +
+            advanced  00000000000000111111  -
+            easy  00000000000000111111  -
+            expert  00000000000000111111  -
+            freeride  00000000000000111111  -
+            intermediate  00000000000000111111  -
+            novice  00000000000000111111  -
             {}
-        nordic  00000000000001111111  -
-        sled  00000000000001111111  -
+        nordic  00000000000000111111  -
+        sled  00000000000000111111  -
         {}
     place  00000000000000000000  +
-        city  00000011111111110000  +
-            capital  00000011111111110000  +
-                10  00000011111111110000  -
-                11  00000011111111110000  -
-                2  00001111111111110000  -
-                3  00000011111111110000  -
-                4  00000011111111110000  -
-                5  00000011111111110000  -
-                6  00000011111111110000  -
-                7  00000011111111110000  -
-                8  00000011111111110000  -
-                9  00000011111111110000  -
+        city  00001111111111111111  +
+            capital  00001111111111111111  +
+                10  00001111111111111111  -
+                11  00001111111111111111  -
+                2  00001111111111111111  -
+                3  00001111111111111111  -
+                4  00001111111111111111  -
+                5  00001111111111111111  -
+                6  00001111111111111111  -
+                7  00001111111111111111  -
+                8  00001111111111111111  -
+                9  00001111111111111111  -
                 {}
             {}
-        continent  11100000000000000000  -
-        country  00011111110000000000  -
-        county  00000000011110000000  -
+        continent  01100000000000000000  -
+        country  00011111111111111111  -
+        county  00000000000000000000  -
         farm  00000000000000111111  -
-        hamlet  00000000000011111111  -
-        island  00000000001111111111  -
-        islet  00000000000001111111  -
-        isolated_dwelling  00000000000000001111  -
-        locality  00000000000000111111  -
-        neighbourhood  00000000000000111111  -
-        ocean  01111111110000000000  -
+        hamlet  00000000000001111111  -
+        island  00000000000011111111  -
+        islet  00000000001111111111  -
+        isolated_dwelling  00000000000000111111  -
+        locality  00000000000001111111  -
+        neighbourhood  00000000000001111111  -
+        ocean  01111111111111111111  -
         region  00000000110000000000  -
-        sea  00000111111111111111  -
-        state  00000111110000000000  +
-            USA  00000111110000000000  -
+        sea  00001111111111111111  -
+        state  00000011111000000000  +
+            USA  00000111111000000000  -
             {}
-        suburb  00000000000011111111  -
-        town  00000000111111100000  -
+        suburb  00000000001111100000  -
+        town  00000000111111111111  -
         village  00000000000111111111  -
         {}
     power  00000000000000000000  +
-        generator  00000000000000111111  +
-            hydro  00000000000000111111  -
-            photovoltaic  00000000000000111111  -
-            wind  00000000000000111111  -
-            {}
-        line  00000000000000111111  +
-            underground  00000000000000001111  -
-            {}
-        minor_line  00000000000000001111  -
-        pole  00000000000000001111  -
-        station  00000000000000111111  -
-        substation  00000000000000000000  -
+        generator  00000000000000000000  +
+            hydro  00000000000000000000  -
+            photovoltaic  00000000000000000000  -
+            wind  00000000000000000000  -
+            {}
+        line  00000000000000000001  +
+            underground  00000000000000000001  -
+            {}
+        minor_line  00000000000000000000  -
+        pole  00000000000000000000  -
+        station  00000000000000000111  -
+        substation  00000000000000000111  -
         tower  00000000000000001111  -
         {}
     psurface  00000000000000000000  +
@@ -631,101 +631,101 @@ world  00000000000000000000  +
         platform  00000000000000001111  -
         {}
     railway  00000000000000000000  +
-        abandoned  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000000000000  -
+        abandoned  00000000000000001111  +
+            bridge  00000000000000001111  -
+            tunnel  00000000000000001111  -
             {}
-        construction  00000000000000000000  -
-        crossing  00000000000000001111  -
-        disused  00000000000011111111  -
+        construction  00000000000000001111  -
+        crossing  00000000000000000000  -
+        disused  00000000000000001111  -
         funicular  00000000000011111111  +
             bridge  00000000000011111111  -
             tunnel  00000000000011111111  -
             {}
-        halt  00000000000000111111  -
+        halt  00000000000111111111  -
         incline  00000000000000000000  +
             bridge  00000000000000000000  -
             tunnel  00000000000000000000  -
             {}
-        level_crossing  00000000000000001111  -
-        light_rail  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000000000000  -
+        level_crossing  00000000000000000111  -
+        light_rail  00000000000001111111  +
+            bridge  00000000000001111111  -
+            tunnel  00000000000001111111  -
             {}
-        monorail  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        monorail  00000000000000111111  +
+            bridge  00000000000000111111  -
+            tunnel  00000000000000111111  -
             {}
-        narrow_gauge  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000000000000  -
+        narrow_gauge  00000000000000011111  +
+            bridge  00000000000000011111  -
+            tunnel  00000000000000011111  -
             {}
         platform  00000000000000001111  -
-        preserved  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000000000000  -
+        preserved  00000000000000001111  +
+            bridge  00000000000000001111  -
+            tunnel  00000000000000001111  -
             {}
         proposed  00000000000000000000  -
-        rail  00000000001111111111  +
-            bridge  00000000001111111111  -
-            motor_vehicle  00000000001111111111  -
-            tunnel  00000000000000000000  -
+        rail  00000000000111111111  +
+            bridge  00000000000111111111  -
+            motor_vehicle  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
-        razed  00000000000000001111  -
-        siding  00000000000001111111  +
-            bridge  00000000000001111111  -
+        razed  00000000000000000000  -
+        siding  00000000000000000000  +
+            bridge  00000000000000000000  -
             tunnel  00000000000000000000  -
             {}
-        spur  00000000000000111111  +
-            bridge  00000000000000111111  -
+        spur  00000000000000000000  +
+            bridge  00000000000000000000  -
             tunnel  00000000000000000000  -
             {}
-        station  00000000000000111111  +
-            light_rail  00000000000000111111  -
-            monorail  00000000000000111111  -
-            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  00000000000011111111  -
-                newyork  00000000000011111111  -
-                orange  00000000000011111111  -
-                paris  00000000000011111111  -
-                purple  00000000000011111111  -
-                red  00000000000011111111  -
-                roma  00000000000011111111  -
-                spb  00000000000011111111  -
-                violet  00000000000011111111  -
-                yellow  00000000000011111111  -
+        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  -
+                moscow  00000000000111111111  -
+                newyork  00000000000001111111  -
+                orange  00000000000001111111  -
+                paris  00000000000001111111  -
+                purple  00000000000001111111  -
+                red  00000000000001111111  -
+                roma  00000000000001111111  -
+                spb  00000000000111111111  -
+                violet  00000000000001111111  -
+                yellow  00000000000001111111  -
                 {}
             {}
-        subway  00000000000011111111  +
-            blue  00000000000011111111  -
-            bridge  00000000000011111111  -
-            brown  00000000000011111111  -
-            darkgreen  00000000000011111111  -
-            gray  00000000000011111111  -
-            green  00000000000011111111  -
-            grey  00000000000011111111  -
-            lightblue  00000000000011111111  -
-            lightgreen  00000000000011111111  -
-            orange  00000000000011111111  -
-            purple  00000000000011111111  -
-            red  00000000000011111111  -
+        subway  00000000000000000000  +
+            blue  00000000000000000000  -
+            bridge  00000000000000000000  -
+            brown  00000000000000000000  -
+            darkgreen  00000000000000000000  -
+            gray  00000000000000000000  -
+            green  00000000000000000000  -
+            grey  00000000000000000000  -
+            lightblue  00000000000000000000  -
+            lightgreen  00000000000000000000  -
+            orange  00000000000000000000  -
+            purple  00000000000000000000  -
+            red  00000000000000000000  -
             tunnel  00000000000000000000  -
-            violet  00000000000011111111  -
-            yellow  00000000000011111111  -
+            violet  00000000000000000000  -
+            yellow  00000000000000000000  -
             {}
         subway_entrance  00000000000000001111  +
             barcelona  00000000000000001111  -
@@ -740,14 +740,14 @@ world  00000000000000000000  +
             roma  00000000000000001111  -
             spb  00000000000000001111  -
             {}
-        tram  00000000000000111111  +
-            bridge  00000000000000111111  -
-            tunnel  00000000000000111111  -
+        tram  00000000000001111111  +
+            bridge  00000000000001111111  -
+            tunnel  00000000000001111111  -
             {}
-        tram_stop  00000000000000011111  -
-        yard  00000000000011111111  +
-            bridge  00000000000011111111  -
-            tunnel  00000000000000000000  -
+        tram_stop  00000000000000111111  -
+        yard  00000000000111111111  +
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
         {}
     route  00000000000000000000  +
@@ -757,56 +757,56 @@ world  00000000000000000000  +
             {}
         shuttle_train  00000000000000000000  -
         {}
-    shop  00000000000000000111  +
+    shop  00000000000000001111  +
         alcohol  00000000000000001111  -
         bakery  00000000000000001111  -
-        beauty  00000000000000000111  -
-        beverages  00000000000000000111  -
-        bicycle  00000000000000000111  -
-        bookmaker  00000000000000000111  -
-        books  00000000000000000111  -
-        butcher  00000000000000000111  -
-        car  00000000000000000111  -
-        car_parts  00000000000000000111  -
+        beauty  00000000000000001111  -
+        beverages  00000000000000001111  -
+        bicycle  00000000000000001111  -
+        bookmaker  00000000000000001111  -
+        books  00000000000000001111  -
+        butcher  00000000000000001111  -
+        car  00000000000000001111  -
+        car_parts  00000000000000001111  -
         car_repair  00000000000000001111  +
-            tyres  00000000000000001111  -
+            tyres  00000000000000011111  -
             {}
-        chemist  00000000000000000111  -
+        chemist  00000000000000001111  -
         clothes  00000000000000001111  -
-        computer  00000000000000000111  -
-        confectionery  00000000000000000111  -
+        computer  00000000000000001111  -
+        confectionery  00000000000000001111  -
         convenience  00000000000000001111  -
-        copyshop  00000000000000000111  -
-        cosmetics  00000000000000000111  -
+        copyshop  00000000000000001111  -
+        cosmetics  00000000000000001111  -
         department_store  00000000000000001111  -
         doityourself  00000000000000001111  -
-        dry_cleaning  00000000000000000111  -
-        electronics  00000000000000000111  -
-        florist  00000000000000000111  -
+        dry_cleaning  00000000000000001111  -
+        electronics  00000000000000001111  -
+        florist  00000000000000001111  -
         furniture  00000000000000001111  -
-        garden_centre  00000000000000000111  -
-        gift  00000000000000000111  -
-        greengrocer  00000000000000000111  -
+        garden_centre  00000000000000001111  -
+        gift  00000000000000001111  -
+        greengrocer  00000000000000001111  -
         hairdresser  00000000000000001111  -
-        hardware  00000000000000000111  -
-        jewelry  00000000000000000111  -
+        hardware  00000000000000001111  -
+        jewelry  00000000000000001111  -
         kiosk  00000000000000001111  -
-        laundry  00000000000000000111  -
-        mall  00000000000000001111  -
-        mobile_phone  00000000000000000111  -
-        optician  00000000000000000111  -
-        outdoor  00000000000000000111  -
-        pet  00000000000000000111  -
-        photo  00000000000000000111  -
-        seafood  00000000000000000111  -
-        shoes  00000000000000000111  -
-        sports  00000000000000000111  -
+        laundry  00000000000000001111  -
+        mall  00000000000000111111  -
+        mobile_phone  00000000000000001111  -
+        optician  00000000000000001111  -
+        outdoor  00000000000000001111  -
+        pet  00000000000000001111  -
+        photo  00000000000000001111  -
+        seafood  00000000000000001111  -
+        shoes  00000000000000001111  -
+        sports  00000000000000001111  -
         supermarket  00000000000000001111  -
-        ticket  00000000000000000111  -
-        toys  00000000000000000111  -
-        travel_agency  00000000000000000111  -
-        tyres  00000000000000000111  -
-        wine  00000000000000000111  -
+        ticket  00000000000000001111  -
+        toys  00000000000000001111  -
+        travel_agency  00000000000000001111  -
+        tyres  00000000000000001111  -
+        wine  00000000000000001111  -
         {}
     sponsored  00000000000000000000  +
         banner  00000000000000000000  +
@@ -835,7 +835,7 @@ world  00000000000000000000  +
         cricket  00000000000000000111  -
         curling  00000000000000000111  -
         diving  00000000000000000111  -
-        equestrian  00000000000000000111  -
+        equestrian  00000000000000001111  -
         football  00000000000000000111  -
         golf  00000000000000000111  -
         gymnastics  00000000000000000111  -
@@ -844,64 +844,64 @@ world  00000000000000000000  +
         scuba_diving  00000000000000000111  -
         shooting  00000000000000000111  -
         skiing  00000000000000000111  -
-        soccer  00000000000000000111  -
+        soccer  00000000000000001111  -
         swimming  00000000000000000111  -
         tennis  00000000000000000111  -
         {}
     tourism  00000000000000000000  +
         alpine_hut  00000000000000111111  -
-        apartment  00000000000000000111  -
+        apartment  00000000000000111111  -
         artwork  00000000000000011111  -
-        attraction  00000000000000011111  -
-        camp_site  00000000000011111111  -
-        caravan_site  00000000000011111111  -
-        chalet  00000000000000000111  -
-        gallery  00000000000000000111  -
-        guest_house  00000000000000001111  -
-        hostel  00000000000000001111  -
-        hotel  00000000000000001111  -
-        information  00000000000000000111  +
-            board  00000000000000000111  -
-            guidepost  00000000000000000111  -
-            map  00000000000000000111  -
-            office  00000000000000000111  -
-            {}
-        motel  00000000000000001111  -
-        museum  00000000000000001111  -
-        picnic_site  00000000000011111111  -
-        resort  00000000000000000111  -
-        viewpoint  00000000000000011111  -
-        zoo  00000000000011111111  -
+        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  -
         {}
     traffic_calming  00000000000000000000  +
         bump  00000000000000000000  -
         hump  00000000000000000000  -
         {}
     waterway  00000000000000000000  +
-        canal  00000000000011111111  +
+        canal  00000000000001111111  +
             tunnel  00000000000000000000  -
             {}
-        dam  00000000000000111111  -
-        ditch  00000000000011111111  +
+        dam  00000000000000011111  -
+        ditch  00000000000000000111  +
             tunnel  00000000000000000000  -
             {}
         dock  11111111111111111111  -
-        drain  00000000000011111111  +
+        drain  00000000000000000111  +
             tunnel  00000000000000000000  -
             {}
-        lock  00000000000000111111  -
-        lock_gate  00000000000000000000  -
+        lock  00000000000000001111  -
+        lock_gate  00000000000000001111  -
         river  00000000001111111111  +
             tunnel  00000000000000000000  -
             {}
         riverbank  11111111111111111111  -
-        stream  00000000000011111111  +
-            ephemeral  00000000000011111111  -
-            intermittent  00000000000011111111  -
+        stream  00000000000001111111  +
+            ephemeral  00000000000001111111  -
+            intermittent  00000000000001111111  -
             tunnel  00000000000000000000  -
             {}
-        waterfall  00000000000000000000  -
-        weir  00000000000000111111  -
+        waterfall  00000000000111111111  -
+        weir  00000000000000011111  -
         {}
     wheelchair  00000000000000000000  +
         limited  00000000000000000000  -