diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 44fe04c56..6f5f69db4 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 65ef26a51..6ec76d450 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -9974,6 +9974,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9991,6 +9995,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -10009,7 +10017,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10030,7 +10038,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10051,7 +10059,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10072,7 +10080,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10093,7 +10101,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10116,6 +10124,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -10133,6 +10145,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -10151,7 +10167,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10172,7 +10188,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10193,7 +10209,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10214,7 +10230,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10235,7 +10251,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10258,6 +10274,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -10275,6 +10295,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10293,7 +10317,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10314,7 +10338,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10335,7 +10359,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10356,7 +10380,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10377,7 +10401,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10400,6 +10424,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10417,6 +10445,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10435,7 +10467,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10456,7 +10488,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10477,7 +10509,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10498,7 +10530,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10519,7 +10551,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10542,6 +10574,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10559,6 +10595,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10577,7 +10617,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10598,7 +10638,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10619,7 +10659,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10640,7 +10680,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10661,7 +10701,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10684,6 +10724,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10701,6 +10745,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10719,7 +10767,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10740,7 +10788,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10761,7 +10809,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10782,7 +10830,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10803,7 +10851,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10826,6 +10874,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10843,6 +10895,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10861,7 +10917,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10882,7 +10938,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10903,7 +10959,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10924,7 +10980,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10945,7 +11001,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10968,6 +11024,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10985,6 +11045,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -11003,7 +11067,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11024,7 +11088,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11045,7 +11109,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11066,7 +11130,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11087,7 +11151,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11110,6 +11174,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -11127,6 +11195,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -11145,7 +11217,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11166,7 +11238,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11187,7 +11259,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11208,7 +11280,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11229,7 +11301,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11252,6 +11324,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -11269,6 +11345,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11287,7 +11367,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11308,7 +11388,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11329,7 +11409,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11350,7 +11430,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11371,7 +11451,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11392,8 +11472,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11410,6 +11501,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11426,6 +11521,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11442,6 +11541,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -54779,8 +54882,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54798,6 +54912,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54815,6 +54933,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54832,6 +54954,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54849,6 +54975,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -129520,54 +129650,31 @@ cont { name: "tourism-camp_site" element { scale: 13 - symbol { - name: "campsite-m" - priority: 3800 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -6200 + area { + color: 16445666 + priority: -1830 } } element { scale: 14 - symbol { - name: "campsite-m" - priority: 3800 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -6200 + area { + color: 16445666 + priority: -1830 } } element { scale: 15 - symbol { - name: "campsite-m" - priority: 3800 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -6200 + area { + color: 16445666 + priority: -1830 } } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -129584,6 +129691,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -129600,6 +129711,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -129616,6 +129731,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -129632,6 +129751,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index c31280e05..716add9de 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index ba3fa4c1c..4e367dc3b 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -9672,6 +9672,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9689,6 +9693,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9814,6 +9822,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9831,6 +9843,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9956,6 +9972,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -9973,6 +9993,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10098,6 +10122,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10115,6 +10143,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10240,6 +10272,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10257,6 +10293,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10382,6 +10422,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10399,6 +10443,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10524,6 +10572,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10541,6 +10593,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10666,6 +10722,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10683,6 +10743,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10808,6 +10872,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10825,6 +10893,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10950,6 +11022,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -10967,6 +11043,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11090,8 +11170,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11108,6 +11199,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11124,6 +11219,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11140,6 +11239,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -52098,8 +52201,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52117,6 +52231,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52134,6 +52252,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52151,6 +52273,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52168,6 +52294,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -124298,8 +124428,19 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 15 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124316,6 +124457,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124332,6 +124477,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124348,6 +124497,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124364,6 +124517,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e17a1dec9..46dc2bbd7 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index ecfcd66a7..d76ee1c17 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -9672,6 +9672,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9689,6 +9693,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9707,7 +9715,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9728,7 +9736,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9749,7 +9757,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9770,7 +9778,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9791,7 +9799,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9814,6 +9822,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9831,6 +9843,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9849,7 +9865,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9870,7 +9886,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9891,7 +9907,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9912,7 +9928,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9933,7 +9949,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9956,6 +9972,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -9973,6 +9993,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -9991,7 +10015,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10012,7 +10036,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10033,7 +10057,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10054,7 +10078,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10075,7 +10099,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10098,6 +10122,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10115,6 +10143,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10133,7 +10165,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10154,7 +10186,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10175,7 +10207,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10196,7 +10228,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10217,7 +10249,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10240,6 +10272,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10257,6 +10293,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10275,7 +10315,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10296,7 +10336,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10317,7 +10357,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10338,7 +10378,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10359,7 +10399,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10382,6 +10422,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10399,6 +10443,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10417,7 +10465,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10438,7 +10486,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10459,7 +10507,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10480,7 +10528,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10501,7 +10549,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10524,6 +10572,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10541,6 +10593,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10559,7 +10615,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10580,7 +10636,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10601,7 +10657,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10622,7 +10678,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10643,7 +10699,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10666,6 +10722,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10683,6 +10743,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10701,7 +10765,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10722,7 +10786,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10743,7 +10807,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10764,7 +10828,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10785,7 +10849,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10808,6 +10872,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10825,6 +10893,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10843,7 +10915,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10864,7 +10936,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10885,7 +10957,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10906,7 +10978,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10927,7 +10999,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10950,6 +11022,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -10967,6 +11043,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -10985,7 +11065,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11006,7 +11086,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11027,7 +11107,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11048,7 +11128,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11069,7 +11149,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11090,8 +11170,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11108,6 +11199,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11124,6 +11219,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11140,6 +11239,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -51834,8 +51937,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51853,6 +51967,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51870,6 +51988,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51887,6 +52009,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51904,6 +52030,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -124083,8 +124213,19 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124101,6 +124242,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124117,6 +124262,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124133,6 +124282,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124149,6 +124302,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index fe6615a5c..d7a19f1a0 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 05c023b4a..e2cddafa0 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -9814,6 +9814,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9831,6 +9835,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9956,6 +9964,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9973,6 +9985,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -10098,6 +10114,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -10115,6 +10135,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10240,6 +10264,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10257,6 +10285,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10382,6 +10414,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10399,6 +10435,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10524,6 +10564,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10541,6 +10585,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10666,6 +10714,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10683,6 +10735,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10808,6 +10864,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10825,6 +10885,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10950,6 +11014,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10967,6 +11035,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -11092,6 +11164,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -11109,6 +11185,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11232,8 +11312,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11250,6 +11341,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11266,6 +11361,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11282,6 +11381,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -54789,8 +54892,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54808,6 +54922,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54825,6 +54943,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54842,6 +54964,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54859,6 +54985,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -130289,6 +130419,10 @@ cont { name: "tourism-camp_site" element { scale: 13 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-s" priority: 3800 @@ -130306,6 +130440,10 @@ cont { } element { scale: 14 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130323,6 +130461,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130340,6 +130482,10 @@ cont { } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130356,6 +130502,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130372,6 +130522,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130388,6 +130542,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130404,6 +130562,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 17cba79b3..c4da6e322 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index aaaa54dd3..d8113dabc 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -9814,6 +9814,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9831,6 +9835,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9849,7 +9857,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9870,7 +9878,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9891,7 +9899,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9912,7 +9920,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9933,7 +9941,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9956,6 +9964,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9973,6 +9985,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9991,7 +10007,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10012,7 +10028,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10033,7 +10049,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10054,7 +10070,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10075,7 +10091,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10098,6 +10114,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -10115,6 +10135,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10133,7 +10157,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10154,7 +10178,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10175,7 +10199,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10196,7 +10220,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10217,7 +10241,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10240,6 +10264,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10257,6 +10285,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10275,7 +10307,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10296,7 +10328,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10317,7 +10349,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10338,7 +10370,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10359,7 +10391,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10382,6 +10414,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10399,6 +10435,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10417,7 +10457,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10438,7 +10478,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10459,7 +10499,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10480,7 +10520,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10501,7 +10541,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10524,6 +10564,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10541,6 +10585,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10559,7 +10607,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10580,7 +10628,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10601,7 +10649,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10622,7 +10670,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10643,7 +10691,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10666,6 +10714,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10683,6 +10735,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10701,7 +10757,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10722,7 +10778,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10743,7 +10799,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10764,7 +10820,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10785,7 +10841,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10808,6 +10864,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10825,6 +10885,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10843,7 +10907,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10864,7 +10928,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10885,7 +10949,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10906,7 +10970,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10927,7 +10991,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10950,6 +11014,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10967,6 +11035,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10985,7 +11057,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11006,7 +11078,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11027,7 +11099,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11048,7 +11120,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11069,7 +11141,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11092,6 +11164,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -11109,6 +11185,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11127,7 +11207,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11148,7 +11228,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11169,7 +11249,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11190,7 +11270,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11211,7 +11291,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11232,8 +11312,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11250,6 +11341,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11266,6 +11361,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11282,6 +11381,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -54525,8 +54628,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54544,6 +54658,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54561,6 +54679,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54578,6 +54700,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54595,6 +54721,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -130074,6 +130204,10 @@ cont { name: "tourism-camp_site" element { scale: 13 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-s" priority: 3800 @@ -130091,6 +130225,10 @@ cont { } element { scale: 14 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130108,6 +130246,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130125,6 +130267,10 @@ cont { } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130141,6 +130287,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130157,6 +130307,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130173,6 +130327,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130189,6 +130347,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 8cebc5183..dc27c5c86 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -17,16 +17,16 @@ leisure-stadium # area z15- (also has icon z13-, caption(optional) z13-) === 250 -amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z16- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-buddhist # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-jehovahs_witness # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-mormon # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-hindu # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-jewish # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-muslim # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-shinto # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-taoist # area z14- (also has icon z14-, caption(optional) z14-) === 240 amenity-doctors # area z14- (also has icon z17-, caption(optional) z17-) @@ -50,10 +50,10 @@ landuse-cemetery # area z14- (also has icon z landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) === 180 +amenity-police # area z16- (also has icon z17-, caption(optional) z17-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -tourism-camp_site -leisure-resort -amenity-police +leisure-resort # area z15- (also has icon z16-, caption(optional) z16-) +tourism-camp_site # area z15- (also has icon z16-, caption(optional) z16-) === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index abfdbf799..ccc6eeaff 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -377,18 +377,18 @@ amenity-fuel # icon z14- (also has captio highway-services # icon z14- (also has caption(optional) z14-) === 4250 -amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z14-) === 4200 -amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z14-) historic-memorial # icon z15- (also has caption(optional) z15-) === 4150 @@ -414,7 +414,7 @@ tourism-wilderness_hut # icon z16- (also has captio === 3900 highway-rest_area # icon z15- (also has caption(optional) z15-) -tourism-camp_site # icon z16- (also has caption(optional) z16-) +tourism-camp_site # icon z16- (also has caption(optional) z16-, area z15-) tourism-caravan_site # icon z16- (also has caption(optional) z16-) tourism-chalet # icon z16- (also has caption(optional) z16-) === 3800 @@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) -leisure-resort # icon z16- (also has caption(optional) z16-) +leisure-resort # icon z16- (also has caption(optional) z16-, area z15-) tourism-hotel # icon z16- (also has caption(optional) z16-) === 2750 @@ -1117,7 +1117,7 @@ amenity-fire_station # icon z18- (also has captio amenity-gambling # icon z17- (also has caption(optional) z17-) amenity-internet_cafe # icon z18- (also has caption(optional) z19-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) -amenity-police # icon z17- (also has caption(optional) z17-) +amenity-police # icon z17- (also has caption(optional) z17-, area z16-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -1523,18 +1523,18 @@ leisure-swimming_pool-private # icon z17- (also has captio # highway-services # caption(optional) z14- (also has icon z14-) # === -5750 -# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z14-) # === -5800 -# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z14-) # historic-memorial # caption(optional) z15- (also has icon z15-) # === -5850 @@ -1560,7 +1560,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -6100 # highway-rest_area # caption(optional) z15- (also has icon z15-) -# tourism-camp_site # caption(optional) z16- (also has icon z16-) +# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z15-) # tourism-caravan_site # caption(optional) z16- (also has icon z16-) # tourism-chalet # caption(optional) z16- (also has icon z16-) # === -6200 @@ -1719,7 +1719,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -7150 # amenity-townhall # caption(optional) z16- (also has icon z16-) -# leisure-resort # caption(optional) z16- (also has icon z16-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z15-) # tourism-hotel # caption(optional) z16- (also has icon z16-) # === -7250 @@ -2050,7 +2050,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-gambling # caption(optional) z17- (also has icon z17-) # amenity-internet_cafe # caption(optional) z19- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) -# amenity-police # caption(optional) z17- (also has icon z17-) +# amenity-police # caption(optional) z17- (also has icon z17-, area z16-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 1da8e4d8d..9e6643e4f 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -17,16 +17,16 @@ leisure-stadium # area z15- (also has icon z13-, caption(optional) z13-) === 250 -amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z16- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-buddhist # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-jehovahs_witness # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-mormon # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-hindu # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-jewish # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-muslim # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-shinto # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-taoist # area z14- (also has icon z14-, caption(optional) z14-) === 240 amenity-doctors # area z14- (also has icon z17-, caption(optional) z17-) @@ -50,10 +50,10 @@ landuse-cemetery # area z14- (also has icon z landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) === 180 +amenity-police # area z16- (also has icon z17-, caption(optional) z17-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -tourism-camp_site -leisure-resort -amenity-police +leisure-resort # area z15- (also has icon z16-, caption(optional) z16-) +tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) === 170 highway-footway-area # area z14- (also has line z11-, pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3a9529933..7e5f6b0b1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -377,18 +377,18 @@ amenity-fuel # icon z14- (also has captio highway-services # icon z14- (also has caption(optional) z14-) === 4250 -amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z14-) === 4200 -amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z14-) historic-memorial # icon z15- (also has caption(optional) z15-) === 4150 @@ -414,7 +414,7 @@ tourism-wilderness_hut # icon z12- (also has captio === 3900 highway-rest_area # icon z14- (also has caption(optional) z15-) -tourism-camp_site # icon z13- (also has caption(optional) z13-) +tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) tourism-caravan_site # icon z13- (also has caption(optional) z13-) tourism-chalet # icon z14- (also has caption(optional) z14-) === 3800 @@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) -leisure-resort # icon z16- (also has caption(optional) z16-) +leisure-resort # icon z16- (also has caption(optional) z16-, area z15-) tourism-hotel # icon z16- (also has caption(optional) z16-) === 2750 @@ -1118,7 +1118,7 @@ amenity-fire_station # icon z18- (also has captio amenity-gambling # icon z17- (also has caption(optional) z17-) amenity-internet_cafe # icon z18- (also has caption(optional) z19-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) -amenity-police # icon z17- (also has caption(optional) z17-) +amenity-police # icon z17- (also has caption(optional) z17-, area z16-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -1526,18 +1526,18 @@ leisure-swimming_pool-private # icon z17- (also has captio # highway-services # caption(optional) z14- (also has icon z14-) # === -5750 -# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z14-) # === -5800 -# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z14-) # historic-memorial # caption(optional) z15- (also has icon z15-) # === -5850 @@ -1563,7 +1563,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -6100 # highway-rest_area # caption(optional) z15- (also has icon z14-) -# tourism-camp_site # caption(optional) z13- (also has icon z13-) +# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-) # tourism-caravan_site # caption(optional) z13- (also has icon z13-) # tourism-chalet # caption(optional) z14- (also has icon z14-) # === -6200 @@ -1722,7 +1722,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -7150 # amenity-townhall # caption(optional) z16- (also has icon z16-) -# leisure-resort # caption(optional) z16- (also has icon z16-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z15-) # tourism-hotel # caption(optional) z16- (also has icon z16-) # === -7250 @@ -2054,7 +2054,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-gambling # caption(optional) z17- (also has icon z17-) # amenity-internet_cafe # caption(optional) z19- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) -# amenity-police # caption(optional) z17- (also has icon z17-) +# amenity-police # caption(optional) z17- (also has icon z17-, area z16-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-)