diff --git a/data/classificator.txt b/data/classificator.txt index 5027001cd8..5f223e109d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -19,6 +19,7 @@ world + terminal - {} amenity + + arts_centre - atm - bank - bar - @@ -26,6 +27,7 @@ world + bench - bicycle_parking - bicycle_rental - + biergarten - brothel - bureau_de_change - bus_station - @@ -44,10 +46,12 @@ world + dentist - doctors - drinking_water - + driving_school - embassy - fast_food - ferry_terminal - fire_station - + food_court - fountain - fuel - grave_yard + @@ -55,10 +59,14 @@ world + {} hospital - hunting_stand - + ice_cream - + internet_cafe - kindergarten - library - marketplace - + motorcycle_parking - nightclub - + nursing_home - parking + fee - multi-storey + @@ -74,6 +82,7 @@ world + fee - {} {} + payment_terminal - pharmacy - place_of_worship + buddhist - @@ -87,12 +96,14 @@ world + police - post_box - post_office - + prison - pub - public_bookcase - recycling - restaurant - school - shelter - + shower - speed_trap - taxi - telephone - @@ -109,6 +120,7 @@ world + veterinary - waste_basket - waste_disposal - + water_point - {} area:highway + cycleway - @@ -197,6 +209,8 @@ world + spontaneous_camp - {} emergency + + defibrillator - + fire_hydrant - phone - {} entrance - @@ -297,6 +311,7 @@ world + parking_aisle - tunnel - {} + services - speed_camera - steps + bridge - @@ -372,6 +387,7 @@ world + nofoot - oneway - private - + toll - yesbicycle - yescar - yesfoot - @@ -428,9 +444,12 @@ world + tennis - {} fitness_centre - + fitness_station - garden - golf_course - + ice_rink - landscape_reserve - + marina - nature_reserve - park + no-access - @@ -470,11 +489,14 @@ world + pipeline + overground - {} + surveillance - tower - wastewater_plant - + water_tap - water_tower - water_well - windmill - + works - {} mapswithme + grid - @@ -533,7 +555,9 @@ world + company - estate_agent - government - + insurance - lawyer - + ngo - telecommunication - {} olympics + @@ -772,6 +796,7 @@ world + tyres - {} chemist - + chocolate - clothes - coffee - computer - @@ -783,7 +808,10 @@ world + doityourself - dry_cleaning - electronics - + erotic - + fabric - florist - + funeral_directors - furniture - garden_centre - gift - @@ -794,20 +822,30 @@ world + kiosk - laundry - mall - + massage - mobile_phone - + motorcycle - + music - + musical_instrument - + newsagent - optician - outdoor - + pawnbroker - pet - photo - seafood - shoes - sports - + stationery - supermarket - + tattoo - tea - ticket - toys - travel_agency - tyres - + variety_store - + video - wine - {} sponsored + @@ -874,7 +912,9 @@ world + museum - picnic_site - resort - + theme_park - viewpoint - + wilderness_hut - zoo - {} traffic_calming + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 9084e65110..c32d3608c2 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 239481951f..5b67bf973f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2253,6 +2253,20 @@ cont { } } } +cont { + name: "amenity-arts_centre" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-atm" element { @@ -2589,6 +2603,20 @@ cont { } } } +cont { + name: "amenity-biergarten" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-brothel" element { @@ -3651,6 +3679,20 @@ cont { } } } +cont { + name: "amenity-driving_school" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-embassy" element { @@ -3926,6 +3968,20 @@ cont { } } } +cont { + name: "amenity-food_court" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-fountain" element { @@ -4450,6 +4506,34 @@ cont { } } } +cont { + name: "amenity-ice_cream" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} +cont { + name: "amenity-internet_cafe" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-kindergarten" element { @@ -4598,6 +4682,20 @@ cont { } } } +cont { + name: "amenity-motorcycle_parking" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-nightclub" element { @@ -4661,6 +4759,20 @@ cont { } } } +cont { + name: "amenity-nursing_home" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-parking" element { @@ -5442,6 +5554,20 @@ cont { } } } +cont { + name: "amenity-payment_terminal" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pharmacy" element { @@ -6527,6 +6653,20 @@ cont { } } } +cont { + name: "amenity-prison" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pub" element { @@ -6853,6 +6993,20 @@ cont { } } } +cont { + name: "amenity-shower" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-speed_trap" element { @@ -7642,6 +7796,54 @@ cont { } } } +cont { + name: "amenity-water_point" + element { + scale: 15 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 16 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 17 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 18 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 19 + symbol { + name: "drinking-water-l" + priority: 16574 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15574 + } + } +} cont { name: "area:highway-footway" element { @@ -34376,6 +34578,42 @@ cont { } } } +cont { + name: "leisure-fitness_station" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-garden" element { @@ -34645,6 +34883,42 @@ cont { } } } +cont { + name: "leisure-ice_rink" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-landscape_reserve" element { @@ -34681,6 +34955,42 @@ cont { } } } +cont { + name: "leisure-marina" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-nature_reserve" element { @@ -40772,6 +41082,39 @@ cont { } } } +cont { + name: "office-insurance" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-lawyer" element { @@ -40823,6 +41166,39 @@ cont { } } } +cont { + name: "office-ngo" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-telecommunication" element { @@ -58296,6 +58672,73 @@ cont { } } } +cont { + name: "shop-chocolate" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-clothes" element { @@ -59033,6 +59476,140 @@ cont { } } } +cont { + name: "shop-erotic" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-fabric" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-florist" element { @@ -59100,6 +59677,73 @@ cont { } } } +cont { + name: "shop-funeral_directors" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-furniture" element { @@ -59802,6 +60446,73 @@ cont { } } } +cont { + name: "shop-massage" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-mobile_phone" element { @@ -59869,6 +60580,274 @@ cont { } } } +cont { + name: "shop-motorcycle" + element { + scale: 16 + symbol { + name: "motorcycle_shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-music" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-musical_instrument" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-newsagent" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-optician" element { @@ -60003,6 +60982,73 @@ cont { } } } +cont { + name: "shop-pawnbroker" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-pet" element { @@ -60338,6 +61384,73 @@ cont { } } } +cont { + name: "shop-stationery" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-supermarket" element { @@ -60437,6 +61550,73 @@ cont { } } } +cont { + name: "shop-tattoo" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-tea" element { @@ -60772,6 +61952,140 @@ cont { } } } +cont { + name: "shop-variety_store" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-video" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-wine" element { @@ -64010,6 +65324,31 @@ cont { } } } +cont { + name: "tourism-theme_park" + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-viewpoint" element { @@ -64112,6 +65451,31 @@ cont { } } } +cont { + name: "tourism-wilderness_hut" + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-zoo" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 3f3f886367..af2cd03985 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 2e5deca102..e1bffc0d53 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2253,6 +2253,20 @@ cont { } } } +cont { + name: "amenity-arts_centre" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-atm" element { @@ -2589,6 +2603,20 @@ cont { } } } +cont { + name: "amenity-biergarten" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-brothel" element { @@ -3651,6 +3679,20 @@ cont { } } } +cont { + name: "amenity-driving_school" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-embassy" element { @@ -3926,6 +3968,20 @@ cont { } } } +cont { + name: "amenity-food_court" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-fountain" element { @@ -4418,6 +4474,34 @@ cont { } } } +cont { + name: "amenity-ice_cream" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} +cont { + name: "amenity-internet_cafe" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-kindergarten" element { @@ -4566,6 +4650,20 @@ cont { } } } +cont { + name: "amenity-motorcycle_parking" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-nightclub" element { @@ -4629,6 +4727,20 @@ cont { } } } +cont { + name: "amenity-nursing_home" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-parking" element { @@ -5410,6 +5522,20 @@ cont { } } } +cont { + name: "amenity-payment_terminal" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pharmacy" element { @@ -6495,6 +6621,20 @@ cont { } } } +cont { + name: "amenity-prison" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pub" element { @@ -6821,6 +6961,20 @@ cont { } } } +cont { + name: "amenity-shower" + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-speed_trap" element { @@ -7610,6 +7764,54 @@ cont { } } } +cont { + name: "amenity-water_point" + element { + scale: 15 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 16 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 17 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 18 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 19 + symbol { + name: "drinking-water-l" + priority: 16574 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15574 + } + } +} cont { name: "area:highway-footway" element { @@ -34057,6 +34259,42 @@ cont { } } } +cont { + name: "leisure-fitness_station" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-garden" element { @@ -34326,6 +34564,42 @@ cont { } } } +cont { + name: "leisure-ice_rink" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-landscape_reserve" element { @@ -34362,6 +34636,42 @@ cont { } } } +cont { + name: "leisure-marina" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-nature_reserve" element { @@ -40445,6 +40755,39 @@ cont { } } } +cont { + name: "office-insurance" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-lawyer" element { @@ -40496,6 +40839,39 @@ cont { } } } +cont { + name: "office-ngo" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-telecommunication" element { @@ -57807,6 +58183,73 @@ cont { } } } +cont { + name: "shop-chocolate" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-clothes" element { @@ -58544,6 +58987,140 @@ cont { } } } +cont { + name: "shop-erotic" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-fabric" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-florist" element { @@ -58611,6 +59188,73 @@ cont { } } } +cont { + name: "shop-funeral_directors" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-furniture" element { @@ -59313,6 +59957,73 @@ cont { } } } +cont { + name: "shop-massage" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-mobile_phone" element { @@ -59380,6 +60091,274 @@ cont { } } } +cont { + name: "shop-motorcycle" + element { + scale: 16 + symbol { + name: "motorcycle_shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-music" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-musical_instrument" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-newsagent" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-optician" element { @@ -59514,6 +60493,73 @@ cont { } } } +cont { + name: "shop-pawnbroker" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-pet" element { @@ -59849,6 +60895,73 @@ cont { } } } +cont { + name: "shop-stationery" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-supermarket" element { @@ -59916,6 +61029,73 @@ cont { } } } +cont { + name: "shop-tattoo" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-tea" element { @@ -60251,6 +61431,140 @@ cont { } } } +cont { + name: "shop-variety_store" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-video" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-wine" element { @@ -63489,6 +64803,31 @@ cont { } } } +cont { + name: "tourism-theme_park" + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-viewpoint" element { @@ -63591,6 +64930,31 @@ cont { } } } +cont { + name: "tourism-wilderness_hut" + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-zoo" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 456b2c4918..23be749fb3 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 3c470f0561..f7741018db 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -2253,6 +2253,20 @@ cont { } } } +cont { + name: "amenity-arts_centre" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-atm" element { @@ -2589,6 +2603,20 @@ cont { } } } +cont { + name: "amenity-biergarten" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-brothel" element { @@ -3651,6 +3679,20 @@ cont { } } } +cont { + name: "amenity-driving_school" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-embassy" element { @@ -3926,6 +3968,20 @@ cont { } } } +cont { + name: "amenity-food_court" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-fountain" element { @@ -4418,6 +4474,34 @@ cont { } } } +cont { + name: "amenity-ice_cream" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} +cont { + name: "amenity-internet_cafe" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-kindergarten" element { @@ -4566,6 +4650,20 @@ cont { } } } +cont { + name: "amenity-motorcycle_parking" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-nightclub" element { @@ -4629,6 +4727,20 @@ cont { } } } +cont { + name: "amenity-nursing_home" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-parking" element { @@ -5410,6 +5522,20 @@ cont { } } } +cont { + name: "amenity-payment_terminal" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pharmacy" element { @@ -6495,6 +6621,20 @@ cont { } } } +cont { + name: "amenity-prison" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-pub" element { @@ -6821,6 +6961,20 @@ cont { } } } +cont { + name: "amenity-shower" + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15000 + } + } +} cont { name: "amenity-speed_trap" element { @@ -7610,6 +7764,54 @@ cont { } } } +cont { + name: "amenity-water_point" + element { + scale: 15 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 16 + symbol { + name: "drinking-water-m" + priority: 16574 + min_distance: 36 + } + } + element { + scale: 17 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 18 + symbol { + name: "drinking-water-l" + priority: 16574 + } + } + element { + scale: 19 + symbol { + name: "drinking-water-l" + priority: 16574 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15574 + } + } +} cont { name: "area:highway-footway" element { @@ -34057,6 +34259,42 @@ cont { } } } +cont { + name: "leisure-fitness_station" + element { + scale: 17 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-garden" element { @@ -34326,6 +34564,42 @@ cont { } } } +cont { + name: "leisure-ice_rink" + element { + scale: 17 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-landscape_reserve" element { @@ -34362,6 +34636,42 @@ cont { } } } +cont { + name: "leisure-marina" + element { + scale: 17 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15049 + } + } +} cont { name: "leisure-nature_reserve" element { @@ -40445,6 +40755,39 @@ cont { } } } +cont { + name: "office-insurance" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-lawyer" element { @@ -40496,6 +40839,39 @@ cont { } } } +cont { + name: "office-ngo" + element { + scale: 18 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15623 + } + } + element { + scale: 19 + symbol { + name: "office-l" + priority: 16623 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15623 + } + } +} cont { name: "office-telecommunication" element { @@ -57807,6 +58183,73 @@ cont { } } } +cont { + name: "shop-chocolate" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-clothes" element { @@ -58544,6 +58987,140 @@ cont { } } } +cont { + name: "shop-erotic" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-fabric" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-florist" element { @@ -58611,6 +59188,73 @@ cont { } } } +cont { + name: "shop-funeral_directors" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-furniture" element { @@ -59313,6 +59957,73 @@ cont { } } } +cont { + name: "shop-massage" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-mobile_phone" element { @@ -59380,6 +60091,274 @@ cont { } } } +cont { + name: "shop-motorcycle" + element { + scale: 16 + symbol { + name: "motorcycle_shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "motorcycle_shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-music" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-musical_instrument" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-newsagent" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-optician" element { @@ -59514,6 +60493,73 @@ cont { } } } +cont { + name: "shop-pawnbroker" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-pet" element { @@ -59849,6 +60895,73 @@ cont { } } } +cont { + name: "shop-stationery" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-supermarket" element { @@ -59916,6 +61029,73 @@ cont { } } } +cont { + name: "shop-tattoo" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-tea" element { @@ -60251,6 +61431,140 @@ cont { } } } +cont { + name: "shop-variety_store" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} +cont { + name: "shop-video" + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16594 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "shop-wine" element { @@ -63489,6 +64803,31 @@ cont { } } } +cont { + name: "tourism-theme_park" + element { + scale: 18 + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-viewpoint" element { @@ -63591,6 +64930,31 @@ cont { } } } +cont { + name: "tourism-wilderness_hut" + element { + scale: 18 + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + } + priority: 15594 + } + } +} cont { name: "tourism-zoo" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 7d3289ad0d..7ceb8de006 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index b9b460ccc9..3f40de9c52 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -39244,6 +39244,31 @@ cont { } } } +cont { + name: "shop-motorcycle" + element { + scale: 17 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + min_distance: 24 + } + } + element { + scale: 18 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + } + } +} cont { name: "shop-supermarket" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 9b27677b9c..f9c39cd296 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 6b84fa0b73..ca8fb6c287 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -39244,6 +39244,31 @@ cont { } } } +cont { + name: "shop-motorcycle" + element { + scale: 17 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + min_distance: 24 + } + } + element { + scale: 18 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "motorcycle_shop-l" + priority: 16000 + } + } +} cont { name: "shop-supermarket" element { diff --git a/data/types.txt b/data/types.txt index 9537686ed5..e929dfe5c2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1155,3 +1155,45 @@ shop|coffee shop|tea sponsored|tinkoff sponsored|viator +hwtag|toll +amenity|arts_centre +amenity|biergarten +amenity|driving_school +amenity|food_court +amenity|ice_cream +amenity|internet_cafe +amenity|motorcycle_parking +amenity|nursing_home +amenity|payment_terminal +amenity|prison +amenity|shower +amenity|water_point +emergency|defibrillator +emergency|fire_hydrant +highway|services +leisure|fitness_station +leisure|ice_rink +leisure|marina +tourism|picnic_site +man_made|surveillance +man_made|water_tap +man_made|works +office|insurance +office|ngo +shop|chocolate +shop|erotic +office|estate_agent +shop|fabric +shop|funeral_directors +shop|massage +shop|motorcycle +shop|music +shop|musical_instrument +shop|newsagent +shop|pawnbroker +shop|stationery +shop|tattoo +shop|variety_store +shop|video +tourism|theme_park +tourism|wilderness_hut diff --git a/data/visibility.txt b/data/visibility.txt index c5b224a3ea..6bd75bc56c 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -19,6 +19,7 @@ world 00000000000000000000 + terminal 00000000000000111111 - {} amenity 00000000000000000000 + + arts_centre 00000000000000000000 - atm 00000000000000000000 - bank 00000000000000000111 - bar 00000000000000000000 - @@ -26,6 +27,7 @@ world 00000000000000000000 + bench 00000000000000000000 - bicycle_parking 00000000000000000000 - bicycle_rental 00000000000000000000 - + biergarten 00000000000000000000 - brothel 00000000000000000000 - bureau_de_change 00000000000000000000 - bus_station 00000000000000000000 - @@ -44,10 +46,12 @@ world 00000000000000000000 + dentist 00000000000000000000 - doctors 00000000000000000000 - drinking_water 00000000000000000000 - + driving_school 00000000000000000000 - embassy 00000000000000000000 - fast_food 00000000000000000111 - ferry_terminal 00000000000000000000 - fire_station 00000000000000000000 - + food_court 00000000000000000000 - fountain 00000000000000000000 - fuel 00000000000011111111 - grave_yard 00000000000000111111 + @@ -55,10 +59,14 @@ world 00000000000000000000 + {} hospital 00000000000000011111 - hunting_stand 00000000000000000000 - + ice_cream 00000000000000000000 - + internet_cafe 00000000000000000000 - kindergarten 00000000000000000000 - library 00000000000000000000 - marketplace 00000000000000000000 - + motorcycle_parking 00000000000000000000 - nightclub 00000000000000000000 - + nursing_home 00000000000000000000 - parking 00000000000000011111 + fee 00000000000000011111 - multi-storey 00000000000000011111 + @@ -74,6 +82,7 @@ world 00000000000000000000 + fee 00000000000000011111 - {} {} + payment_terminal 00000000000000000000 - pharmacy 00000000000000000000 - place_of_worship 00000000000000001111 + buddhist 00000000000000001111 - @@ -87,12 +96,14 @@ world 00000000000000000000 + police 00000000000000000000 - post_box 00000000000000000000 - post_office 00000000000000000000 - + prison 00000000000000000000 - pub 00000000000000000000 - public_bookcase 00000000000000000000 - recycling 00000000000000000000 - restaurant 00000000000000001111 - school 00000000000000000000 - shelter 00000000000000000000 - + shower 00000000000000000000 - speed_trap 00000000000000000000 - taxi 00000000000000000000 - telephone 00000000000000000000 - @@ -109,6 +120,7 @@ world 00000000000000000000 + veterinary 00000000000000000000 - waste_basket 00000000000000000000 - waste_disposal 00000000000000000000 - + water_point 00000000000000000000 - {} area:highway 00000000000000000000 + cycleway 00000000000000000000 - @@ -197,6 +209,8 @@ world 00000000000000000000 + spontaneous_camp 00000000000000000000 - {} emergency 00000000000000000000 + + defibrillator 00000000000000000000 - + fire_hydrant 00000000000000000000 - phone 00000000000000000000 - {} entrance 00000000000000000000 - @@ -297,6 +311,7 @@ world 00000000000000000000 + parking_aisle 00000000000000111111 - tunnel 00000000000000111111 - {} + services 00000000000000000000 - speed_camera 00000000000001111111 - steps 00000000000000000000 + bridge 00000000000000000000 - @@ -372,6 +387,7 @@ world 00000000000000000000 + nofoot 00000000000000000000 - oneway 00000000000000011111 - private 00000000000000000000 - + toll 00000000000000000000 - yesbicycle 00000000000000000000 - yescar 00000000000000000000 - yesfoot 00000000000000000000 - @@ -428,9 +444,12 @@ world 00000000000000000000 + tennis 00000000000000000000 - {} fitness_centre 00000000000000000000 - + fitness_station 00000000000000000000 - garden 00000000000011111111 - golf_course 00000000000000111111 - + ice_rink 00000000000000000000 - landscape_reserve 00000000000000000000 - + marina 00000000000000000000 - nature_reserve 00000000001111111111 - park 00000000001111111111 + no-access 00000000001111111111 - @@ -470,11 +489,14 @@ world 00000000000000000000 + pipeline 00000000000000000000 + overground 00000000000000000000 - {} + surveillance 00000000000000000000 - tower 00000000000000000000 - wastewater_plant 00000000000000000000 - + water_tap 00000000000000000000 - water_tower 00000000000000000000 - water_well 00000000000000000000 - windmill 00000000000000000000 - + works 00000000000000000000 - {} mapswithme 00000000000000000000 + grid 00000000000000000000 - @@ -533,7 +555,9 @@ world 00000000000000000000 + company 00000000000000000000 - estate_agent 00000000000000000000 - government 00000000000000000000 - + insurance 00000000000000000000 - lawyer 00000000000000000000 - + ngo 00000000000000000000 - telecommunication 00000000000000000000 - {} olympics 00000000000000000000 + @@ -772,6 +796,7 @@ world 00000000000000000000 + tyres 00000000000000011111 - {} chemist 00000000000000000000 - + chocolate 00000000000000000000 - clothes 00000000000000000000 - coffee 00000000000000000000 - computer 00000000000000000000 - @@ -783,7 +808,10 @@ world 00000000000000000000 + doityourself 00000000000000000000 - dry_cleaning 00000000000000000000 - electronics 00000000000000000000 - + erotic 00000000000000000000 - + fabric 00000000000000000000 - florist 00000000000000000000 - + funeral_directors 00000000000000000000 - furniture 00000000000000000000 - garden_centre 00000000000000000000 - gift 00000000000000000000 - @@ -794,20 +822,30 @@ world 00000000000000000000 + kiosk 00000000000000000000 - laundry 00000000000000000000 - mall 00000000000000111111 - + massage 00000000000000000000 - mobile_phone 00000000000000000000 - + motorcycle 00000000000000000111 - + music 00000000000000000000 - + musical_instrument 00000000000000000000 - + newsagent 00000000000000000000 - optician 00000000000000000000 - outdoor 00000000000000000000 - + pawnbroker 00000000000000000000 - pet 00000000000000000000 - photo 00000000000000000000 - seafood 00000000000000000000 - shoes 00000000000000000000 - sports 00000000000000000000 - + stationery 00000000000000000000 - supermarket 00000000000000111111 - + tattoo 00000000000000000000 - tea 00000000000000000000 - ticket 00000000000000000000 - toys 00000000000000000000 - travel_agency 00000000000000000000 - tyres 00000000000000000000 - + variety_store 00000000000000000000 - + video 00000000000000000000 - wine 00000000000000000000 - {} sponsored 00000000000000000000 + @@ -874,7 +912,9 @@ world 00000000000000000000 + museum 00000000000000000000 - picnic_site 00000000000000000000 - resort 00000000000000000000 - + theme_park 00000000000000000000 - viewpoint 00000000000000000000 - + wilderness_hut 00000000000000000000 - zoo 00000000000000000000 - {} traffic_calming 00000000000000000000 +