diff --git a/data/classificator.txt b/data/classificator.txt index ecdecd54cf..822eb9094c 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -807,44 +807,26 @@ world + tennis - {} tourism + - alpine_hut + - booking - - {} - apartment + - booking - - {} + alpine_hut - + apartment - artwork - attraction - - camp_site + - booking - - {} + camp_site - caravan_site - - chalet + - booking - - {} - guest_house + - booking - - {} - hostel + - booking - - {} - hotel + - booking - - {} + chalet - + guest_house - + hostel - + hotel - information + board - guidepost - map - office - {} - motel + - booking - - {} + motel - museum - picnic_site - - resort + - booking - - {} + resort - viewpoint - zoo - {} diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8fd81aeb29..f4f99de1b4 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 a380cd1e90..22865ed0ed 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -72005,6 +72005,40 @@ cont { } } } +cont { + name: "sponsored" + element { + scale: 18 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "hotel" + priority: 16000 + } + } +} +cont { + name: "sponsored-booking" + element { + scale: 18 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "hotel" + priority: 16000 + } + } +} cont { name: "sport-american_football" element { @@ -72975,105 +73009,6 @@ cont { } } } -cont { - name: "tourism-alpine_hut-booking" - element { - scale: 14 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-apartment" element { @@ -73149,81 +73084,6 @@ cont { } } } -cont { - name: "tourism-apartment-booking" - element { - scale: 14 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 15 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 16 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-artwork" element { @@ -73483,7 +73343,7 @@ cont { } } cont { - name: "tourism-camp_site-booking" + name: "tourism-caravan_site" element { scale: 12 area { @@ -73504,10 +73364,6 @@ cont { color: 13626551 priority: -16476 } - symbol { - name: "campsite" - priority: 16000 - } } element { scale: 15 @@ -73515,10 +73371,6 @@ cont { color: 13626551 priority: -16477 } - symbol { - name: "campsite" - priority: 16000 - } } element { scale: 16 @@ -73526,108 +73378,6 @@ cont { color: 13626551 priority: -16478 } - symbol { - name: "campsite" - priority: 16000 - } - } - element { - scale: 17 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} -cont { - name: "tourism-caravan_site" - element { - scale: 12 - area { - color: 13626551 - priority: -16479 - } - } - element { - scale: 13 - area { - color: 13626551 - priority: -16480 - } - } - element { - scale: 14 - area { - color: 13626551 - priority: -16481 - } - } - element { - scale: 15 - area { - color: 13626551 - priority: -16482 - } - } - element { - scale: 16 - area { - color: 13626551 - priority: -16483 - } } element { scale: 17 @@ -73753,81 +73503,6 @@ cont { } } } -cont { - name: "tourism-chalet-booking" - element { - scale: 14 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 15 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 16 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-guest_house" element { @@ -73900,78 +73575,6 @@ cont { } } } -cont { - name: "tourism-guest_house-booking" - element { - scale: 14 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 15 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 16 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-hostel" element { @@ -74044,78 +73647,6 @@ cont { } } } -cont { - name: "tourism-hostel-booking" - element { - scale: 14 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 15 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 16 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-hotel" element { @@ -74188,78 +73719,6 @@ cont { } } } -cont { - name: "tourism-hotel-booking" - element { - scale: 14 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 15 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 16 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-information" element { @@ -75118,78 +74577,6 @@ cont { } } } -cont { - name: "tourism-motel-booking" - element { - scale: 14 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 15 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 16 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-museum" element { @@ -75282,35 +74669,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16484 + priority: -16479 } } element { scale: 13 area { color: 13626551 - priority: -16485 + priority: -16480 } } element { scale: 14 area { color: 13626551 - priority: -16486 + priority: -16481 } } element { scale: 15 area { color: 13626551 - priority: -16487 + priority: -16482 } } element { scale: 16 area { color: 13626551 - priority: -16488 + priority: -16483 } } element { @@ -75449,81 +74836,6 @@ cont { } } } -cont { - name: "tourism-resort-booking" - element { - scale: 14 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 15 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 16 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-viewpoint" element { @@ -75616,35 +74928,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16489 + priority: -16484 } } element { scale: 13 area { color: 13626551 - priority: -16490 + priority: -16485 } } element { scale: 14 area { color: 13626551 - priority: -16491 + priority: -16486 } } element { scale: 15 area { color: 13626551 - priority: -16492 + priority: -16487 } } element { scale: 16 area { color: 13626551 - priority: -16493 + priority: -16488 } } element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index d002a8be88..3a0c51677e 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 cfba2d5ef7..26e04d09c8 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -68063,105 +68063,6 @@ cont { } } } -cont { - name: "tourism-alpine_hut-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-apartment" element { @@ -68261,105 +68162,6 @@ cont { } } } -cont { - name: "tourism-apartment-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-artwork" element { @@ -68657,103 +68459,6 @@ cont { } } } -cont { - name: "tourism-camp_site-booking" - element { - scale: 13 - symbol { - name: "campsite-s" - apply_for_type: 1 - priority: 16890 - min_distance: 12 - } - } - element { - scale: 14 - symbol { - name: "campsite-s" - apply_for_type: 1 - priority: 16890 - min_distance: 12 - } - } - element { - scale: 15 - symbol { - name: "campsite-m" - priority: 16890 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 12 - } - priority: 15890 - } - } - element { - scale: 16 - symbol { - name: "campsite-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 12 - } - priority: 15890 - } - } - element { - scale: 17 - symbol { - name: "campsite-l" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 18 - symbol { - name: "campsite-l" - priority: 16876 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "campsite-l" - priority: 16876 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-caravan_site" element { @@ -68920,105 +68625,6 @@ cont { } } } -cont { - name: "tourism-chalet-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-guest_house" element { @@ -69118,105 +68724,6 @@ cont { } } } -cont { - name: "tourism-guest_house-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-hostel" element { @@ -69319,108 +68826,6 @@ cont { } } } -cont { - name: "tourism-hostel-booking" - element { - scale: 14 - symbol { - name: "hotel-s" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 15 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 16 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 17 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 18 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-hotel" element { @@ -69523,108 +68928,6 @@ cont { } } } -cont { - name: "tourism-hotel-booking" - element { - scale: 14 - symbol { - name: "hotel-s" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 15 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 16 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 17 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 18 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-information" element { @@ -70540,105 +69843,6 @@ cont { } } } -cont { - name: "tourism-motel-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-museum" element { @@ -70932,105 +70136,6 @@ cont { } } } -cont { - name: "tourism-resort-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-viewpoint" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index e322b2b20d..e23883abbf 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 7121acc3d5..359b570763 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -68063,105 +68063,6 @@ cont { } } } -cont { - name: "tourism-alpine_hut-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-apartment" element { @@ -68261,105 +68162,6 @@ cont { } } } -cont { - name: "tourism-apartment-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-artwork" element { @@ -68657,103 +68459,6 @@ cont { } } } -cont { - name: "tourism-camp_site-booking" - element { - scale: 13 - symbol { - name: "campsite-s" - apply_for_type: 1 - priority: 16890 - min_distance: 12 - } - } - element { - scale: 14 - symbol { - name: "campsite-s" - apply_for_type: 1 - priority: 16890 - min_distance: 12 - } - } - element { - scale: 15 - symbol { - name: "campsite-m" - priority: 16890 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 12 - } - priority: 15890 - } - } - element { - scale: 16 - symbol { - name: "campsite-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 12 - } - priority: 15890 - } - } - element { - scale: 17 - symbol { - name: "campsite-l" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 18 - symbol { - name: "campsite-l" - priority: 16876 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "campsite-l" - priority: 16876 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-caravan_site" element { @@ -68920,105 +68625,6 @@ cont { } } } -cont { - name: "tourism-chalet-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-guest_house" element { @@ -69118,105 +68724,6 @@ cont { } } } -cont { - name: "tourism-guest_house-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-hostel" element { @@ -69319,108 +68826,6 @@ cont { } } } -cont { - name: "tourism-hostel-booking" - element { - scale: 14 - symbol { - name: "hotel-s" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 15 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 16 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 17 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 18 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-hotel" element { @@ -69523,108 +68928,6 @@ cont { } } } -cont { - name: "tourism-hotel-booking" - element { - scale: 14 - symbol { - name: "hotel-s" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 15 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 16 - symbol { - name: "hotel-m" - apply_for_type: 1 - priority: 16876 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 17 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 18 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } - element { - scale: 19 - symbol { - name: "hotel-l" - apply_for_type: 1 - priority: 16876 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15876 - } - } -} cont { name: "tourism-information" element { @@ -70540,105 +69843,6 @@ cont { } } } -cont { - name: "tourism-motel-booking" - element { - scale: 14 - symbol { - name: "motel-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "motel-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "motel-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-museum" element { @@ -70932,105 +70136,6 @@ cont { } } } -cont { - name: "tourism-resort-booking" - element { - scale: 14 - symbol { - name: "alpine_hut-s" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut-m" - priority: 16849 - min_distance: 30 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut-l" - priority: 16849 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15849 - } - } -} cont { name: "tourism-viewpoint" element { diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin index d81e30dbf6..0a64b64bfd 100644 Binary files a/data/drules_proto_legacy.bin and b/data/drules_proto_legacy.bin differ diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt index d226d5176f..13e2eb31c7 100644 --- a/data/drules_proto_legacy.txt +++ b/data/drules_proto_legacy.txt @@ -64890,6 +64890,40 @@ cont { } } } +cont { + name: "sponsored" + element { + scale: 18 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "hotel" + priority: 16000 + } + } +} +cont { + name: "sponsored-booking" + element { + scale: 18 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "hotel" + priority: 16000 + } + } +} cont { name: "sport-american_football" element { @@ -65517,105 +65551,6 @@ cont { } } } -cont { - name: "tourism-alpine_hut-booking" - element { - scale: 14 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 15 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 16 - symbol { - name: "alpine_hut" - priority: 16000 - } - caption { - primary { - height: 12 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 17 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "alpine_hut" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-apartment" element { @@ -65655,45 +65590,6 @@ cont { } } } -cont { - name: "tourism-apartment-booking" - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-artwork" element { @@ -65931,7 +65827,7 @@ cont { } } cont { - name: "tourism-camp_site-booking" + name: "tourism-caravan_site" element { scale: 12 area { @@ -65952,10 +65848,6 @@ cont { color: 13626551 priority: -16476 } - symbol { - name: "campsite" - priority: 16000 - } } element { scale: 15 @@ -65963,10 +65855,6 @@ cont { color: 13626551 priority: -16477 } - symbol { - name: "campsite" - priority: 16000 - } } element { scale: 16 @@ -65974,108 +65862,6 @@ cont { color: 13626551 priority: -16478 } - symbol { - name: "campsite" - priority: 16000 - } - } - element { - scale: 17 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - area { - color: 13626551 - priority: -15997 - } - symbol { - name: "campsite" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} -cont { - name: "tourism-caravan_site" - element { - scale: 12 - area { - color: 13626551 - priority: -16479 - } - } - element { - scale: 13 - area { - color: 13626551 - priority: -16480 - } - } - element { - scale: 14 - area { - color: 13626551 - priority: -16481 - } - } - element { - scale: 15 - area { - color: 13626551 - priority: -16482 - } - } - element { - scale: 16 - area { - color: 13626551 - priority: -16483 - } } element { scale: 17 @@ -66165,45 +65951,6 @@ cont { } } } -cont { - name: "tourism-chalet-booking" - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-guest_house" element { @@ -66262,64 +66009,6 @@ cont { } } } -cont { - name: "tourism-guest_house-booking" - element { - scale: 16 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-hostel" element { @@ -66378,64 +66067,6 @@ cont { } } } -cont { - name: "tourism-hostel-booking" - element { - scale: 16 - symbol { - name: "hostel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hostel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-hotel" element { @@ -66494,64 +66125,6 @@ cont { } } } -cont { - name: "tourism-hotel-booking" - element { - scale: 16 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-information" element { @@ -66916,64 +66489,6 @@ cont { } } } -cont { - name: "tourism-motel-booking" - element { - scale: 16 - symbol { - name: "hotel" - priority: 16000 - } - } - element { - scale: 17 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - symbol { - name: "hotel" - priority: 16003 - } - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-museum" element { @@ -67038,35 +66553,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16484 + priority: -16479 } } element { scale: 13 area { color: 13626551 - priority: -16485 + priority: -16480 } } element { scale: 14 area { color: 13626551 - priority: -16486 + priority: -16481 } } element { scale: 15 area { color: 13626551 - priority: -16487 + priority: -16482 } } element { scale: 16 area { color: 13626551 - priority: -16488 + priority: -16483 } } element { @@ -67169,45 +66684,6 @@ cont { } } } -cont { - name: "tourism-resort-booking" - element { - scale: 17 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 18 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } - element { - scale: 19 - caption { - primary { - height: 11 - color: 4210752 - stroke_color: 16777215 - offset_y: 10 - } - priority: 15003 - } - } -} cont { name: "tourism-viewpoint" element { @@ -67279,35 +66755,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16489 + priority: -16484 } } element { scale: 13 area { color: 13626551 - priority: -16490 + priority: -16485 } } element { scale: 14 area { color: 13626551 - priority: -16491 + priority: -16486 } } element { scale: 15 area { color: 13626551 - priority: -16492 + priority: -16487 } } element { scale: 16 area { color: 13626551 - priority: -16493 + priority: -16488 } } element { diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 6af0c97bf1..d419444f79 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 2d535bbf09..126be5c128 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,545 +1,545 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 2e3f9c5336..ebbd0d2ff2 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,599 +1,599 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 2c4b0b5cb3..1313b89c78 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 6403a714f3..00704dbaa5 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png index 3a23291a43..047d31bc7c 100644 Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf index 2ec7649372..3a42b8c4a1 100644 --- a/data/resources-ldpi_dark/symbols.sdf +++ b/data/resources-ldpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-ldpi_legacy/symbols.sdf b/data/resources-ldpi_legacy/symbols.sdf index 71a53492d8..9a63107ec9 100644 --- a/data/resources-ldpi_legacy/symbols.sdf +++ b/data/resources-ldpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index c58cd32bc1..a6ffd35e64 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 6acf6f47a2..bb282f45d6 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 2cc22c89d4..4d1ac050ba 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index f4ea731dbc..6fe98aaf16 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_legacy/symbols.sdf b/data/resources-xhdpi_legacy/symbols.sdf index 6198f3efed..d3f5b70d7c 100644 --- a/data/resources-xhdpi_legacy/symbols.sdf +++ b/data/resources-xhdpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 12dcc387a8..5791cf4852 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index fa534bea0f..9f7928c0c8 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-yota_legacy/symbols.sdf b/data/resources-yota_legacy/symbols.sdf index ac31337562..14ae67f309 100644 --- a/data/resources-yota_legacy/symbols.sdf +++ b/data/resources-yota_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/types.txt b/data/types.txt index 0bec6373f0..dacaac54ec 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1109,14 +1109,5 @@ leisure|sports_centre|yoga amenity|public_bookcase tourism|apartment tourism|resort -tourism|hotel|booking -tourism|motel|booking -tourism|hostel|booking -tourism|chalet|booking -tourism|guest_house|booking -tourism|alpine_hut|booking -tourism|camp_site|booking -tourism|apartment|booking -tourism|resort|booking sponsored sponsored|booking diff --git a/data/visibility.txt b/data/visibility.txt index ec08a3a8af..790e389e1f 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -779,8 +779,8 @@ world 00000000000000000000 + tyres 00000000000000000111 - wine 00000000000000000111 - {} - sponsored 00000000000000000000 + - booking 00000000000000000000 - + sponsored 00000000000000000011 + + booking 00000000000000000011 - {} sport 00000000000000000000 + american_football 00000000000000000111 - @@ -807,44 +807,26 @@ world 00000000000000000000 + tennis 00000000000000000111 - {} tourism 00000000000000000000 + - alpine_hut 00000000000000111111 + - booking 00000000000000111111 - - {} - apartment 00000000000000000111 + - booking 00000000000000000111 - - {} + alpine_hut 00000000000000111111 - + apartment 00000000000000000111 - artwork 00000000000000011111 - attraction 00000000000000011111 - - camp_site 00000000000011111111 + - booking 00000000000011111111 - - {} + camp_site 00000000000011111111 - caravan_site 00000000000011111111 - - chalet 00000000000000000111 + - booking 00000000000000000111 - - {} - guest_house 00000000000000001111 + - booking 00000000000000001111 - - {} - hostel 00000000000000001111 + - booking 00000000000000001111 - - {} - hotel 00000000000000001111 + - booking 00000000000000001111 - - {} + chalet 00000000000000000111 - + guest_house 00000000000000001111 - + hostel 00000000000000001111 - + hotel 00000000000000001111 - information 00000000000000000111 + board 00000000000000000111 - guidepost 00000000000000000111 - map 00000000000000000111 - office 00000000000000000111 - {} - motel 00000000000000001111 + - booking 00000000000000001111 - - {} + motel 00000000000000001111 - museum 00000000000000001111 - picnic_site 00000000000011111111 - - resort 00000000000000000111 + - booking 00000000000000000111 - - {} + resort 00000000000000000111 - viewpoint 00000000000000011111 - zoo 00000000000011111111 - {}