From af506c4739b3a65e8d3d7a28941704dc4b60cc5f Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 12 May 2016 17:01:50 +0300 Subject: [PATCH] [booking] Rebuilt styles --- data/classificator.txt | 34 +- data/drules_proto.bin | Bin 232133 -> 234409 bytes data/drules_proto.txt | 894 ++++++++++++++++++++++++++- data/drules_proto_clear.bin | Bin 217873 -> 220766 bytes data/drules_proto_clear.txt | 1093 ++++++++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 215240 -> 218133 bytes data/drules_proto_dark.txt | 1093 ++++++++++++++++++++++++++++++++++ data/drules_proto_legacy.bin | Bin 209537 -> 211301 bytes data/drules_proto_legacy.txt | 658 +++++++++++++++++++- data/types.txt | 11 + data/visibility.txt | 34 +- 11 files changed, 3781 insertions(+), 36 deletions(-) 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 3022fbe51b897042a6b0f4d48a9130c1250d6a8f..33fa0a09c91144584673d9a4c69ccb690e63ab08 100644 GIT binary patch delta 528 zcmZ9IJxjw-6o$DuSZb^>*0$P|A}WXq1zjBc7lNB$iQ%@nnlzn1k)CoWC!+E)2=`@F5464a{!pHx=_$m0!0Gky=NBEd0qNuV)eGA96*dWs_!Y4c+Yg5xotA=g*4$j#QY!T^UAVxJzi)y~4 z3tXdaLkI&JT*aG&k9v8kF$k7yxNsU8n8SY{eGqb7=$zo{J}6i!!Y#HLgoX;#Gzz_9 z|LoJd_V?+v>dfzfNC3MXd}@&ia*AUNqEK2|ukL&A}MZO6FI;K-2R11u3%pfwNx 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 2c8fef86e0c6c213d4e7be533d8bb1d29b4781f7..8a4960bd09021ee8050213d3b073907e189e8bd4 100644 GIT binary patch delta 397 zcmbQZjQ8Fi-i8*&7N#xCHd=Bsn7E`$@=J>{i*t1oa|$x^QsXm9OLUX+^RqMa(x=;N zGXE9*$jBuKS5uH!RFa#TS2Eo~pZUJ*Pev|D3@Ny7kdo~-TFku6vi(d5g~^Gz1@Xn1 zC8;ol+e37i&oW6(Vd4^l8J3)pn3Ia?j_Hc}%-`gHGjd786s4D@7MH|lPMn007?Lak`xg@_L$>$==gZ;k! nlQr{eM!_B?Exk$36}-i8*&7N#xCs}PBO{j}Tunh@QAuuUUdi<3s?7Ige=>4OVo1StgOqGvt-#F7tk}q^2-&iNQ=w&PdEjMRm~h398KBbc*N6ZBuPK;U delta 60 zcmV-C0K@;4s13-G4S<9JgaWh!t01?wBLfWsx78;D*a4TsDg*YHxGV$rm#!`Y_P3%i S1MUg8h&u!80k@ey1AG+bsu*1W 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 68b4494213ec2b68eb0e42c986a17d221a99b2ac..d81e30dbf6329a3e6dffc8aff482b7dd8abc8bca 100644 GIT binary patch delta 499 zcmZ9IF-yZ>5Qh13DkUu?+NMpSp*1c#nC z5z$o$g5d1t;NmFQ$<5J0O$$j|*Lxq{d+utzSnn%Vt&=))50qEV8CG(rTe0k-sujvs z$;g?mqwZ09V3qPSi;*~XlCXpqNq9-@veO}3)+$cXC}H=T*_hjB#s5Lr(Rg>)J<7v1 zBY!YMPS=X%oNYNqunScI)Yw8KE^!g>?P*H5!p$^@D5oKc#{#gpod(VaxB$591E08@ z1s$sj)KC^-N7UI=;G&ya!59<4BN5t}4q;~lChr=ylQXGnhbG>s2ojOnWY}a<+c65E zst?rhPJ(8N4|+^G0(g%SJWq%%!iITqG)F(L;z=^aHKZ delta 121 zcmV-<0EYkN@(h9H41k0IgaWh!Zxy#v7XzjOmtPwLB$pu?10k2$rvVEAq?fQ80~G_K z|NfUTrvVcIqL