diff --git a/data/classificator.txt b/data/classificator.txt index d89b1f34b5..193b29a79d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -804,24 +804,44 @@ world + tennis - {} tourism + - alpine_hut - + alpine_hut + + booking - + {} + apartment + + booking - + {} artwork - attraction - - camp_site - + camp_site + + booking - + {} caravan_site - - chalet - - guest_house - - hostel - - hotel - + chalet + + booking - + {} + guest_house + + booking - + {} + hostel + + booking - + {} + hotel + + booking - + {} information + board - guidepost - map - office - {} - motel - + motel + + booking - + {} museum - picnic_site - + resort + + booking - + {} viewpoint - zoo - {} diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3022fbe51b..33fa0a09c9 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 84f9abcc6e..140b8f1548 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -72975,6 +72975,255 @@ 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 { + 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-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 { @@ -73234,7 +73483,7 @@ cont { } } cont { - name: "tourism-caravan_site" + name: "tourism-camp_site-booking" element { scale: 12 area { @@ -73255,6 +73504,10 @@ cont { color: 13626551 priority: -16476 } + symbol { + name: "campsite" + priority: 16000 + } } element { scale: 15 @@ -73262,6 +73515,10 @@ cont { color: 13626551 priority: -16477 } + symbol { + name: "campsite" + priority: 16000 + } } element { scale: 16 @@ -73269,6 +73526,108 @@ 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 @@ -73394,6 +73753,81 @@ 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 { @@ -73466,6 +73900,78 @@ 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 { @@ -73538,6 +74044,78 @@ 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 { @@ -73610,6 +74188,78 @@ 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 { @@ -74468,6 +75118,78 @@ 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 { @@ -74560,35 +75282,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16479 + priority: -16484 } } element { scale: 13 area { color: 13626551 - priority: -16480 + priority: -16485 } } element { scale: 14 area { color: 13626551 - priority: -16481 + priority: -16486 } } element { scale: 15 area { color: 13626551 - priority: -16482 + priority: -16487 } } element { scale: 16 area { color: 13626551 - priority: -16483 + priority: -16488 } } element { @@ -74652,6 +75374,156 @@ cont { } } } +cont { + name: "tourism-resort" + 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-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 { @@ -74744,35 +75616,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16484 + priority: -16489 } } element { scale: 13 area { color: 13626551 - priority: -16485 + priority: -16490 } } element { scale: 14 area { color: 13626551 - priority: -16486 + priority: -16491 } } element { scale: 15 area { color: 13626551 - priority: -16487 + priority: -16492 } } element { scale: 16 area { color: 13626551 - priority: -16488 + priority: -16493 } } element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 2c8fef86e0..8a4960bd09 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 843ae468ad..54603cd117 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -68063,6 +68063,303 @@ 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 { + 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-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 { @@ -68360,6 +68657,103 @@ 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 { @@ -68526,6 +68920,105 @@ 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 { @@ -68625,6 +69118,105 @@ 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 { @@ -68727,6 +69319,108 @@ 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 { @@ -68829,6 +69523,108 @@ 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 { @@ -69744,6 +70540,105 @@ 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 { @@ -69938,6 +70833,204 @@ cont { } } } +cont { + name: "tourism-resort" + 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-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 48ede560f8..41ddc7f698 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 6a5e520b7c..42fec16d71 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -68063,6 +68063,303 @@ 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 { + 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-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 { @@ -68360,6 +68657,103 @@ 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 { @@ -68526,6 +68920,105 @@ 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 { @@ -68625,6 +69118,105 @@ 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 { @@ -68727,6 +69319,108 @@ 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 { @@ -68829,6 +69523,108 @@ 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 { @@ -69744,6 +70540,105 @@ 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 { @@ -69938,6 +70833,204 @@ cont { } } } +cont { + name: "tourism-resort" + 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-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 68b4494213..d81e30dbf6 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 feb2c8ee9e..d226d5176f 100644 --- a/data/drules_proto_legacy.txt +++ b/data/drules_proto_legacy.txt @@ -65517,6 +65517,183 @@ 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 { + 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-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 { @@ -65754,7 +65931,7 @@ cont { } } cont { - name: "tourism-caravan_site" + name: "tourism-camp_site-booking" element { scale: 12 area { @@ -65775,6 +65952,10 @@ cont { color: 13626551 priority: -16476 } + symbol { + name: "campsite" + priority: 16000 + } } element { scale: 15 @@ -65782,6 +65963,10 @@ cont { color: 13626551 priority: -16477 } + symbol { + name: "campsite" + priority: 16000 + } } element { scale: 16 @@ -65789,6 +65974,108 @@ 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 @@ -65878,6 +66165,45 @@ 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 { @@ -65936,6 +66262,64 @@ 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 { @@ -65994,6 +66378,64 @@ 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 { @@ -66052,6 +66494,64 @@ 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 { @@ -66416,6 +66916,64 @@ 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 { @@ -66480,35 +67038,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16479 + priority: -16484 } } element { scale: 13 area { color: 13626551 - priority: -16480 + priority: -16485 } } element { scale: 14 area { color: 13626551 - priority: -16481 + priority: -16486 } } element { scale: 15 area { color: 13626551 - priority: -16482 + priority: -16487 } } element { scale: 16 area { color: 13626551 - priority: -16483 + priority: -16488 } } element { @@ -66572,6 +67130,84 @@ cont { } } } +cont { + name: "tourism-resort" + 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-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 { @@ -66643,35 +67279,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16484 + priority: -16489 } } element { scale: 13 area { color: 13626551 - priority: -16485 + priority: -16490 } } element { scale: 14 area { color: 13626551 - priority: -16486 + priority: -16491 } } element { scale: 15 area { color: 13626551 - priority: -16487 + priority: -16492 } } element { scale: 16 area { color: 13626551 - priority: -16488 + priority: -16493 } } element { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3e42426922..8e3e75b161 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1107,3 +1107,14 @@ leisure|sports_centre|shooting;[leisure=sports_centre][sport=shooting];;name;int leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];;name;int_name;1107; leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;1108; amenity|public_bookcase;1109; +tourism|apartment;1110; +tourism|resort;1111; +tourism|hotel|booking;[tourism=hotel][provider=booking];;name;int_name;1112; +tourism|motel|booking;[tourism=motel][provider=booking];;name;int_name;1113; +tourism|hostel|booking;[tourism=hostel][provider=booking];;name;int_name;1114; +tourism|chalet|booking;[tourism=chalet][provider=booking];;name;int_name;1115; +tourism|guest_house|booking;[tourism=guest_house][provider=booking];;name;int_name;1116; +tourism|alpine_hut|booking;[tourism=alpine_hut][provider=booking];;name;int_name;1117; +tourism|camp_site|booking;[tourism=camp_site][provider=booking];;name;int_name;1118; +tourism|apartment|booking;[tourism=apartment][provider=booking];;name;int_name;1119; +tourism|resort|booking;[tourism=resort][provider=booking];;name;int_name;1120; diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index c6c7f7d9f2..d497367e06 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -110,17 +110,21 @@ node|z15[amenity=charging_station], area|z15[amenity=charging_station] { icon-im node|z14[tourism=guest_house], area|z14[tourism=guest_house] { icon-image: motel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z14[tourism=alpine_hut], area|z14[tourism=alpine_hut], -node|z14[tourism=chalet], area|z14[tourism=chalet] +node|z14[tourism=chalet], area|z14[tourism=chalet], +node|z14[tourism=resort], area|z14[tourism=resort] { icon-image: alpine_hut-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} -node|z14[tourism=motel], area|z14[tourism=motel] +node|z14[tourism=motel], area|z14[tourism=motel], +node|z14[tourism=apartment], area|z14[tourism=apartment] { icon-image: motel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z15-16[tourism=guest_house], area|z15-16[tourism=guest_house] { icon-image: motel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z15-16[tourism=alpine_hut], area|z15-16[tourism=alpine_hut], -node|z15-16[tourism=chalet], area|z15-16[tourism=chalet] +node|z15-16[tourism=chalet], area|z15-16[tourism=chalet], +node|z15-16[tourism=resort], area|z15-16[tourism=resort] { icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} -node|z15-16[tourism=motel], area|z15-16[tourism=motel] +node|z15-16[tourism=motel], area|z15-16[tourism=motel], +node|z15-16[tourism=apartment], area|z15-16[tourism=apartment] { icon-image: motel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} /* TOURISM, HISTORIC */ @@ -175,9 +179,11 @@ node|z17-[tourism=hostel] node|z17-[tourism=guest_house], area|z17-[tourism=guest_house] { icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z17-[tourism=alpine_hut], area|z17-[tourism=alpine_hut], -node|z17-[tourism=chalet], area|z17-[tourism=chalet] +node|z17-[tourism=chalet], area|z17-[tourism=chalet], +node|z17-[tourism=resort], area|z17-[tourism=resort] { icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10;} -node|z17-[tourism=motel], area|z17-[tourism=motel] +node|z17-[tourism=motel], area|z17-[tourism=motel], +node|z17-[tourism=apartment], area|z17-[tourism=apartment] { icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10;} node|z17-[tourism=artwork] @@ -555,7 +561,9 @@ node|z16-[tourism=caravan_site], area|z16-[tourism=caravan_site]{ icon-image: ca node|z16-[tourism=guest_house], area|z16-[tourism=guest_house]{ icon-image: motel-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} node|z16-[tourism=alpine_hut], area|z16-[tourism=alpine_hut]{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} node|z16-[tourism=chalet], area|z16-[tourism=chalet]{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[tourism=resort], area|z16-[tourism=resort]{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} node|z16-[tourism=motel], area|z16-[tourism=motel]{ icon-image: motel-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[tourism=apartment], area|z16-[tourism=apartment]{ icon-image: motel-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} node|z16-[tourism=picnic_site], area|z16-[tourism=picnic_site]{ icon-image: picnic-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} @@ -629,7 +637,9 @@ node|z17-[tourism=caravan_site], area|z17-[tourism=caravan_site]{ icon-image: ca node|z17-[tourism=guest_house], area|z17-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z17-[tourism=alpine_hut], area|z17-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z17-[tourism=chalet], area|z17-[tourism=chalet]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[tourism=resort], area|z17-[tourism=resort]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z17-[tourism=motel], area|z17-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[tourism=apartment], area|z17-[tourism=apartment]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} node|z17-[tourism=picnic_site], area|z17-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} @@ -653,7 +663,9 @@ node|z18-[tourism=caravan_site], area|z18-[tourism=caravan_site]{ icon-image: ca node|z18-[tourism=guest_house], area|z18-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[tourism=alpine_hut], area|z18-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[tourism=chalet], area|z18-[tourism=chalet]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} +node|z18-[tourism=resort], area|z18-[tourism=resort]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[tourism=motel], area|z18-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} +node|z18-[tourism=apartment], area|z18-[tourism=apartment]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z17-[power=station], area|z17-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} diff --git a/data/types.txt b/data/types.txt index daac751374..22e87ce7b2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1107,3 +1107,14 @@ leisure|sports_centre|shooting leisure|sports_centre|swimming 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 diff --git a/data/visibility.txt b/data/visibility.txt index 59298725b8..0791d71017 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -804,24 +804,44 @@ world 00000000000000000000 + tennis 00000000000000000111 - {} tourism 00000000000000000000 + - alpine_hut 00000000000000111111 - + alpine_hut 00000000000000111111 + + booking 00000000000000111111 - + {} + apartment 00000000000000000111 + + booking 00000000000000000111 - + {} artwork 00000000000000011111 - attraction 00000000000000011111 - - camp_site 00000000000011111111 - + camp_site 00000000000011111111 + + booking 00000000000011111111 - + {} caravan_site 00000000000011111111 - - chalet 00000000000000000111 - - guest_house 00000000000000001111 - - hostel 00000000000000001111 - - hotel 00000000000000001111 - + chalet 00000000000000000111 + + booking 00000000000000000111 - + {} + guest_house 00000000000000001111 + + booking 00000000000000001111 - + {} + hostel 00000000000000001111 + + booking 00000000000000001111 - + {} + hotel 00000000000000001111 + + booking 00000000000000001111 - + {} information 00000000000000000111 + board 00000000000000000111 - guidepost 00000000000000000111 - map 00000000000000000111 - office 00000000000000000111 - {} - motel 00000000000000001111 - + motel 00000000000000001111 + + booking 00000000000000001111 - + {} museum 00000000000000001111 - picnic_site 00000000000011111111 - + resort 00000000000000000111 + + booking 00000000000000000111 - + {} viewpoint 00000000000000011111 - zoo 00000000000011111111 - {}