diff --git a/data/colors.txt b/data/colors.txt index d2aa4713f2..90df90b49f 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -42,7 +42,6 @@ 3355443 3418688 3584191 -3613696 3677969 3677972 3681605 @@ -193,7 +192,6 @@ 15921870 16154634 16178442 -16212780 16238080 16241558 16308697 @@ -211,13 +209,11 @@ 16645629 16711680 16728128 -16735775 16741158 16742144 16742950 16746278 16746413 -16746496 16749632 16752972 16761924 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 6315e3831f..a83bdfbb19 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 40aadd5c79..c8dea1541b 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -1,5 +1,25 @@ cont { name: "aerialway-cable_car" + element { + scale: 12 + lines { + width: 0.8 + color: 2105376 + priority: 1598 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 2105376 + priority: 1598 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -63,6 +83,26 @@ cont { } cont { name: "aerialway-chair_lift" + element { + scale: 12 + lines { + width: 0.8 + color: 2105376 + priority: 1604 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 2105376 + priority: 1604 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -127,23 +167,65 @@ cont { cont { name: "aerialway-drag_lift" element { - scale: 14 + scale: 12 lines { width: 0.5 color: 4473924 priority: 1729 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } lines { - width: 2.5 + width: 2.0 color: 1715749956 dashdot { dd: 1.0 dd: 18.0 } priority: 1716 - join: ROUNDJOIN + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1729 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.5 + color: 4473924 + priority: 1729 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN cap: BUTTCAP } } @@ -153,18 +235,18 @@ cont { width: 0.5 color: 4473924 priority: 1729 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } lines { - width: 2.5 + width: 2.0 color: 1715749956 dashdot { dd: 1.0 dd: 18.0 } priority: 1716 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } } @@ -174,18 +256,18 @@ cont { width: 0.5 color: 4473924 priority: 1729 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } lines { - width: 2.5 + width: 2.0 color: 1715749956 dashdot { dd: 1.0 dd: 18.0 } priority: 1716 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } } @@ -195,18 +277,18 @@ cont { width: 0.5 color: 4473924 priority: 1729 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } lines { - width: 2.5 + width: 2.0 color: 1715749956 dashdot { dd: 1.0 dd: 18.0 } priority: 1716 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } } @@ -216,24 +298,44 @@ cont { width: 0.5 color: 4473924 priority: 1729 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } lines { - width: 2.5 + width: 2.0 color: 1715749956 dashdot { dd: 1.0 dd: 18.0 } priority: 1716 - join: ROUNDJOIN + join: BEVELJOIN cap: BUTTCAP } } } cont { name: "aerialway-gondola" + element { + scale: 12 + lines { + width: 0.8 + color: 2105376 + priority: 1601 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 2105376 + priority: 1601 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -297,6 +399,26 @@ cont { } cont { name: "aerialway-mixed_lift" + element { + scale: 12 + lines { + width: 0.8 + color: 2105376 + priority: 1607 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 2105376 + priority: 1607 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -360,6 +482,14 @@ cont { } cont { name: "aerialway-station" + element { + scale: 12 + circle { + radius: 2.0 + color: 2105376 + priority: 14000 + } + } element { scale: 13 circle { @@ -1016,6 +1146,13 @@ cont { } cont { name: "aeroway-helipad" + element { + scale: 14 + symbol { + name: "helipad" + priority: 16000 + } + } element { scale: 15 symbol { @@ -1539,6 +1676,27 @@ cont { } cont { name: "amenity-bar" + element { + scale: 13 + symbol { + name: "bar" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "bar" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "bar" + priority: 16000 + } + } element { scale: 16 symbol { @@ -1861,6 +2019,27 @@ cont { } cont { name: "amenity-bus_station" + element { + scale: 12 + symbol { + name: "bus" + priority: 16024 + } + } + element { + scale: 13 + symbol { + name: "bus" + priority: 16024 + } + } + element { + scale: 14 + symbol { + name: "bus" + priority: 16024 + } + } element { scale: 15 symbol { @@ -1947,6 +2126,27 @@ cont { } cont { name: "amenity-cafe" + element { + scale: 13 + symbol { + name: "cafe" + priority: 16003 + } + } + element { + scale: 14 + symbol { + name: "cafe" + priority: 16003 + } + } + element { + scale: 15 + symbol { + name: "cafe" + priority: 16003 + } + } element { scale: 16 symbol { @@ -2121,6 +2321,18 @@ cont { } cont { name: "amenity-casino" + element { + scale: 16 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 caption { @@ -2471,6 +2683,38 @@ cont { } cont { name: "amenity-drinking_water" + element { + scale: 15 + symbol { + name: "drinking_water" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "drinking_water" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -2580,6 +2824,27 @@ cont { } cont { name: "amenity-fast_food" + element { + scale: 13 + symbol { + name: "fastfood" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "fastfood" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "fastfood" + priority: 16000 + } + } element { scale: 16 symbol { @@ -2638,6 +2903,27 @@ cont { } cont { name: "amenity-ferry_terminal" + element { + scale: 11 + symbol { + name: "slipway" + priority: 16000 + } + } + element { + scale: 12 + symbol { + name: "slipway" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "slipway" + priority: 16000 + } + } element { scale: 14 symbol { @@ -2768,6 +3054,17 @@ cont { } cont { name: "amenity-fountain" + element { + scale: 15 + area { + color: 9487572 + priority: 1096 + } + symbol { + name: "fountain" + priority: 16095 + } + } element { scale: 16 area { @@ -2842,6 +3139,20 @@ cont { } cont { name: "amenity-fuel" + element { + scale: 13 + symbol { + name: "petrolstation" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "petrolstation" + priority: 16000 + } + } element { scale: 15 symbol { @@ -3378,6 +3689,27 @@ cont { } cont { name: "amenity-marketplace" + element { + scale: 13 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -3818,6 +4150,18 @@ cont { } cont { name: "amenity-parking-no-access" + element { + scale: 15 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 16 caption { @@ -3950,6 +4294,13 @@ cont { } cont { name: "amenity-parking-permissive" + element { + scale: 15 + symbol { + name: "parking-permissive" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4008,6 +4359,13 @@ cont { } cont { name: "amenity-parking-permissive-fee" + element { + scale: 15 + symbol { + name: "parking_fee" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4066,6 +4424,13 @@ cont { } cont { name: "amenity-parking-private" + element { + scale: 15 + symbol { + name: "parking-private" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4344,6 +4709,13 @@ cont { } cont { name: "amenity-place_of_worship" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4402,6 +4774,13 @@ cont { } cont { name: "amenity-place_of_worship-buddhist" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4460,6 +4839,13 @@ cont { } cont { name: "amenity-place_of_worship-christian" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4518,6 +4904,13 @@ cont { } cont { name: "amenity-place_of_worship-hindu" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4576,6 +4969,13 @@ cont { } cont { name: "amenity-place_of_worship-jewish" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4634,6 +5034,13 @@ cont { } cont { name: "amenity-place_of_worship-muslim" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4692,6 +5099,13 @@ cont { } cont { name: "amenity-place_of_worship-shinto" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4750,6 +5164,13 @@ cont { } cont { name: "amenity-place_of_worship-taoist" + element { + scale: 15 + symbol { + name: "religion" + priority: 16000 + } + } element { scale: 16 symbol { @@ -4968,6 +5389,27 @@ cont { } cont { name: "amenity-pub" + element { + scale: 13 + symbol { + name: "pub" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "pub" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "pub" + priority: 16000 + } + } element { scale: 16 symbol { @@ -5080,6 +5522,27 @@ cont { } cont { name: "amenity-restaurant" + element { + scale: 13 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "restaurant" + priority: 16000 + } + } element { scale: 16 symbol { @@ -5138,6 +5601,27 @@ cont { } cont { name: "amenity-restaurant-vegan" + element { + scale: 13 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "restaurant" + priority: 16000 + } + } element { scale: 16 symbol { @@ -5196,6 +5680,27 @@ cont { } cont { name: "amenity-restaurant-vegetarian" + element { + scale: 13 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "restaurant" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "restaurant" + priority: 16000 + } + } element { scale: 16 symbol { @@ -5595,6 +6100,34 @@ cont { } cont { name: "amenity-theatre" + element { + scale: 12 + symbol { + name: "theatre" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "theatre" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "theatre" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "theatre" + priority: 16000 + } + } element { scale: 16 symbol { @@ -6416,6 +6949,13 @@ cont { } cont { name: "barrier-entrance" + element { + scale: 16 + symbol { + name: "gate" + priority: 16000 + } + } element { scale: 17 symbol { @@ -6483,6 +7023,13 @@ cont { } cont { name: "barrier-gate" + element { + scale: 16 + symbol { + name: "gate" + priority: 16000 + } + } element { scale: 17 symbol { @@ -6659,6 +7206,30 @@ cont { } cont { name: "barrier-toll_booth" + element { + scale: 12 + circle { + radius: 1.2 + color: 7368816 + priority: 14000 + } + } + element { + scale: 13 + circle { + radius: 1.2 + color: 7368816 + priority: 14000 + } + } + element { + scale: 14 + circle { + radius: 1.2 + color: 7368816 + priority: 14000 + } + } element { scale: 15 circle { @@ -10996,6 +11567,29 @@ cont { } cont { name: "highway-bus_stop" + element { + scale: 15 + symbol { + name: "bus-mini" + priority: 16024 + } + caption { + primary { + height: 10 + color: 3166424 + stroke_color: 16777215 + offset_y: 10 + } + secondary { + height: 9 + color: 3166424 + stroke_color: 16777215 + offset_y: 10 + text: "int_name" + } + priority: 15024 + } + } element { scale: 16 symbol { @@ -33818,41 +34412,11 @@ cont { } cont { name: "highway-world_level" - element { - scale: 1 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 4 lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -33861,8 +34425,8 @@ cont { element { scale: 5 lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -33871,8 +34435,8 @@ cont { element { scale: 6 lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -33881,8 +34445,8 @@ cont { element { scale: 7 lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -33891,108 +34455,8 @@ cont { element { scale: 8 lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 9 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 10 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 17 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 18 - lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -34001,61 +34465,11 @@ cont { } cont { name: "highway-world_towns_level" - element { - scale: 1 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 4 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 5 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 6 lines { width: 0.9 - color: 16746496 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -34065,7 +34479,7 @@ cont { scale: 7 lines { width: 0.9 - color: 16746496 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -34075,107 +34489,7 @@ cont { scale: 8 lines { width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 9 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 10 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 17 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 18 - lines { - width: 0.9 - color: 16746496 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -34300,6 +34614,18 @@ cont { } cont { name: "historic-boundary_stone" + element { + scale: 16 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 caption { @@ -34339,6 +34665,34 @@ cont { } cont { name: "historic-castle" + element { + scale: 12 + symbol { + name: "castle" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "castle" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "castle" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "castle" + priority: 16000 + } + } element { scale: 16 symbol { @@ -34467,6 +34821,13 @@ cont { } cont { name: "historic-memorial" + element { + scale: 15 + symbol { + name: "memorial" + priority: 16000 + } + } element { scale: 16 symbol { @@ -34525,6 +34886,34 @@ cont { } cont { name: "historic-monument" + element { + scale: 12 + symbol { + name: "memorial" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "memorial" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "memorial" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "memorial" + priority: 16000 + } + } element { scale: 16 symbol { @@ -34583,6 +34972,34 @@ cont { } cont { name: "historic-museum" + element { + scale: 12 + symbol { + name: "museum" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "museum" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "museum" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "museum" + priority: 16000 + } + } element { scale: 16 symbol { @@ -34778,6 +35195,18 @@ cont { } cont { name: "historic-tomb" + element { + scale: 16 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 caption { @@ -34817,6 +35246,18 @@ cont { } cont { name: "historic-wayside_cross" + element { + scale: 16 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 caption { @@ -34856,6 +35297,18 @@ cont { } cont { name: "historic-wayside_shrine" + element { + scale: 16 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 caption { @@ -40302,6 +40755,34 @@ cont { } cont { name: "man_made-lighthouse" + element { + scale: 11 + symbol { + name: "lighthouse" + priority: 16000 + } + } + element { + scale: 12 + symbol { + name: "lighthouse" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "lighthouse" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "lighthouse" + priority: 16000 + } + } element { scale: 15 symbol { @@ -40861,6 +41342,13 @@ cont { } cont { name: "man_made-windmill" + element { + scale: 16 + symbol { + name: "windmill" + priority: 16000 + } + } element { scale: 17 symbol { @@ -41762,6 +42250,21 @@ cont { } cont { name: "natural-cave_entrance" + element { + scale: 11 + symbol { + name: "cave_entrance" + priority: 16000 + } + caption { + primary { + height: 12 + color: 2105376 + offset_y: 10 + } + priority: 15000 + } + } element { scale: 12 symbol { @@ -43494,6 +43997,40 @@ cont { } cont { name: "natural-spring" + element { + scale: 12 + lines { + width: 4.0 + color: 9487572 + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + caption { + primary { + height: 12 + color: 5274858 + } + priority: 15000 + } + } + element { + scale: 13 + lines { + width: 4.0 + color: 9487572 + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + caption { + primary { + height: 12 + color: 5274858 + } + priority: 15000 + } + } element { scale: 14 lines { @@ -44069,6 +44606,22 @@ cont { } cont { name: "natural-waterfall" + element { + scale: 11 + symbol { + name: "waterfall" + apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 12 + color: 255 + offset_y: 10 + } + priority: 15000 + } + } element { scale: 12 symbol { @@ -54331,6 +54884,13 @@ cont { } cont { name: "railway-halt" + element { + scale: 11 + symbol { + name: "railway-station-mini" + priority: 16159 + } + } element { scale: 12 symbol { @@ -65865,6 +66425,34 @@ cont { } cont { name: "railway-tram" + element { + scale: 13 + lines { + width: 1.7 + color: 5835097 + dashdot { + dd: 3.6 + dd: 5.4 + } + priority: 1539 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 5835097 + priority: 1533 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 1.7 + color: 15120358 + priority: 1536 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -66036,6 +66624,34 @@ cont { } cont { name: "railway-tram-bridge" + element { + scale: 13 + lines { + width: 1.7 + color: 5835097 + dashdot { + dd: 3.6 + dd: 5.4 + } + priority: 1539 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 5835097 + priority: 1533 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 1.7 + color: 15120358 + priority: 1536 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -66277,6 +66893,34 @@ cont { } cont { name: "railway-tram-tunnel" + element { + scale: 13 + lines { + width: 1.7 + color: 5835097 + dashdot { + dd: 3.6 + dd: 5.4 + } + priority: 1539 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 5835097 + priority: 1533 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 1.7 + color: 15120358 + priority: 1536 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 14 lines { @@ -66538,6 +67182,29 @@ cont { } cont { name: "railway-tram_stop" + element { + scale: 14 + symbol { + name: "tramway-mini" + priority: 16000 + } + caption { + primary { + height: 10 + color: 3166424 + stroke_color: 16777215 + offset_y: 10 + } + secondary { + height: 9 + color: 3166424 + stroke_color: 16777215 + offset_y: 10 + text: "int_name" + } + priority: 15000 + } + } element { scale: 15 symbol { @@ -67640,6 +68307,30 @@ cont { } cont { name: "shop" + 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 { @@ -67679,6 +68370,27 @@ cont { } cont { name: "shop-alcohol" + element { + scale: 13 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -67737,6 +68449,13 @@ cont { } cont { name: "shop-bakery" + element { + scale: 15 + symbol { + name: "bakery" + priority: 16000 + } + } element { scale: 16 symbol { @@ -67795,6 +68514,38 @@ cont { } cont { name: "shop-beauty" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -67846,6 +68597,30 @@ cont { } cont { name: "shop-beverages" + 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 { @@ -67885,6 +68660,38 @@ cont { } cont { name: "shop-bicycle" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -67936,6 +68743,38 @@ cont { } cont { name: "shop-books" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -67987,6 +68826,38 @@ cont { } cont { name: "shop-butcher" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -68038,6 +68909,30 @@ cont { } cont { name: "shop-car" + 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 { @@ -68077,6 +68972,13 @@ cont { } cont { name: "shop-car_repair" + element { + scale: 15 + symbol { + name: "car_repair" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68135,6 +69037,30 @@ cont { } cont { name: "shop-chemist" + 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 { @@ -68174,6 +69100,13 @@ cont { } cont { name: "shop-clothes" + element { + scale: 15 + symbol { + name: "clothes" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68232,6 +69165,30 @@ cont { } cont { name: "shop-computer" + 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 { @@ -68271,6 +69228,30 @@ cont { } cont { name: "shop-confectionery" + 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 { @@ -68310,6 +69291,13 @@ cont { } cont { name: "shop-convenience" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68368,6 +69356,13 @@ cont { } cont { name: "shop-department_store" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68426,6 +69421,13 @@ cont { } cont { name: "shop-doityourself" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68484,6 +69486,38 @@ cont { } cont { name: "shop-electronics" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -68535,6 +69569,38 @@ cont { } cont { name: "shop-florist" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -68586,6 +69652,13 @@ cont { } cont { name: "shop-furniture" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68644,6 +69717,30 @@ cont { } cont { name: "shop-garden_centre" + 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 { @@ -68683,6 +69780,30 @@ cont { } cont { name: "shop-gift" + 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 { @@ -68722,6 +69843,30 @@ cont { } cont { name: "shop-greengrocer" + 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 { @@ -68761,6 +69906,13 @@ cont { } cont { name: "shop-hairdresser" + element { + scale: 15 + symbol { + name: "hairdresser" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68819,6 +69971,30 @@ cont { } cont { name: "shop-hardware" + 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 { @@ -68858,6 +70034,30 @@ cont { } cont { name: "shop-jewelry" + 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 { @@ -68897,6 +70097,13 @@ cont { } cont { name: "shop-kiosk" + element { + scale: 15 + symbol { + name: "kiosk" + priority: 16000 + } + } element { scale: 16 symbol { @@ -68955,6 +70162,30 @@ cont { } cont { name: "shop-laundry" + 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 { @@ -68994,6 +70225,27 @@ cont { } cont { name: "shop-mall" + element { + scale: 13 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -69052,6 +70304,38 @@ cont { } cont { name: "shop-mobile_phone" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -69103,6 +70387,30 @@ cont { } cont { name: "shop-optician" + 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 { @@ -69142,6 +70450,38 @@ cont { } cont { name: "shop-shoes" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -69193,6 +70533,38 @@ cont { } cont { name: "shop-sports" + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "supermarket" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -69244,6 +70616,27 @@ cont { } cont { name: "shop-supermarket" + element { + scale: 13 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "supermarket" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "supermarket" + priority: 16000 + } + } element { scale: 16 symbol { @@ -69302,6 +70695,30 @@ cont { } cont { name: "shop-toys" + 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 { @@ -69365,6 +70782,34 @@ cont { } cont { name: "sport-archery" + element { + scale: 13 + symbol { + name: "archery-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "archery-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "archery-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "archery-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69413,6 +70858,34 @@ cont { } cont { name: "sport-australian_football" + element { + scale: 13 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "football-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69485,6 +70958,34 @@ cont { } cont { name: "sport-bowls" + element { + scale: 13 + symbol { + name: "bowls-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "bowls-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "bowls-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "bowls-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69509,6 +71010,34 @@ cont { } cont { name: "sport-cricket" + element { + scale: 13 + symbol { + name: "cricket-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "cricket-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "cricket-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "cricket-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69533,6 +71062,34 @@ cont { } cont { name: "sport-curling" + element { + scale: 13 + symbol { + name: "curling-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "curling-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "curling-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "curling-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69557,6 +71114,34 @@ cont { } cont { name: "sport-diving" + element { + scale: 13 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "diving-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69581,6 +71166,13 @@ cont { } cont { name: "sport-equestrian" + element { + scale: 16 + symbol { + name: "equestrian-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69605,6 +71197,34 @@ cont { } cont { name: "sport-football" + element { + scale: 13 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "football-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "football-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69701,6 +71321,34 @@ cont { } cont { name: "sport-multi" + element { + scale: 13 + symbol { + name: "gymnastics-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "gymnastics-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "gymnastics-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "gymnastics-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69725,6 +71373,34 @@ cont { } cont { name: "sport-scuba_diving" + element { + scale: 13 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "diving-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "diving-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69749,6 +71425,34 @@ cont { } cont { name: "sport-shooting" + element { + scale: 13 + symbol { + name: "shooting-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "shooting-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "shooting-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "shooting-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -69797,6 +71501,27 @@ cont { } cont { name: "sport-soccer" + element { + scale: 13 + symbol { + name: "soccer-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "soccer-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "soccer-borderless" + priority: 16000 + } + } element { scale: 16 symbol { @@ -69852,6 +71577,34 @@ cont { } cont { name: "sport-tennis" + element { + scale: 13 + symbol { + name: "tennis-borderless" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "tennis-borderless" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "tennis-borderless" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "tennis-borderless" + priority: 16000 + } + } element { scale: 17 symbol { @@ -70040,6 +71793,28 @@ cont { } cont { name: "tourism-attraction" + element { + scale: 13 + caption { + primary { + height: 12 + color: 2105376 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 2105376 + stroke_color: 16777215 + } + priority: 15000 + } + } element { scale: 15 caption { @@ -70297,6 +72072,20 @@ cont { } cont { name: "tourism-guest_house" + element { + scale: 14 + symbol { + name: "hostel" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "hostel" + priority: 16000 + } + } element { scale: 16 symbol { @@ -70355,6 +72144,20 @@ cont { } cont { name: "tourism-hostel" + element { + scale: 14 + symbol { + name: "hostel" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "hostel" + priority: 16000 + } + } element { scale: 16 symbol { @@ -70413,6 +72216,20 @@ cont { } cont { name: "tourism-hotel" + element { + scale: 14 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "hotel" + priority: 16000 + } + } element { scale: 16 symbol { @@ -70471,6 +72288,86 @@ cont { } cont { name: "tourism-information" + element { + scale: 12 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 13 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 14 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 15 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -70522,6 +72419,86 @@ cont { } cont { name: "tourism-information-guidepost" + element { + scale: 12 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 13 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 14 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 15 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -70573,6 +72550,86 @@ cont { } cont { name: "tourism-information-office" + element { + scale: 12 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 13 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 14 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 15 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 16 + symbol { + name: "information" + priority: 16003 + } + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } element { scale: 17 symbol { @@ -70624,6 +72681,20 @@ cont { } cont { name: "tourism-motel" + element { + scale: 14 + symbol { + name: "hotel" + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "hotel" + priority: 16000 + } + } element { scale: 16 symbol { @@ -70682,6 +72753,27 @@ cont { } cont { name: "tourism-museum" + element { + scale: 12 + symbol { + name: "museum" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "museum" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "museum" + priority: 16000 + } + } element { scale: 15 symbol { @@ -70845,6 +72937,27 @@ cont { } cont { name: "tourism-viewpoint" + element { + scale: 12 + symbol { + name: "viewpoint" + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "viewpoint" + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "viewpoint" + priority: 16000 + } + } element { scale: 15 symbol { @@ -72734,19 +74847,20 @@ cont { } cont { name: "waterway-waterfall" + element { + scale: 11 + symbol { + name: "waterfall-s" + priority: 16878 + min_distance: 15 + } + } element { scale: 12 symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72754,14 +74868,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72769,14 +74876,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72784,14 +74884,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72799,14 +74892,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72814,14 +74900,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } element { @@ -72829,14 +74908,7 @@ cont { symbol { name: "waterfall-s" priority: 16878 - } - path_text { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 16878 + min_distance: 15 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a96807f5a1..00219322a3 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 1780e300f6..b593a4e103 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -1,5 +1,59 @@ cont { name: "aerialway-cable_car" + element { + scale: 12 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -204,6 +258,60 @@ cont { } cont { name: "aerialway-chair_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -408,6 +516,48 @@ cont { } cont { name: "aerialway-drag_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 4473924 + priority: 1729 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1729 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -607,6 +757,60 @@ cont { } cont { name: "aerialway-gondola" + element { + scale: 12 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -811,6 +1015,60 @@ cont { } cont { name: "aerialway-mixed_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 4473924 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1715749956 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -1015,6 +1273,24 @@ cont { } cont { name: "aerialway-station" + element { + scale: 12 + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 symbol { @@ -1658,6 +1934,54 @@ cont { } cont { name: "aeroway-helipad" + element { + scale: 14 + symbol { + name: "heliport-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "heliport-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "heliport-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -2031,6 +2355,85 @@ cont { } cont { name: "amenity-bar" + element { + scale: 13 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 17 + symbol { + name: "beer-l" + priority: 16864 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 18 symbol { @@ -2223,12 +2626,56 @@ cont { } cont { name: "amenity-bus_station" + element { + scale: 12 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "bus-m" apply_for_type: 1 - priority: 16000 + priority: 16878 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 872415231 + offset_y: 8 + } + priority: 15878 } } element { @@ -2236,6 +2683,7 @@ cont { symbol { name: "bus-m" priority: 16878 + min_distance: 1 } caption { primary { @@ -2259,6 +2707,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2282,6 +2731,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2305,6 +2755,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2326,6 +2777,54 @@ cont { } cont { name: "amenity-cafe" + element { + scale: 13 + symbol { + name: "cafe-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "cafe-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "cafe-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -2456,11 +2955,44 @@ cont { } cont { name: "amenity-casino" + element { + scale: 16 + symbol { + name: "casino-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "casino-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "casino-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -2476,6 +3008,7 @@ cont { symbol { name: "casino-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -2792,6 +3325,22 @@ cont { } cont { name: "amenity-drinking_water" + element { + scale: 15 + symbol { + name: "drinking-water-m" + priority: 16837 + min_distance: 20 + } + } + element { + scale: 16 + symbol { + name: "drinking-water-m" + priority: 16837 + min_distance: 20 + } + } element { scale: 17 symbol { @@ -2872,6 +3421,85 @@ cont { } cont { name: "amenity-fast_food" + element { + scale: 13 + symbol { + name: "fastfood-s" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "fastfood-s" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "fastfood-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "fastfood-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "fastfood-l" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 18 symbol { @@ -2905,6 +3533,32 @@ cont { } cont { name: "amenity-ferry_terminal" + element { + scale: 11 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 12 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 13 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + } + } element { scale: 14 symbol { @@ -3024,11 +3678,40 @@ cont { } cont { name: "amenity-fountain" + element { + scale: 15 + symbol { + name: "fountain-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 16 area { color: 9163744 - priority: -15771 + priority: -15149 + } + symbol { + name: "fountain-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { @@ -3091,6 +3774,54 @@ cont { } cont { name: "amenity-fuel" + element { + scale: 13 + symbol { + name: "fuel-s" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "fuel-s" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "fuel-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } element { scale: 16 symbol { @@ -3320,7 +4051,21 @@ cont { scale: 14 area { color: 16308697 - priority: -15973 + priority: -15122 + } + symbol { + name: "hospital-s" + apply_for_type: 1 + priority: 16878 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 } } element { @@ -3333,6 +4078,7 @@ cont { name: "hospital-m" apply_for_type: 1 priority: 16878 + min_distance: 5 } caption { primary { @@ -3426,8 +4172,8 @@ cont { scale: 15 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3442,8 +4188,8 @@ cont { scale: 16 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3458,8 +4204,8 @@ cont { scale: 17 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3475,6 +4221,7 @@ cont { symbol { name: "hunting-tower-l" priority: 16851 + min_distance: 5 } caption { primary { @@ -3490,6 +4237,7 @@ cont { symbol { name: "hunting-tower-l" priority: 16851 + min_distance: 5 } caption { primary { @@ -3585,11 +4333,93 @@ cont { } cont { name: "amenity-marketplace" + element { + scale: 13 + symbol { + name: "marketplace-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "marketplace-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "marketplace-m" + apply_for_type: 1 + priority: 16837 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "marketplace-m" + priority: 16837 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "marketplace-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "marketplace-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -3605,6 +4435,7 @@ cont { symbol { name: "marketplace-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -3651,12 +4482,24 @@ cont { } cont { name: "amenity-parking" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3665,8 +4508,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3711,12 +4553,24 @@ cont { } cont { name: "amenity-parking-fee" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3725,8 +4579,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3771,12 +4624,24 @@ cont { } cont { name: "amenity-parking-multi-storey" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3785,8 +4650,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3831,12 +4695,24 @@ cont { } cont { name: "amenity-parking-multi-storey-fee" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3845,8 +4721,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3891,12 +4766,24 @@ cont { } cont { name: "amenity-parking-no-access" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3905,8 +4792,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3951,12 +4837,24 @@ cont { } cont { name: "amenity-parking-park_and_ride" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3965,8 +4863,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4011,12 +4908,24 @@ cont { } cont { name: "amenity-parking-permissive" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4026,7 +4935,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4071,12 +4979,24 @@ cont { } cont { name: "amenity-parking-permissive-fee" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4086,7 +5006,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4131,12 +5050,24 @@ cont { } cont { name: "amenity-parking-private" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4146,7 +5077,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4191,12 +5121,24 @@ cont { } cont { name: "amenity-parking-underground" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4205,8 +5147,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4251,12 +5192,24 @@ cont { } cont { name: "amenity-parking-underground-fee" + element { + scale: 15 + area { + color: 15921870 + priority: -15933 + } + } element { scale: 16 area { color: 15921870 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4265,8 +5218,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4344,6 +5296,22 @@ cont { } cont { name: "amenity-place_of_worship" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4423,6 +5391,22 @@ cont { } cont { name: "amenity-place_of_worship-buddhist" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4502,6 +5486,22 @@ cont { } cont { name: "amenity-place_of_worship-christian" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4581,6 +5581,22 @@ cont { } cont { name: "amenity-place_of_worship-hindu" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4660,6 +5676,22 @@ cont { } cont { name: "amenity-place_of_worship-jewish" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4739,6 +5771,22 @@ cont { } cont { name: "amenity-place_of_worship-muslim" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4818,6 +5866,22 @@ cont { } cont { name: "amenity-place_of_worship-shinto" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4897,6 +5961,22 @@ cont { } cont { name: "amenity-place_of_worship-taoist" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -5107,6 +6187,85 @@ cont { } cont { name: "amenity-pub" + element { + scale: 13 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 17 + symbol { + name: "beer-l" + priority: 16864 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 18 symbol { @@ -5140,11 +6299,28 @@ cont { } cont { name: "amenity-recycling" + element { + scale: 17 + symbol { + name: "recycling-l" + priority: 16851 + min_distance: 30 + } + } + element { + scale: 18 + symbol { + name: "recycling-l" + priority: 16851 + min_distance: 30 + } + } element { scale: 19 symbol { name: "recycling-l" priority: 16851 + min_distance: 30 } caption { primary { @@ -5158,6 +6334,54 @@ cont { } cont { name: "amenity-restaurant" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5222,6 +6446,54 @@ cont { } cont { name: "amenity-restaurant-vegan" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5286,6 +6558,54 @@ cont { } cont { name: "amenity-restaurant-vegetarian" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5398,11 +6718,28 @@ cont { } cont { name: "amenity-shelter" + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5418,6 +6755,7 @@ cont { symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5433,6 +6771,7 @@ cont { symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5464,11 +6803,44 @@ cont { } cont { name: "amenity-taxi" + element { + scale: 16 + symbol { + name: "taxi-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "taxi-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "taxi-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5484,6 +6856,7 @@ cont { symbol { name: "taxi-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5497,11 +6870,30 @@ cont { } cont { name: "amenity-telephone" + element { + scale: 17 + symbol { + name: "phone-l" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + } + element { + scale: 18 + symbol { + name: "phone-l" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + } element { scale: 19 symbol { name: "phone-l" priority: 16851 + min_distance: 30 } caption { primary { @@ -5515,10 +6907,74 @@ cont { } cont { name: "amenity-theatre" + element { + scale: 12 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 13 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "theatre-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { - name: "theatre-l" + name: "theatre-m" priority: 16864 min_distance: 10 } @@ -5536,6 +6992,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5551,6 +7008,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5566,6 +7024,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5636,6 +7095,29 @@ cont { color: 16311482 priority: -15987 } + symbol { + name: "college-s" + apply_for_type: 1 + priority: 16013 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 16000 + } + apply_if: "name" + } + element { + scale: 14 + area { + color: 16311482 + priority: -15987 + } + apply_if: "!name" } element { scale: 15 @@ -5647,7 +7129,7 @@ cont { name: "college-m" apply_for_type: 1 priority: 16013 - min_distance: 12 + min_distance: 10 } caption { primary { @@ -5922,11 +7404,28 @@ cont { } cont { name: "amenity-vending_machine-parking_tickets" + element { + scale: 17 + symbol { + name: "vending-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5942,6 +7441,7 @@ cont { symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5955,11 +7455,28 @@ cont { } cont { name: "amenity-vending_machine-public_transport_tickets" + element { + scale: 17 + symbol { + name: "vending-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5975,6 +7492,7 @@ cont { symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6226,6 +7744,21 @@ cont { } cont { name: "barrier-block" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6274,6 +7807,21 @@ cont { } cont { name: "barrier-bollard" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6464,6 +8012,21 @@ cont { } cont { name: "barrier-entrance" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6571,6 +8134,21 @@ cont { } cont { name: "barrier-gate" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6678,11 +8256,44 @@ cont { } cont { name: "barrier-lift_gate" + element { + scale: 16 + symbol { + name: "lift_gate-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "lift_gate-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "lift_gate-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6698,6 +8309,7 @@ cont { symbol { name: "lift_gate-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6770,6 +8382,21 @@ cont { } cont { name: "barrier-stile" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6818,6 +8445,54 @@ cont { } cont { name: "barrier-toll_booth" + element { + scale: 12 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 15 symbol { @@ -6838,6 +8513,7 @@ cont { symbol { name: "toll_booth-m" priority: 16878 + min_distance: 30 } caption { primary { @@ -6853,6 +8529,7 @@ cont { symbol { name: "toll_booth-l" priority: 16878 + min_distance: 20 } caption { primary { @@ -6867,30 +8544,32 @@ cont { scale: 18 symbol { name: "toll_booth-l" - priority: 16837 + priority: 16878 + min_distance: 20 } caption { primary { - height: 11 + height: 10 color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15878 } } element { scale: 19 symbol { name: "toll_booth-l" - priority: 16837 + priority: 16878 + min_distance: 20 } caption { primary { - height: 11 + height: 10 color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15878 } } } @@ -8291,7 +9970,7 @@ cont { primary { height: 10 color: 6381914 - offset_x: 9 + offset_x: 10 text: "ref" } priority: 15081 @@ -8308,7 +9987,7 @@ cont { primary { height: 10 color: 6381914 - offset_x: 9 + offset_x: 10 text: "ref" } secondary { @@ -8831,6 +10510,14 @@ cont { } cont { name: "highway-bus_stop" + element { + scale: 15 + symbol { + name: "bus-m" + priority: 16878 + min_distance: 15 + } + } element { scale: 16 symbol { @@ -26123,41 +27810,11 @@ cont { } cont { name: "highway-world_level" - element { - scale: 1 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 4 lines { - width: 1.2 - color: 16735775 + width: 0.5 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26166,8 +27823,8 @@ cont { element { scale: 5 lines { - width: 1.2 - color: 16735775 + width: 0.7 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26176,8 +27833,8 @@ cont { element { scale: 6 lines { - width: 1.2 - color: 16735775 + width: 0.7 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26186,8 +27843,8 @@ cont { element { scale: 7 lines { - width: 1.2 - color: 16735775 + width: 0.7 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26196,9 +27853,9 @@ cont { element { scale: 8 lines { - width: 1.2 - color: 16735775 - priority: 1621 + width: 0.9 + color: 16742950 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } @@ -26206,171 +27863,21 @@ cont { element { scale: 9 lines { - width: 1.2 - color: 16735775 - priority: 1621 + width: 0.8 + color: 16742950 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } } - element { - scale: 10 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 17 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.2 - color: 16735775 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } } cont { name: "highway-world_towns_level" - element { - scale: 1 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 4 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 5 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 6 lines { width: 0.9 - color: 16746496 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26379,8 +27886,8 @@ cont { element { scale: 7 lines { - width: 0.9 - color: 16746496 + width: 0.7 + color: 16742950 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26390,8 +27897,8 @@ cont { scale: 8 lines { width: 0.9 - color: 16746496 - priority: 1621 + color: 16742950 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } @@ -26399,113 +27906,13 @@ cont { element { scale: 9 lines { - width: 0.9 - color: 16746496 - priority: 1621 + width: 0.8 + color: 16742950 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } } - element { - scale: 10 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 17 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 0.9 - color: 16746496 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } } cont { name: "historic-archaeological_site" @@ -26557,11 +27964,44 @@ cont { } cont { name: "historic-boundary_stone" + element { + scale: 16 + symbol { + name: "boundary_stone-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "boundary_stone-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "boundary_stone-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26577,6 +28017,7 @@ cont { symbol { name: "boundary_stone-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26590,11 +28031,76 @@ cont { } cont { name: "historic-castle" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 16 symbol { name: "remains-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -26610,6 +28116,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26625,6 +28132,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26640,6 +28148,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26712,6 +28221,38 @@ cont { } cont { name: "historic-memorial" + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "monument-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15000 + } + } element { scale: 17 symbol { @@ -26760,6 +28301,70 @@ cont { } cont { name: "historic-monument" + element { + scale: 12 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 13 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -26823,6 +28428,70 @@ cont { } cont { name: "historic-museum" + element { + scale: 12 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "museum-m" + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 16 symbol { @@ -26934,11 +28603,44 @@ cont { } cont { name: "historic-ship" + element { + scale: 16 + symbol { + name: "historic-ship-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "historic-ship-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "historic-ship-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26954,6 +28656,7 @@ cont { symbol { name: "historic-ship-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26967,11 +28670,44 @@ cont { } cont { name: "historic-tomb" + element { + scale: 16 + symbol { + name: "tomb-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "tomb-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "tomb-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26987,6 +28723,7 @@ cont { symbol { name: "tomb-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27000,11 +28737,44 @@ cont { } cont { name: "historic-wayside_cross" + element { + scale: 16 + symbol { + name: "wayside_cross-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "wayside_cross-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "wayside_cross-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27020,6 +28790,7 @@ cont { symbol { name: "wayside_cross-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27033,11 +28804,44 @@ cont { } cont { name: "historic-wayside_shrine" + element { + scale: 16 + symbol { + name: "wayside_shrine-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "wayside_shrine-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "wayside_shrine-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27053,6 +28857,7 @@ cont { symbol { name: "wayside_shrine-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27780,19 +29585,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -27816,19 +29622,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -27844,6 +29651,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27880,6 +29688,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27908,6 +29717,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27936,6 +29746,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27972,6 +29783,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28008,6 +29820,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28036,6 +29849,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28064,6 +29878,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28092,6 +29907,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28128,6 +29944,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28164,6 +29981,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28200,6 +30018,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28228,6 +30047,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28256,6 +30076,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28284,6 +30105,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28320,6 +30142,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28369,6 +30192,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28397,6 +30221,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28425,6 +30250,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28453,6 +30279,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28502,6 +30329,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28530,6 +30358,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28558,6 +30387,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28617,19 +30447,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -28653,19 +30484,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -28681,6 +30513,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28717,6 +30550,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28745,6 +30579,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28773,6 +30608,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28809,6 +30645,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28845,6 +30682,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28873,6 +30711,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28901,6 +30740,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28929,6 +30769,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28965,6 +30806,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29001,6 +30843,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29037,6 +30880,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29065,6 +30909,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29093,6 +30938,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29121,6 +30967,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29157,6 +31004,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29206,6 +31054,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29234,6 +31083,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29262,6 +31112,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29290,6 +31141,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29339,6 +31191,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29367,6 +31220,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29395,6 +31249,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29454,19 +31309,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -29490,19 +31346,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -29518,6 +31375,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29554,6 +31412,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29582,6 +31441,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29610,6 +31470,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29646,6 +31507,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29682,6 +31544,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29710,6 +31573,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29738,6 +31602,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29766,6 +31631,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29802,6 +31668,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29838,6 +31705,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29874,6 +31742,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29902,6 +31771,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29930,6 +31800,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29958,6 +31829,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29994,6 +31866,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30043,6 +31916,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30071,6 +31945,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30099,6 +31974,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30127,6 +32003,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30176,6 +32053,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30204,6 +32082,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30232,6 +32111,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30291,19 +32171,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -30327,19 +32208,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -30355,6 +32237,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30391,6 +32274,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30419,6 +32303,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30447,6 +32332,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30483,6 +32369,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30519,6 +32406,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30547,6 +32435,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30575,6 +32464,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30603,6 +32493,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30639,6 +32530,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30675,6 +32567,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30711,6 +32604,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30739,6 +32633,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30767,6 +32662,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30795,6 +32691,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30831,6 +32728,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30880,6 +32778,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30908,6 +32807,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30936,6 +32836,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30964,6 +32865,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31013,6 +32915,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31041,6 +32944,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31069,6 +32973,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31271,14 +33176,14 @@ cont { element { scale: 14 symbol { - name: "recycling-m" + name: "recycling-s" priority: 16851 } caption { primary { height: 10 color: 4473924 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31297,7 +33202,7 @@ cont { primary { height: 10 color: 6710886 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31316,7 +33221,7 @@ cont { primary { height: 10 color: 6710886 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31328,14 +33233,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 6710886 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31347,14 +33252,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 6710886 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31366,14 +33271,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 6710886 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31440,6 +33345,14 @@ cont { } cont { name: "landuse-military" + element { + scale: 16 + symbol { + name: "military-m" + priority: 16662 + min_distance: 10 + } + } element { scale: 17 symbol { @@ -32327,11 +34240,44 @@ cont { } cont { name: "leisure-dog_park" + element { + scale: 16 + symbol { + name: "dog_park-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "dog_park-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "dog_park-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -32347,6 +34293,7 @@ cont { symbol { name: "dog_park-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -32360,12 +34307,79 @@ cont { } cont { name: "leisure-dog_park-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -32379,31 +34393,33 @@ cont { element { scale: 18 symbol { - name: "dog_park-l" - priority: 16837 + name: "tennis-l" + priority: 16851 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } element { scale: 19 symbol { - name: "dog_park-l" - priority: 16837 + name: "tennis-l" + priority: 16851 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } @@ -32653,28 +34669,48 @@ cont { scale: 13 area { color: 13620648 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-s" + priority: 16216 + min_distance: 40 } } element { scale: 14 area { color: 13029267 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-s" + priority: 16216 + min_distance: 40 } } element { scale: 15 area { color: 13029267 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-m" + priority: 16216 + min_distance: 20 } } element { scale: 16 area { color: 13029267 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-m" + priority: 16216 + min_distance: 20 } } element { @@ -32685,8 +34721,8 @@ cont { } symbol { name: "golf-l" - apply_for_type: 1 priority: 16216 + min_distance: 10 } } element { @@ -32698,6 +34734,7 @@ cont { symbol { name: "golf-l" priority: 16216 + min_distance: 10 } } element { @@ -32709,6 +34746,7 @@ cont { symbol { name: "golf-l" priority: 16216 + min_distance: 10 } } } @@ -32727,6 +34765,11 @@ cont { color: 12372094 priority: -15892 } + symbol { + name: "nparkf-s" + priority: 16108 + min_distance: 20 + } } element { scale: 12 @@ -32737,13 +34780,14 @@ cont { symbol { name: "nparkf-s" priority: 16108 + min_distance: 12 } caption { primary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } priority: 15108 } @@ -32757,13 +34801,14 @@ cont { symbol { name: "nparkf-s" priority: 16108 + min_distance: 12 } caption { primary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } priority: 15108 } @@ -32783,7 +34828,7 @@ cont { height: 11 color: 3832097 stroke_color: 872415231 - offset_y: 10 + offset_y: 8 } priority: 15108 } @@ -32928,19 +34973,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -32964,19 +35010,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -32992,6 +35039,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33028,6 +35076,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33056,6 +35105,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33084,6 +35134,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33120,6 +35171,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33156,6 +35208,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33184,6 +35237,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33212,6 +35266,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33240,6 +35295,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33276,6 +35332,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33312,6 +35369,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33348,6 +35406,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33376,6 +35435,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33404,6 +35464,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33432,6 +35493,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33468,6 +35530,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33504,6 +35567,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33560,6 +35624,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33588,6 +35653,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33616,6 +35682,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33644,6 +35711,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33700,6 +35768,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33728,6 +35797,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33756,6 +35826,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33815,19 +35886,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -33851,19 +35923,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -33879,6 +35952,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33915,6 +35989,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33943,6 +36018,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33971,6 +36047,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34007,6 +36084,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34043,6 +36121,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34071,6 +36150,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34099,6 +36179,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34127,6 +36208,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34163,6 +36245,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34199,6 +36282,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34235,6 +36319,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34263,6 +36348,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34291,6 +36377,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34319,6 +36406,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34355,6 +36443,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34391,6 +36480,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34447,6 +36537,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34475,6 +36566,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34503,6 +36595,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34531,6 +36624,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34587,6 +36681,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34615,6 +36710,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34643,6 +36739,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34702,19 +36799,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -34738,19 +36836,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -34766,6 +36865,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34802,6 +36902,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34830,6 +36931,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34858,6 +36960,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34894,6 +36997,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34930,6 +37034,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34958,6 +37063,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34986,6 +37092,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35014,6 +37121,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35050,6 +37158,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35086,6 +37195,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35122,6 +37232,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35150,6 +37261,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35178,6 +37290,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35206,6 +37319,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35242,6 +37356,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35278,6 +37393,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35334,6 +37450,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35362,6 +37479,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35390,6 +37508,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35418,6 +37537,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35474,6 +37594,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35502,6 +37623,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35530,6 +37652,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35589,19 +37712,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -35625,19 +37749,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 3832097 stroke_color: 872415231 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -35653,6 +37778,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35689,6 +37815,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35717,6 +37844,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35745,6 +37873,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35781,6 +37910,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35817,6 +37947,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35845,6 +37976,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35873,6 +38005,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35901,6 +38034,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35937,6 +38071,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35973,6 +38108,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36009,6 +38145,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36037,6 +38174,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36065,6 +38203,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36093,6 +38232,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36129,6 +38269,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36165,6 +38306,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36221,6 +38363,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36249,6 +38392,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36277,6 +38421,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36305,6 +38450,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36361,6 +38507,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36389,6 +38536,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36417,6 +38565,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36439,18 +38588,80 @@ cont { } cont { name: "leisure-pitch" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 15 area { color: 13749671 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 } } element { scale: 16 area { color: 13749671 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 } } element { @@ -36463,6 +38674,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36483,6 +38695,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36503,6 +38716,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36516,18 +38730,80 @@ cont { } cont { name: "leisure-pitch-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 15 area { color: 13749671 - priority: -15946 + priority: -15149 + } + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 16 area { color: 13749671 - priority: -15946 + priority: -15149 + } + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { @@ -36540,6 +38816,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36560,6 +38837,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36580,6 +38858,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36593,11 +38872,59 @@ cont { } cont { name: "leisure-playground" + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 17 area { color: 13749671 - priority: -15946 + priority: -15163 + } + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 } } element { @@ -36610,6 +38937,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16837 + min_distance: 10 } caption { primary { @@ -36630,6 +38958,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16837 + min_distance: 10 } caption { primary { @@ -36643,6 +38972,74 @@ cont { } cont { name: "leisure-playground-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 area { @@ -36653,6 +39050,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36673,6 +39071,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36693,6 +39092,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36706,12 +39106,81 @@ cont { } cont { name: "leisure-playing_fields-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36728,6 +39197,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36744,6 +39214,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36757,12 +39228,81 @@ cont { } cont { name: "leisure-sports_centre" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } element { scale: 17 symbol { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36779,6 +39319,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36795,6 +39336,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36808,18 +39350,80 @@ cont { } cont { name: "leisure-stadium" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 15 area { color: 13749671 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 } } element { scale: 16 area { color: 13749671 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 } } element { @@ -36832,6 +39436,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36852,6 +39457,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36872,6 +39478,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36889,28 +39496,80 @@ cont { scale: 13 area { color: 9163744 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-s" + priority: 16864 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 } } element { scale: 14 area { color: 9163744 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-s" + priority: 16864 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 } } element { scale: 15 area { color: 9163744 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 } } element { scale: 16 area { color: 9163744 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 } } element { @@ -36922,6 +39581,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -36941,6 +39601,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -36960,6 +39621,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -37037,10 +39699,11 @@ cont { cont { name: "leisure-water_park" element { - scale: 16 + scale: 13 symbol { - name: "swimming-m" + name: "swimming-s" priority: 16864 + min_distance: 20 } caption { primary { @@ -37052,10 +39715,11 @@ cont { } } element { - scale: 17 + scale: 14 symbol { - name: "swimming-l" + name: "swimming-s" priority: 16864 + min_distance: 20 } caption { primary { @@ -37066,11 +39730,60 @@ cont { priority: 15864 } } + element { + scale: 15 + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "swimming-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "swimming-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "swimming-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37086,6 +39799,7 @@ cont { symbol { name: "swimming-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37308,11 +40022,62 @@ cont { } cont { name: "man_made-lighthouse" + element { + scale: 11 + symbol { + name: "lighthouse-s" + priority: 16878 + min_distance: 10 + } + } + element { + scale: 12 + symbol { + name: "lighthouse-s" + priority: 16878 + min_distance: 10 + } + } + element { + scale: 13 + symbol { + name: "lighthouse-s" + apply_for_type: 1 + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "lighthouse-s" + apply_for_type: 1 + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "lighthouse-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -37328,6 +40093,7 @@ cont { symbol { name: "lighthouse-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -37519,11 +40285,44 @@ cont { } cont { name: "man_made-windmill" + element { + scale: 16 + symbol { + name: "windmill-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "windmill-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "windmill-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37539,6 +40338,7 @@ cont { symbol { name: "windmill-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37763,21 +40563,44 @@ cont { scale: 12 area { color: 16575614 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 10 } } element { scale: 13 area { color: 16575614 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 10 } } element { scale: 14 area { color: 16575614 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15837 } } element { @@ -37941,18 +40764,28 @@ cont { } cont { name: "natural-cave_entrance" + element { + scale: 11 + symbol { + name: "cave-s" + apply_for_type: 1 + priority: 16878 + min_distance: 20 + } + } element { scale: 12 symbol { name: "cave-s" apply_for_type: 1 priority: 16878 + min_distance: 15 } caption { primary { height: 10 color: 4473924 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -37963,12 +40796,13 @@ cont { name: "cave-s" apply_for_type: 1 priority: 16878 + min_distance: 15 } caption { primary { height: 10 color: 4473924 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -37984,7 +40818,7 @@ cont { primary { height: 10 color: 4473924 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -39021,6 +41855,7 @@ cont { symbol { name: "peakt-s" priority: 16878 + min_distance: 10 } apply_if: "name" } @@ -39029,6 +41864,7 @@ cont { symbol { name: "peakt-s" priority: 16878 + min_distance: 10 } apply_if: "name" } @@ -39597,12 +42433,52 @@ cont { } cont { name: "natural-spring" + element { + scale: 12 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 15 + } + } + element { + scale: 13 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "drinking-water-m" - apply_for_type: 1 priority: 16878 + min_distance: 5 } caption { primary { @@ -39618,6 +42494,7 @@ cont { symbol { name: "drinking-water-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -39633,6 +42510,7 @@ cont { symbol { name: "drinking-water-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -39648,6 +42526,7 @@ cont { symbol { name: "drinking-water-l" priority: 16864 + min_distance: 5 } caption { primary { @@ -39663,6 +42542,7 @@ cont { symbol { name: "drinking-water-l" priority: 16864 + min_distance: 5 } caption { primary { @@ -39679,7 +42559,7 @@ cont { element { scale: 18 symbol { - name: "tree-m" + name: "tree-s" apply_for_type: 1 priority: 16837 } @@ -39687,7 +42567,7 @@ cont { element { scale: 19 symbol { - name: "tree-m" + name: "tree-s" apply_for_type: 1 priority: 16837 } @@ -40193,6 +43073,14 @@ cont { } cont { name: "natural-waterfall" + element { + scale: 11 + symbol { + name: "waterfall-s" + priority: 16878 + min_distance: 15 + } + } element { scale: 12 symbol { @@ -40272,6 +43160,7 @@ cont { scale: 17 symbol { name: "waterfall-l" + apply_for_type: 1 priority: 16878 } caption { @@ -46661,7 +49550,7 @@ cont { height: 12 color: 9211020 } - priority: 15648 + priority: 16000 } } element { @@ -46671,7 +49560,7 @@ cont { height: 12 color: 9211020 } - priority: 15648 + priority: 16000 } } } @@ -46690,7 +49579,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46706,7 +49595,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46722,7 +49611,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46738,7 +49627,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46754,7 +49643,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46770,7 +49659,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46786,7 +49675,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46802,7 +49691,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46818,7 +49707,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46834,7 +49723,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46850,7 +49739,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46866,7 +49755,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46882,7 +49771,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46898,7 +49787,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46914,7 +49803,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46930,7 +49819,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46946,7 +49835,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } } @@ -48653,11 +51542,28 @@ cont { } cont { name: "power-station" + element { + scale: 17 + symbol { + name: "power-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "power-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -48673,6 +51579,7 @@ cont { symbol { name: "power-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -48686,6 +51593,21 @@ cont { } cont { name: "power-tower" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -49004,6 +51926,16 @@ cont { } cont { name: "railway-funicular" + element { + scale: 12 + lines { + width: 1.4 + color: 9868678 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49077,6 +52009,16 @@ cont { } cont { name: "railway-funicular-bridge" + element { + scale: 12 + lines { + width: 1.4 + color: 9868678 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49150,6 +52092,16 @@ cont { } cont { name: "railway-funicular-tunnel" + element { + scale: 12 + lines { + width: 1.4 + color: 9868678 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49223,6 +52175,15 @@ cont { } cont { name: "railway-halt" + element { + scale: 11 + symbol { + name: "train-s" + apply_for_type: 1 + priority: 16891 + min_distance: 10 + } + } element { scale: 12 symbol { @@ -51716,9 +54677,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -51734,7 +54696,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -51743,6 +54705,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -51889,7 +54852,8 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -51905,7 +54869,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -51914,6 +54878,7 @@ cont { name: "subway-barcelona-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52058,9 +55023,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-berlin-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52076,7 +55042,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52085,6 +55051,7 @@ cont { name: "subway-berlin-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52229,9 +55196,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52247,7 +55215,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52256,6 +55224,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52400,9 +55369,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52418,7 +55388,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52427,6 +55397,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52571,9 +55542,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52589,7 +55561,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52598,6 +55570,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52742,9 +55715,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52760,7 +55734,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52769,6 +55743,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52913,9 +55888,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52931,7 +55907,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52940,6 +55916,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53084,9 +56061,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53102,7 +56080,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53111,6 +56089,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53258,6 +56237,7 @@ cont { name: "subway-kiev-s" apply_for_type: 1 priority: 16027 + min_distance: 1 } caption { primary { @@ -53282,6 +56262,7 @@ cont { name: "subway-kiev-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53418,9 +56399,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53436,7 +56418,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53445,6 +56427,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53589,9 +56572,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53607,7 +56591,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53616,6 +56600,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53762,7 +56747,8 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53778,7 +56764,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53787,6 +56773,7 @@ cont { name: "subway-london-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53931,9 +56918,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-madrid-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53949,7 +56937,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53958,6 +56946,7 @@ cont { name: "subway-madrid-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54105,6 +57094,7 @@ cont { name: "subway-minsk-s" apply_for_type: 1 priority: 16891 + min_distance: 1 } caption { primary { @@ -54129,6 +57119,7 @@ cont { name: "subway-minsk-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54268,6 +57259,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } } element { @@ -54276,6 +57268,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54300,6 +57293,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54324,6 +57318,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54462,7 +57457,8 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54478,7 +57474,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54487,6 +57483,7 @@ cont { name: "subway-newyork-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54631,9 +57628,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54649,7 +57647,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54658,6 +57656,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54804,7 +57803,8 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54820,7 +57820,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54829,6 +57829,7 @@ cont { name: "subway-paris-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54973,9 +57974,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54991,7 +57993,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55000,6 +58002,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55144,9 +58147,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55162,7 +58166,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55171,6 +58175,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55315,9 +58320,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-rome-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55333,7 +58339,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55342,6 +58348,7 @@ cont { name: "subway-rome-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55483,6 +58490,7 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } } element { @@ -55497,7 +58505,7 @@ cont { height: 10 color: 3355443 stroke_color: 1728053247 - offset_y: 8 + offset_y: 6 } secondary { height: 9 @@ -55515,13 +58523,14 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { height: 11 color: 3355443 stroke_color: 1728053247 - offset_y: 8 + offset_y: 6 } secondary { height: 10 @@ -55539,6 +58548,7 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55675,9 +58685,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55693,7 +58704,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55702,6 +58713,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55846,9 +58858,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55864,7 +58877,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55873,6 +58886,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -56996,6 +60010,26 @@ cont { } cont { name: "railway-tram" + element { + scale: 13 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57049,6 +60083,26 @@ cont { } cont { name: "railway-tram-bridge" + element { + scale: 13 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57102,6 +60156,26 @@ cont { } cont { name: "railway-tram-tunnel" + element { + scale: 13 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 5592405 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57155,6 +60229,14 @@ cont { } cont { name: "railway-tram_stop" + element { + scale: 14 + symbol { + name: "tram-s" + apply_for_type: 1 + priority: 16891 + } + } element { scale: 15 symbol { @@ -58442,10 +61524,75 @@ cont { cont { name: "shop" element { - scale: 19 + scale: 15 symbol { name: "shop-m" priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58459,12 +61606,94 @@ cont { } cont { name: "shop-alcohol" + element { + scale: 13 + symbol { + name: "alcohol-s" + apply_for_type: 1 + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "alcohol-s" + apply_for_type: 1 + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "alcohol-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "alcohol-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "alcohol-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "alcohol-l" - apply_for_type: 1 priority: 16837 + min_distance: 20 } caption { primary { @@ -58480,6 +61709,7 @@ cont { symbol { name: "alcohol-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -58494,10 +61724,11 @@ cont { cont { name: "shop-bakery" element { - scale: 18 + scale: 15 symbol { - name: "bakery-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58505,14 +61736,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "bakery-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58520,17 +61800,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-beauty" element { - scale: 18 + scale: 15 symbol { - name: "beauty-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58538,14 +61819,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "beauty-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58553,17 +61883,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-beverages" element { - scale: 18 + scale: 15 symbol { - name: "alcohol-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58571,14 +61902,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "alcohol-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58586,17 +61966,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-bicycle" element { - scale: 18 + scale: 15 symbol { - name: "shop-bicycle-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58604,14 +61985,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "shop-bicycle-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58619,17 +62049,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-books" element { - scale: 18 + scale: 15 symbol { - name: "book-shop-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58637,14 +62068,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "book-shop-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58652,17 +62132,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-butcher" element { - scale: 18 + scale: 15 symbol { - name: "butcher-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58670,14 +62151,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "butcher-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58685,17 +62215,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-car" element { - scale: 18 + scale: 15 symbol { - name: "car_sharing-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58703,14 +62234,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "car_sharing-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58718,17 +62298,50 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-car_repair" + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "car-repair-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -58743,7 +62356,8 @@ cont { scale: 18 symbol { name: "car-repair-l" - priority: 16837 + priority: 16851 + min_distance: 10 } caption { primary { @@ -58751,14 +62365,15 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16837 + priority: 16851 + min_distance: 10 } caption { primary { @@ -58766,17 +62381,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-chemist" element { - scale: 18 + scale: 15 symbol { - name: "chemist-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58784,14 +62400,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "chemist-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58799,17 +62464,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-clothes" element { - scale: 18 + scale: 15 symbol { - name: "clothes-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58817,14 +62483,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "clothes-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58832,17 +62547,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-computer" element { - scale: 18 + scale: 15 symbol { - name: "computer-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58850,14 +62566,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "computer-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58865,17 +62630,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-confectionery" element { - scale: 18 + scale: 15 symbol { - name: "sweets-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58883,14 +62649,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "sweets-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58898,17 +62713,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-convenience" element { - scale: 18 + scale: 15 symbol { - name: "convenience-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58916,14 +62732,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "convenience-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58931,17 +62796,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-department_store" element { - scale: 18 + scale: 15 symbol { - name: "department_store-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58949,14 +62815,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "department_store-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58964,17 +62879,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-doityourself" element { - scale: 18 + scale: 15 symbol { - name: "doityourself-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58982,14 +62898,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "doityourself-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58997,17 +62962,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-electronics" element { - scale: 18 + scale: 15 symbol { - name: "electronics-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59015,14 +62981,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "electronics-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59030,17 +63045,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-florist" element { - scale: 18 + scale: 15 symbol { - name: "florist-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59048,14 +63064,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "florist-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59063,17 +63128,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-furniture" element { - scale: 18 + scale: 15 symbol { - name: "furniture-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59081,14 +63147,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "furniture-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59096,17 +63211,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-garden_centre" element { - scale: 18 + scale: 15 symbol { - name: "garden_center-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59114,14 +63230,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "garden_center-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59129,17 +63294,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-gift" element { - scale: 18 + scale: 15 symbol { - name: "gift-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59147,14 +63313,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "gift-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59162,17 +63377,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-greengrocer" element { - scale: 18 + scale: 15 symbol { - name: "greengrocer-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59180,14 +63396,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "greengrocer-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59195,17 +63460,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-hairdresser" element { - scale: 18 + scale: 15 symbol { - name: "hairdresser-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59213,14 +63479,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "hairdresser-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59228,17 +63543,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-hardware" element { - scale: 18 + scale: 15 symbol { - name: "hardware-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59246,14 +63562,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "hardware-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59261,17 +63626,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-jewelry" element { - scale: 18 + scale: 15 symbol { - name: "jewelry-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59279,14 +63645,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "jewelry-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59294,17 +63709,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-kiosk" element { - scale: 18 + scale: 15 symbol { - name: "kiosk-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59312,14 +63728,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "kiosk-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59327,18 +63792,50 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-laundry" + element { + scale: 15 + symbol { + name: "laundry-m" + priority: 16972 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15972 + } + } + element { + scale: 16 + symbol { + name: "laundry-m" + priority: 16972 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15972 + } + } element { scale: 17 symbol { name: "laundry-l" - apply_for_type: 1 priority: 16972 + min_distance: 10 } caption { primary { @@ -59354,6 +63851,7 @@ cont { symbol { name: "laundry-l" priority: 16972 + min_distance: 10 } caption { primary { @@ -59369,6 +63867,7 @@ cont { symbol { name: "laundry-l" priority: 16972 + min_distance: 10 } caption { primary { @@ -59382,12 +63881,62 @@ cont { } cont { name: "shop-mall" + element { + scale: 13 + symbol { + name: "shop-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "shop-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { name: "shop-m" - apply_for_type: 1 priority: 16864 + min_distance: 15 } caption { primary { @@ -59402,8 +63951,8 @@ cont { scale: 17 symbol { name: "shop-l" - apply_for_type: 1 priority: 16864 + min_distance: 10 } caption { primary { @@ -59418,8 +63967,8 @@ cont { scale: 18 symbol { name: "shop-l" - apply_for_type: 1 priority: 16864 + min_distance: 10 } caption { primary { @@ -59435,6 +63984,7 @@ cont { symbol { name: "shop-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -59449,10 +63999,11 @@ cont { cont { name: "shop-mobile_phone" element { - scale: 18 + scale: 15 symbol { - name: "mobile_phone-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59460,14 +64011,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "mobile_phone-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59475,17 +64075,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-optician" element { - scale: 18 + scale: 15 symbol { - name: "optician-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59493,14 +64094,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "optician-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59508,17 +64158,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-shoes" element { - scale: 18 + scale: 15 symbol { - name: "shoes-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59526,14 +64177,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "shoes-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59541,17 +64241,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-sports" element { - scale: 18 + scale: 15 symbol { - name: "sports-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59559,14 +64260,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "sports-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59574,18 +64324,84 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-supermarket" + element { + scale: 13 + symbol { + name: "grocery-s" + apply_for_type: 1 + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "grocery-s" + apply_for_type: 1 + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "grocery-m" + priority: 16851 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "grocery-m" + priority: 16851 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "grocery-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -59600,8 +64416,8 @@ cont { scale: 18 symbol { name: "grocery-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -59617,6 +64433,7 @@ cont { symbol { name: "grocery-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -59631,10 +64448,11 @@ cont { cont { name: "shop-toys" element { - scale: 18 + scale: 15 symbol { - name: "toys-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59642,14 +64460,63 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "toys-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59657,7 +64524,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15837 + priority: 15851 } } } @@ -59698,11 +64565,92 @@ cont { } cont { name: "sport-archery" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59718,6 +64666,7 @@ cont { symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59766,11 +64715,92 @@ cont { } cont { name: "sport-australian_football" + element { + scale: 13 + symbol { + name: "australian-football-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "australian-football-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "australian-football-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "australian-football-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "australian-football-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "australian-football-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59786,6 +64816,7 @@ cont { symbol { name: "australian-football-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59869,11 +64900,92 @@ cont { } cont { name: "sport-bowls" + element { + scale: 13 + symbol { + name: "bowls-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "bowls-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "bowls-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "bowls-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "bowls-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "bowls-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59889,6 +65001,7 @@ cont { symbol { name: "bowls-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59902,11 +65015,92 @@ cont { } cont { name: "sport-cricket" + element { + scale: 13 + symbol { + name: "cricket-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "cricket-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "cricket-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "cricket-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "cricket-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "cricket-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59922,6 +65116,7 @@ cont { symbol { name: "cricket-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59935,11 +65130,92 @@ cont { } cont { name: "sport-curling" + element { + scale: 13 + symbol { + name: "curling-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "curling-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "curling-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "curling-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "curling-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "curling-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59955,6 +65231,7 @@ cont { symbol { name: "curling-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59968,11 +65245,92 @@ cont { } cont { name: "sport-diving" + element { + scale: 13 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "diving-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59988,6 +65346,7 @@ cont { symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60001,11 +65360,44 @@ cont { } cont { name: "sport-equestrian" + element { + scale: 16 + symbol { + name: "equestrian-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "equestrian-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "equestrian-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60021,6 +65413,7 @@ cont { symbol { name: "equestrian-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60034,11 +65427,76 @@ cont { } cont { name: "sport-football" + element { + scale: 13 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 16 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 17 symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60054,6 +65512,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60069,6 +65528,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60152,6 +65612,74 @@ cont { } cont { name: "sport-multi" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 17 area { @@ -60162,6 +65690,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60182,6 +65711,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60202,6 +65732,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60215,11 +65746,92 @@ cont { } cont { name: "sport-scuba_diving" + element { + scale: 13 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "diving-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60235,6 +65847,7 @@ cont { symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60248,11 +65861,92 @@ cont { } cont { name: "sport-shooting" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60268,6 +65962,7 @@ cont { symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60281,6 +65976,54 @@ cont { } cont { name: "sport-soccer" + element { + scale: 13 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 16 area { @@ -60289,8 +66032,8 @@ cont { } symbol { name: "soccer-m" - apply_for_type: 1 priority: 16067 + min_distance: 40 } caption { primary { @@ -60310,6 +66053,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60329,6 +66073,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60348,6 +66093,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60396,12 +66142,81 @@ cont { } cont { name: "sport-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60418,6 +66233,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60434,6 +66250,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60447,11 +66264,76 @@ cont { } cont { name: "tourism-alpine_hut" + element { + scale: 14 + symbol { + name: "alpine_hut-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "alpine_hut-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "alpine_hut-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "alpine_hut-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "alpine_hut-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60467,6 +66349,7 @@ cont { symbol { name: "alpine_hut-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60480,6 +66363,40 @@ cont { } cont { name: "tourism-artwork" + element { + scale: 15 + symbol { + name: "tourism-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "tourism-m" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60532,11 +66449,11 @@ cont { cont { name: "tourism-attraction" element { - scale: 15 + scale: 13 symbol { - name: "tourism-m" - apply_for_type: 1 - priority: 16851 + name: "tourism-s" + priority: 16864 + min_distance: 20 } caption { primary { @@ -60544,7 +66461,39 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "tourism-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "tourism-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 } } element { @@ -60552,6 +66501,7 @@ cont { symbol { name: "tourism-m" priority: 16864 + min_distance: 20 } caption { primary { @@ -60567,6 +66517,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60582,6 +66533,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60597,6 +66549,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60610,11 +66563,38 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 13 + symbol { + name: "campsite-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 14 + symbol { + name: "campsite-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } element { scale: 15 symbol { name: "campsite-m" priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 12 + } + priority: 15878 } } element { @@ -60680,11 +66660,44 @@ cont { } cont { name: "tourism-caravan_site" + element { + scale: 16 + symbol { + name: "caravan_site-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "caravan_site-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "caravan_site-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60700,6 +66713,7 @@ cont { symbol { name: "caravan_site-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60713,11 +66727,76 @@ cont { } cont { name: "tourism-guest_house" + element { + scale: 14 + symbol { + name: "motel-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "motel-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60733,6 +66812,7 @@ cont { symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60746,6 +66826,57 @@ cont { } cont { name: "tourism-hostel" + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60797,6 +66928,57 @@ cont { } cont { name: "tourism-hotel" + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60848,6 +67030,91 @@ cont { } cont { name: "tourism-information" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60899,6 +67166,91 @@ cont { } cont { name: "tourism-information-guidepost" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60950,6 +67302,91 @@ cont { } cont { name: "tourism-information-office" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60999,11 +67436,76 @@ cont { } cont { name: "tourism-motel" + element { + scale: 14 + symbol { + name: "motel-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "motel-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61019,6 +67521,7 @@ cont { symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61032,12 +67535,60 @@ cont { } cont { name: "tourism-museum" + element { + scale: 12 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "museum-m" priority: 16878 - min_distance: 1 + min_distance: 5 } caption { primary { @@ -61112,18 +67663,35 @@ cont { cont { name: "tourism-picnic_site" element { - scale: 17 + scale: 16 symbol { - name: "picnic-l" - priority: 16851 + name: "picnic-m" + priority: 16837 + min_distance: 30 } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "picnic-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15837 } } element { @@ -61131,6 +67699,7 @@ cont { symbol { name: "picnic-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61146,6 +67715,7 @@ cont { symbol { name: "picnic-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61159,10 +67729,95 @@ cont { } cont { name: "tourism-viewpoint" + element { + scale: 12 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "viewpoint-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "viewpoint-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61178,7 +67833,7 @@ cont { element { scale: 18 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61194,7 +67849,7 @@ cont { element { scale: 19 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61210,11 +67865,60 @@ cont { } cont { name: "tourism-zoo" + element { + scale: 12 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "zoo-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -61230,6 +67934,7 @@ cont { symbol { name: "zoo-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -63014,6 +69719,14 @@ cont { } cont { name: "waterway-waterfall" + element { + scale: 11 + symbol { + name: "waterfall-s" + priority: 16878 + min_distance: 15 + } + } element { scale: 12 symbol { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 16478950eb..e3f7ba8a0c 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 7e4ae09549..36efc65cd7 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -1,5 +1,59 @@ cont { name: "aerialway-cable_car" + element { + scale: 12 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -204,6 +258,60 @@ cont { } cont { name: "aerialway-chair_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -408,6 +516,48 @@ cont { } cont { name: "aerialway-drag_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 5131837 + priority: 1729 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 5131837 + priority: 1729 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -607,6 +757,60 @@ cont { } cont { name: "aerialway-gondola" + element { + scale: 12 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -811,6 +1015,60 @@ cont { } cont { name: "aerialway-mixed_lift" + element { + scale: 12 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: BEVELJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + lines { + width: 0.5 + color: 5131837 + priority: 1864 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1716407869 + dashdot { + dd: 1.0 + dd: 18.0 + } + priority: 1716 + join: ROUNDJOIN + cap: BUTTCAP + } + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 lines { @@ -1015,6 +1273,24 @@ cont { } cont { name: "aerialway-station" + element { + scale: 12 + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } + element { + scale: 13 + symbol { + name: "cable-car-s" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + } element { scale: 14 symbol { @@ -1658,6 +1934,54 @@ cont { } cont { name: "aeroway-helipad" + element { + scale: 14 + symbol { + name: "heliport-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "heliport-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "heliport-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -2031,6 +2355,85 @@ cont { } cont { name: "amenity-bar" + element { + scale: 13 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 17 + symbol { + name: "beer-l" + priority: 16864 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 18 symbol { @@ -2223,12 +2626,56 @@ cont { } cont { name: "amenity-bus_station" + element { + scale: 12 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "bus-s" + apply_for_type: 1 + priority: 16878 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 856756480 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "bus-m" apply_for_type: 1 - priority: 16000 + priority: 16878 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 856756480 + offset_y: 8 + } + priority: 15878 } } element { @@ -2236,6 +2683,7 @@ cont { symbol { name: "bus-m" priority: 16878 + min_distance: 1 } caption { primary { @@ -2259,6 +2707,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2282,6 +2731,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2305,6 +2755,7 @@ cont { symbol { name: "bus-l" priority: 16878 + min_distance: 1 } caption { primary { @@ -2326,6 +2777,54 @@ cont { } cont { name: "amenity-cafe" + element { + scale: 13 + symbol { + name: "cafe-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "cafe-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "cafe-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -2456,11 +2955,44 @@ cont { } cont { name: "amenity-casino" + element { + scale: 16 + symbol { + name: "casino-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "casino-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "casino-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -2476,6 +3008,7 @@ cont { symbol { name: "casino-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -2792,6 +3325,22 @@ cont { } cont { name: "amenity-drinking_water" + element { + scale: 15 + symbol { + name: "drinking-water-m" + priority: 16837 + min_distance: 20 + } + } + element { + scale: 16 + symbol { + name: "drinking-water-m" + priority: 16837 + min_distance: 20 + } + } element { scale: 17 symbol { @@ -2872,6 +3421,85 @@ cont { } cont { name: "amenity-fast_food" + element { + scale: 13 + symbol { + name: "fastfood-s" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "fastfood-s" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "fastfood-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "fastfood-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "fastfood-l" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 18 symbol { @@ -2905,6 +3533,32 @@ cont { } cont { name: "amenity-ferry_terminal" + element { + scale: 11 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 12 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 13 + symbol { + name: "ship-s" + apply_for_type: 1 + priority: 16878 + } + } element { scale: 14 symbol { @@ -3024,11 +3678,40 @@ cont { } cont { name: "amenity-fountain" + element { + scale: 15 + symbol { + name: "fountain-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 16 area { color: 8738 - priority: -15771 + priority: -15149 + } + symbol { + name: "fountain-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { @@ -3091,6 +3774,54 @@ cont { } cont { name: "amenity-fuel" + element { + scale: 13 + symbol { + name: "fuel-s" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "fuel-s" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "fuel-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } element { scale: 16 symbol { @@ -3320,7 +4051,21 @@ cont { scale: 14 area { color: 2496790 - priority: -15973 + priority: -15122 + } + symbol { + name: "hospital-s" + apply_for_type: 1 + priority: 16878 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 } } element { @@ -3333,6 +4078,7 @@ cont { name: "hospital-m" apply_for_type: 1 priority: 16878 + min_distance: 5 } caption { primary { @@ -3426,8 +4172,8 @@ cont { scale: 15 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3442,8 +4188,8 @@ cont { scale: 16 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3458,8 +4204,8 @@ cont { scale: 17 symbol { name: "hunting-tower-m" - apply_for_type: 1 priority: 16851 + min_distance: 5 } caption { primary { @@ -3475,6 +4221,7 @@ cont { symbol { name: "hunting-tower-l" priority: 16851 + min_distance: 5 } caption { primary { @@ -3490,6 +4237,7 @@ cont { symbol { name: "hunting-tower-l" priority: 16851 + min_distance: 5 } caption { primary { @@ -3585,11 +4333,93 @@ cont { } cont { name: "amenity-marketplace" + element { + scale: 13 + symbol { + name: "marketplace-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "marketplace-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "marketplace-m" + apply_for_type: 1 + priority: 16837 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "marketplace-m" + priority: 16837 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "marketplace-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "marketplace-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -3605,6 +4435,7 @@ cont { symbol { name: "marketplace-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -3651,12 +4482,24 @@ cont { } cont { name: "amenity-parking" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3665,8 +4508,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3711,12 +4553,24 @@ cont { } cont { name: "amenity-parking-fee" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3725,8 +4579,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3771,12 +4624,24 @@ cont { } cont { name: "amenity-parking-multi-storey" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3785,8 +4650,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3831,12 +4695,24 @@ cont { } cont { name: "amenity-parking-multi-storey-fee" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3845,8 +4721,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3891,12 +4766,24 @@ cont { } cont { name: "amenity-parking-no-access" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3905,8 +4792,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -3951,12 +4837,24 @@ cont { } cont { name: "amenity-parking-park_and_ride" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -3965,8 +4863,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4011,12 +4908,24 @@ cont { } cont { name: "amenity-parking-permissive" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4026,7 +4935,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4071,12 +4979,24 @@ cont { } cont { name: "amenity-parking-permissive-fee" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4086,7 +5006,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4131,12 +5050,24 @@ cont { } cont { name: "amenity-parking-private" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "zero-icon" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4146,7 +5077,6 @@ cont { } symbol { name: "zero-icon" - apply_for_type: 1 priority: 16067 } } @@ -4191,12 +5121,24 @@ cont { } cont { name: "amenity-parking-underground" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4205,8 +5147,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4251,12 +5192,24 @@ cont { } cont { name: "amenity-parking-underground-fee" + element { + scale: 15 + area { + color: 2038555 + priority: -15933 + } + } element { scale: 16 area { color: 2038555 priority: -15933 } + symbol { + name: "parking-s" + priority: 16067 + min_distance: 25 + } } element { scale: 17 @@ -4265,8 +5218,7 @@ cont { priority: -15933 } symbol { - name: "parking-s" - apply_for_type: 1 + name: "parking-m" priority: 16067 } } @@ -4344,6 +5296,22 @@ cont { } cont { name: "amenity-place_of_worship" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4423,6 +5391,22 @@ cont { } cont { name: "amenity-place_of_worship-buddhist" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4502,6 +5486,22 @@ cont { } cont { name: "amenity-place_of_worship-christian" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4581,6 +5581,22 @@ cont { } cont { name: "amenity-place_of_worship-hindu" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4660,6 +5676,22 @@ cont { } cont { name: "amenity-place_of_worship-jewish" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4739,6 +5771,22 @@ cont { } cont { name: "amenity-place_of_worship-muslim" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4818,6 +5866,22 @@ cont { } cont { name: "amenity-place_of_worship-shinto" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -4897,6 +5961,22 @@ cont { } cont { name: "amenity-place_of_worship-taoist" + element { + scale: 15 + symbol { + name: "place-of-worship-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } element { scale: 16 area { @@ -5107,6 +6187,85 @@ cont { } cont { name: "amenity-pub" + element { + scale: 13 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "beer-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "beer-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 17 + symbol { + name: "beer-l" + priority: 16864 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 18 symbol { @@ -5140,11 +6299,28 @@ cont { } cont { name: "amenity-recycling" + element { + scale: 17 + symbol { + name: "recycling-l" + priority: 16851 + min_distance: 30 + } + } + element { + scale: 18 + symbol { + name: "recycling-l" + priority: 16851 + min_distance: 30 + } + } element { scale: 19 symbol { name: "recycling-l" priority: 16851 + min_distance: 30 } caption { primary { @@ -5158,6 +6334,54 @@ cont { } cont { name: "amenity-restaurant" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5222,6 +6446,54 @@ cont { } cont { name: "amenity-restaurant-vegan" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5286,6 +6558,54 @@ cont { } cont { name: "amenity-restaurant-vegetarian" + element { + scale: 13 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "restaurant-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "restaurant-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -5398,11 +6718,28 @@ cont { } cont { name: "amenity-shelter" + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5418,6 +6755,7 @@ cont { symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5433,6 +6771,7 @@ cont { symbol { name: "picnic-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -5464,11 +6803,44 @@ cont { } cont { name: "amenity-taxi" + element { + scale: 16 + symbol { + name: "taxi-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "taxi-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "taxi-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5484,6 +6856,7 @@ cont { symbol { name: "taxi-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5497,11 +6870,30 @@ cont { } cont { name: "amenity-telephone" + element { + scale: 17 + symbol { + name: "phone-l" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + } + element { + scale: 18 + symbol { + name: "phone-l" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + } element { scale: 19 symbol { name: "phone-l" priority: 16851 + min_distance: 30 } caption { primary { @@ -5515,10 +6907,74 @@ cont { } cont { name: "amenity-theatre" + element { + scale: 12 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 13 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "theatre-s" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "theatre-m" + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { - name: "theatre-l" + name: "theatre-m" priority: 16864 min_distance: 10 } @@ -5536,6 +6992,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5551,6 +7008,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5566,6 +7024,7 @@ cont { symbol { name: "theatre-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -5636,6 +7095,29 @@ cont { color: 2498323 priority: -15987 } + symbol { + name: "college-s" + apply_for_type: 1 + priority: 16013 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 16000 + } + apply_if: "name" + } + element { + scale: 14 + area { + color: 2498323 + priority: -15987 + } + apply_if: "!name" } element { scale: 15 @@ -5647,7 +7129,7 @@ cont { name: "college-m" apply_for_type: 1 priority: 16013 - min_distance: 12 + min_distance: 10 } caption { primary { @@ -5922,11 +7404,28 @@ cont { } cont { name: "amenity-vending_machine-parking_tickets" + element { + scale: 17 + symbol { + name: "vending-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5942,6 +7441,7 @@ cont { symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5955,11 +7455,28 @@ cont { } cont { name: "amenity-vending_machine-public_transport_tickets" + element { + scale: 17 + symbol { + name: "vending-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -5975,6 +7492,7 @@ cont { symbol { name: "vending-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6226,6 +7744,21 @@ cont { } cont { name: "barrier-block" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6274,6 +7807,21 @@ cont { } cont { name: "barrier-bollard" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6464,6 +8012,21 @@ cont { } cont { name: "barrier-entrance" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6571,6 +8134,21 @@ cont { } cont { name: "barrier-gate" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6678,11 +8256,44 @@ cont { } cont { name: "barrier-lift_gate" + element { + scale: 16 + symbol { + name: "lift_gate-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "lift_gate-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "lift_gate-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6698,6 +8309,7 @@ cont { symbol { name: "lift_gate-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -6770,6 +8382,21 @@ cont { } cont { name: "barrier-stile" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -6818,6 +8445,54 @@ cont { } cont { name: "barrier-toll_booth" + element { + scale: 12 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "toll_booth-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 15 symbol { @@ -6838,6 +8513,7 @@ cont { symbol { name: "toll_booth-m" priority: 16878 + min_distance: 30 } caption { primary { @@ -6853,6 +8529,7 @@ cont { symbol { name: "toll_booth-l" priority: 16878 + min_distance: 20 } caption { primary { @@ -6867,30 +8544,32 @@ cont { scale: 18 symbol { name: "toll_booth-l" - priority: 16837 + priority: 16878 + min_distance: 20 } caption { primary { - height: 11 + height: 10 color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15878 } } element { scale: 19 symbol { name: "toll_booth-l" - priority: 16837 + priority: 16878 + min_distance: 20 } caption { primary { - height: 11 + height: 10 color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15878 } } } @@ -8291,7 +9970,7 @@ cont { primary { height: 10 color: 5592405 - offset_x: 9 + offset_x: 10 text: "ref" } priority: 15081 @@ -8308,7 +9987,7 @@ cont { primary { height: 10 color: 5592405 - offset_x: 9 + offset_x: 10 text: "ref" } secondary { @@ -8831,6 +10510,14 @@ cont { } cont { name: "highway-bus_stop" + element { + scale: 15 + symbol { + name: "bus-m" + priority: 16878 + min_distance: 15 + } + } element { scale: 16 symbol { @@ -26123,41 +27810,11 @@ cont { } cont { name: "highway-world_level" - element { - scale: 1 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 4 lines { - width: 1.2 - color: 16212780 + width: 0.5 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26166,8 +27823,8 @@ cont { element { scale: 5 lines { - width: 1.2 - color: 16212780 + width: 0.7 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26176,8 +27833,8 @@ cont { element { scale: 6 lines { - width: 1.2 - color: 16212780 + width: 0.7 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26186,8 +27843,8 @@ cont { element { scale: 7 lines { - width: 1.2 - color: 16212780 + width: 0.7 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26196,9 +27853,9 @@ cont { element { scale: 8 lines { - width: 1.2 - color: 16212780 - priority: 1621 + width: 0.9 + color: 3677969 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } @@ -26206,171 +27863,21 @@ cont { element { scale: 9 lines { - width: 1.2 - color: 16212780 - priority: 1621 + width: 0.8 + color: 3677969 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } } - element { - scale: 10 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 17 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.2 - color: 16212780 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } } cont { name: "highway-world_towns_level" - element { - scale: 1 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 2 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 3 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 4 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 5 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 6 lines { width: 0.9 - color: 3613696 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26379,8 +27886,8 @@ cont { element { scale: 7 lines { - width: 0.9 - color: 3613696 + width: 0.7 + color: 3677969 priority: 1621 join: BEVELJOIN cap: BUTTCAP @@ -26390,8 +27897,8 @@ cont { scale: 8 lines { width: 0.9 - color: 3613696 - priority: 1621 + color: 3677969 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } @@ -26399,113 +27906,13 @@ cont { element { scale: 9 lines { - width: 0.9 - color: 3613696 - priority: 1621 + width: 0.8 + color: 3677969 + priority: 1594 join: BEVELJOIN cap: BUTTCAP } } - element { - scale: 10 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 11 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 17 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 0.9 - color: 3613696 - priority: 1621 - join: ROUNDJOIN - cap: ROUNDCAP - } - } } cont { name: "historic-archaeological_site" @@ -26557,11 +27964,44 @@ cont { } cont { name: "historic-boundary_stone" + element { + scale: 16 + symbol { + name: "boundary_stone-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "boundary_stone-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "boundary_stone-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26577,6 +28017,7 @@ cont { symbol { name: "boundary_stone-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26590,11 +28031,76 @@ cont { } cont { name: "historic-castle" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 16 symbol { name: "remains-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -26610,6 +28116,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26625,6 +28132,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26640,6 +28148,7 @@ cont { symbol { name: "remains-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -26712,6 +28221,38 @@ cont { } cont { name: "historic-memorial" + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "monument-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15000 + } + } element { scale: 17 symbol { @@ -26760,6 +28301,70 @@ cont { } cont { name: "historic-monument" + element { + scale: 12 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 13 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "monument-s" + priority: 16864 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { @@ -26823,6 +28428,70 @@ cont { } cont { name: "historic-museum" + element { + scale: 12 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "museum-m" + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15878 + } + } element { scale: 16 symbol { @@ -26934,11 +28603,44 @@ cont { } cont { name: "historic-ship" + element { + scale: 16 + symbol { + name: "historic-ship-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "historic-ship-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "historic-ship-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26954,6 +28656,7 @@ cont { symbol { name: "historic-ship-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26967,11 +28670,44 @@ cont { } cont { name: "historic-tomb" + element { + scale: 16 + symbol { + name: "tomb-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "tomb-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "tomb-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -26987,6 +28723,7 @@ cont { symbol { name: "tomb-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27000,11 +28737,44 @@ cont { } cont { name: "historic-wayside_cross" + element { + scale: 16 + symbol { + name: "wayside_cross-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "wayside_cross-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "wayside_cross-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27020,6 +28790,7 @@ cont { symbol { name: "wayside_cross-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27033,11 +28804,44 @@ cont { } cont { name: "historic-wayside_shrine" + element { + scale: 16 + symbol { + name: "wayside_shrine-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "wayside_shrine-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "wayside_shrine-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27053,6 +28857,7 @@ cont { symbol { name: "wayside_shrine-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -27780,19 +29585,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -27816,19 +29622,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -27844,6 +29651,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27880,6 +29688,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27908,6 +29717,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27936,6 +29746,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -27972,6 +29783,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28008,6 +29820,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28036,6 +29849,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28064,6 +29878,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28092,6 +29907,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28128,6 +29944,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28164,6 +29981,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28200,6 +30018,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28228,6 +30047,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28256,6 +30076,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28284,6 +30105,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28320,6 +30142,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28369,6 +30192,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28397,6 +30221,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28425,6 +30250,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28453,6 +30279,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28502,6 +30329,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28530,6 +30358,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28558,6 +30387,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -28617,19 +30447,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -28653,19 +30484,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -28681,6 +30513,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28717,6 +30550,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28745,6 +30579,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28773,6 +30608,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28809,6 +30645,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28845,6 +30682,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28873,6 +30711,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28901,6 +30740,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28929,6 +30769,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -28965,6 +30806,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29001,6 +30843,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29037,6 +30880,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29065,6 +30909,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29093,6 +30938,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29121,6 +30967,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29157,6 +31004,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29206,6 +31054,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29234,6 +31083,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29262,6 +31112,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29290,6 +31141,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29339,6 +31191,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29367,6 +31220,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29395,6 +31249,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29454,19 +31309,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -29490,19 +31346,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -29518,6 +31375,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29554,6 +31412,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29582,6 +31441,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29610,6 +31470,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29646,6 +31507,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29682,6 +31544,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29710,6 +31573,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29738,6 +31602,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29766,6 +31631,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29802,6 +31668,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -29838,6 +31705,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29874,6 +31742,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29902,6 +31771,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29930,6 +31800,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29958,6 +31829,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -29994,6 +31866,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30043,6 +31916,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30071,6 +31945,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30099,6 +31974,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30127,6 +32003,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30176,6 +32053,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30204,6 +32082,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30232,6 +32111,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30291,19 +32171,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -30327,19 +32208,20 @@ cont { symbol { name: "park-s" priority: 16108 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15108 @@ -30355,6 +32237,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30391,6 +32274,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30419,6 +32303,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30447,6 +32332,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30483,6 +32369,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30519,6 +32406,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30547,6 +32435,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30575,6 +32464,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30603,6 +32493,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30639,6 +32530,7 @@ cont { symbol { name: "park-m" priority: 16108 + min_distance: 10 } caption { primary { @@ -30675,6 +32567,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30711,6 +32604,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30739,6 +32633,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30767,6 +32662,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30795,6 +32691,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30831,6 +32728,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30880,6 +32778,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30908,6 +32807,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30936,6 +32836,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -30964,6 +32865,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31013,6 +32915,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31041,6 +32944,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31069,6 +32973,7 @@ cont { symbol { name: "park-l" priority: 16108 + min_distance: 10 } caption { primary { @@ -31271,14 +33176,14 @@ cont { element { scale: 14 symbol { - name: "recycling-m" + name: "recycling-s" priority: 16851 } caption { primary { height: 10 color: 5592405 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31297,7 +33202,7 @@ cont { primary { height: 10 color: 10066329 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31316,7 +33221,7 @@ cont { primary { height: 10 color: 10066329 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31328,14 +33233,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 10066329 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31347,14 +33252,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 10066329 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31366,14 +33271,14 @@ cont { priority: -15149 } symbol { - name: "recycling-m" + name: "recycling-l" priority: 16851 } caption { primary { height: 10 color: 10066329 - offset_y: 10 + offset_y: 8 } priority: 15851 } @@ -31440,6 +33345,14 @@ cont { } cont { name: "landuse-military" + element { + scale: 16 + symbol { + name: "military-m" + priority: 16662 + min_distance: 10 + } + } element { scale: 17 symbol { @@ -32327,11 +34240,44 @@ cont { } cont { name: "leisure-dog_park" + element { + scale: 16 + symbol { + name: "dog_park-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "dog_park-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "dog_park-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -32347,6 +34293,7 @@ cont { symbol { name: "dog_park-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -32360,12 +34307,79 @@ cont { } cont { name: "leisure-dog_park-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -32379,31 +34393,33 @@ cont { element { scale: 18 symbol { - name: "dog_park-l" - priority: 16837 + name: "tennis-l" + priority: 16851 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } element { scale: 19 symbol { - name: "dog_park-l" - priority: 16837 + name: "tennis-l" + priority: 16851 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } @@ -32653,28 +34669,48 @@ cont { scale: 13 area { color: 988160 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-s" + priority: 16216 + min_distance: 40 } } element { scale: 14 area { color: 1251584 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-s" + priority: 16216 + min_distance: 40 } } element { scale: 15 area { color: 1251584 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-m" + priority: 16216 + min_distance: 20 } } element { scale: 16 area { color: 1251584 - priority: -15825 + priority: -15784 + } + symbol { + name: "golf-m" + priority: 16216 + min_distance: 20 } } element { @@ -32685,8 +34721,8 @@ cont { } symbol { name: "golf-l" - apply_for_type: 1 priority: 16216 + min_distance: 10 } } element { @@ -32698,6 +34734,7 @@ cont { symbol { name: "golf-l" priority: 16216 + min_distance: 10 } } element { @@ -32709,6 +34746,7 @@ cont { symbol { name: "golf-l" priority: 16216 + min_distance: 10 } } } @@ -32727,6 +34765,11 @@ cont { color: 1317888 priority: -15892 } + symbol { + name: "nparkf-s" + priority: 16108 + min_distance: 20 + } } element { scale: 12 @@ -32737,13 +34780,14 @@ cont { symbol { name: "nparkf-s" priority: 16108 + min_distance: 12 } caption { primary { height: 10 color: 2836760 stroke_color: 856756480 - offset_y: 8 + offset_y: 6 } priority: 15108 } @@ -32757,13 +34801,14 @@ cont { symbol { name: "nparkf-s" priority: 16108 + min_distance: 12 } caption { primary { height: 10 color: 2836760 stroke_color: 856756480 - offset_y: 8 + offset_y: 6 } priority: 15108 } @@ -32783,7 +34828,7 @@ cont { height: 11 color: 2836760 stroke_color: 856756480 - offset_y: 10 + offset_y: 8 } priority: 15108 } @@ -32928,19 +34973,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -32964,19 +35010,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -32992,6 +35039,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33028,6 +35076,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33056,6 +35105,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33084,6 +35134,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33120,6 +35171,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33156,6 +35208,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33184,6 +35237,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33212,6 +35266,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33240,6 +35295,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33276,6 +35332,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33312,6 +35369,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33348,6 +35406,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33376,6 +35435,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33404,6 +35464,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33432,6 +35493,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33468,6 +35530,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33504,6 +35567,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33560,6 +35624,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33588,6 +35653,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33616,6 +35682,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33644,6 +35711,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33700,6 +35768,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33728,6 +35797,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33756,6 +35826,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -33815,19 +35886,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -33851,19 +35923,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -33879,6 +35952,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33915,6 +35989,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33943,6 +36018,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -33971,6 +36047,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34007,6 +36084,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34043,6 +36121,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34071,6 +36150,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34099,6 +36179,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34127,6 +36208,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34163,6 +36245,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34199,6 +36282,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34235,6 +36319,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34263,6 +36348,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34291,6 +36377,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34319,6 +36406,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34355,6 +36443,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34391,6 +36480,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34447,6 +36537,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34475,6 +36566,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34503,6 +36595,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34531,6 +36624,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34587,6 +36681,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34615,6 +36710,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34643,6 +36739,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -34702,19 +36799,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -34738,19 +36836,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -34766,6 +36865,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34802,6 +36902,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34830,6 +36931,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34858,6 +36960,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34894,6 +36997,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34930,6 +37034,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34958,6 +37063,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -34986,6 +37092,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35014,6 +37121,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35050,6 +37158,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35086,6 +37195,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35122,6 +37232,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35150,6 +37261,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35178,6 +37290,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35206,6 +37319,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35242,6 +37356,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35278,6 +37393,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35334,6 +37450,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35362,6 +37479,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35390,6 +37508,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35418,6 +37537,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35474,6 +37594,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35502,6 +37623,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35530,6 +37652,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -35589,19 +37712,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -35625,19 +37749,20 @@ cont { symbol { name: "park-s" priority: 16121 + min_distance: 10 } caption { primary { - height: 11 + height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 8 + offset_y: 6 } secondary { height: 10 color: 2836760 stroke_color: 856756497 - offset_y: 18 + offset_y: 6 text: "int_name" } priority: 15121 @@ -35653,6 +37778,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35689,6 +37815,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35717,6 +37844,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35745,6 +37873,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35781,6 +37910,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35817,6 +37947,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35845,6 +37976,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35873,6 +38005,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35901,6 +38034,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35937,6 +38071,7 @@ cont { symbol { name: "park-m" priority: 16121 + min_distance: 10 } caption { primary { @@ -35973,6 +38108,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36009,6 +38145,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36037,6 +38174,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36065,6 +38203,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36093,6 +38232,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36129,6 +38269,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36165,6 +38306,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36221,6 +38363,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36249,6 +38392,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36277,6 +38421,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36305,6 +38450,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36361,6 +38507,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36389,6 +38536,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36417,6 +38565,7 @@ cont { symbol { name: "park-l" priority: 16121 + min_distance: 10 } caption { primary { @@ -36439,18 +38588,80 @@ cont { } cont { name: "leisure-pitch" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 15 area { color: 2171163 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 } } element { scale: 16 area { color: 2171163 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 } } element { @@ -36463,6 +38674,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36483,6 +38695,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36503,6 +38716,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36516,18 +38730,80 @@ cont { } cont { name: "leisure-pitch-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 15 area { color: 2171163 - priority: -15946 + priority: -15149 + } + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 16 area { color: 2171163 - priority: -15946 + priority: -15149 + } + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { @@ -36540,6 +38816,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36560,6 +38837,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36580,6 +38858,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36593,11 +38872,59 @@ cont { } cont { name: "leisure-playground" + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 17 area { color: 2171163 - priority: -15946 + priority: -15163 + } + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 } } element { @@ -36610,6 +38937,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16837 + min_distance: 10 } caption { primary { @@ -36630,6 +38958,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16837 + min_distance: 10 } caption { primary { @@ -36643,6 +38972,74 @@ cont { } cont { name: "leisure-playground-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 area { @@ -36653,6 +39050,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36673,6 +39071,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36693,6 +39092,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36706,12 +39106,81 @@ cont { } cont { name: "leisure-playing_fields-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36728,6 +39197,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36744,6 +39214,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -36757,12 +39228,81 @@ cont { } cont { name: "leisure-sports_centre" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } element { scale: 17 symbol { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36779,6 +39319,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36795,6 +39336,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36808,18 +39350,80 @@ cont { } cont { name: "leisure-stadium" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 15 area { color: 2171163 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 } } element { scale: 16 area { color: 2171163 - priority: -15946 + priority: -15933 + } + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 } } element { @@ -36832,6 +39436,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36852,6 +39457,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36872,6 +39478,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -36889,28 +39496,80 @@ cont { scale: 13 area { color: 8738 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-s" + priority: 16864 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 } } element { scale: 14 area { color: 8738 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-s" + priority: 16864 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 } } element { scale: 15 area { color: 8738 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 } } element { scale: 16 area { color: 8738 - priority: -15771 + priority: -15136 + } + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 } } element { @@ -36922,6 +39581,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -36941,6 +39601,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -36960,6 +39621,7 @@ cont { symbol { name: "swimming-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -37037,10 +39699,11 @@ cont { cont { name: "leisure-water_park" element { - scale: 16 + scale: 13 symbol { - name: "swimming-m" + name: "swimming-s" priority: 16864 + min_distance: 20 } caption { primary { @@ -37052,10 +39715,11 @@ cont { } } element { - scale: 17 + scale: 14 symbol { - name: "swimming-l" + name: "swimming-s" priority: 16864 + min_distance: 20 } caption { primary { @@ -37066,11 +39730,60 @@ cont { priority: 15864 } } + element { + scale: 15 + symbol { + name: "swimming-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "swimming-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "swimming-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "swimming-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37086,6 +39799,7 @@ cont { symbol { name: "swimming-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37308,11 +40022,62 @@ cont { } cont { name: "man_made-lighthouse" + element { + scale: 11 + symbol { + name: "lighthouse-s" + priority: 16878 + min_distance: 10 + } + } + element { + scale: 12 + symbol { + name: "lighthouse-s" + priority: 16878 + min_distance: 10 + } + } + element { + scale: 13 + symbol { + name: "lighthouse-s" + apply_for_type: 1 + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "lighthouse-s" + apply_for_type: 1 + priority: 16878 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "lighthouse-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -37328,6 +40093,7 @@ cont { symbol { name: "lighthouse-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -37519,11 +40285,44 @@ cont { } cont { name: "man_made-windmill" + element { + scale: 16 + symbol { + name: "windmill-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "windmill-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "windmill-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37539,6 +40338,7 @@ cont { symbol { name: "windmill-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -37763,21 +40563,44 @@ cont { scale: 12 area { color: 2631706 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 10 } } element { scale: 13 area { color: 2631706 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 10 } } element { scale: 14 area { color: 2631706 - priority: -15811 + priority: -15163 + } + symbol { + name: "beach-s" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15837 } } element { @@ -37941,18 +40764,28 @@ cont { } cont { name: "natural-cave_entrance" + element { + scale: 11 + symbol { + name: "cave-s" + apply_for_type: 1 + priority: 16878 + min_distance: 20 + } + } element { scale: 12 symbol { name: "cave-s" apply_for_type: 1 priority: 16878 + min_distance: 15 } caption { primary { height: 10 color: 5592405 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -37963,12 +40796,13 @@ cont { name: "cave-s" apply_for_type: 1 priority: 16878 + min_distance: 15 } caption { primary { height: 10 color: 5592405 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -37984,7 +40818,7 @@ cont { primary { height: 10 color: 5592405 - offset_y: 10 + offset_y: 8 } priority: 15878 } @@ -39021,6 +41855,7 @@ cont { symbol { name: "peakt-s" priority: 16878 + min_distance: 10 } apply_if: "name" } @@ -39029,6 +41864,7 @@ cont { symbol { name: "peakt-s" priority: 16878 + min_distance: 10 } apply_if: "name" } @@ -39597,12 +42433,52 @@ cont { } cont { name: "natural-spring" + element { + scale: 12 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 15 + } + } + element { + scale: 13 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "drinking-water-s" + priority: 16878 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "drinking-water-m" - apply_for_type: 1 priority: 16878 + min_distance: 5 } caption { primary { @@ -39618,6 +42494,7 @@ cont { symbol { name: "drinking-water-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -39633,6 +42510,7 @@ cont { symbol { name: "drinking-water-l" priority: 16878 + min_distance: 5 } caption { primary { @@ -39648,6 +42526,7 @@ cont { symbol { name: "drinking-water-l" priority: 16864 + min_distance: 5 } caption { primary { @@ -39663,6 +42542,7 @@ cont { symbol { name: "drinking-water-l" priority: 16864 + min_distance: 5 } caption { primary { @@ -39679,7 +42559,7 @@ cont { element { scale: 18 symbol { - name: "tree-m" + name: "tree-s" apply_for_type: 1 priority: 16837 } @@ -39687,7 +42567,7 @@ cont { element { scale: 19 symbol { - name: "tree-m" + name: "tree-s" apply_for_type: 1 priority: 16837 } @@ -40193,6 +43073,14 @@ cont { } cont { name: "natural-waterfall" + element { + scale: 11 + symbol { + name: "waterfall-s" + priority: 16878 + min_distance: 15 + } + } element { scale: 12 symbol { @@ -40272,6 +43160,7 @@ cont { scale: 17 symbol { name: "waterfall-l" + apply_for_type: 1 priority: 16878 } caption { @@ -46661,7 +49550,7 @@ cont { height: 12 color: 4473924 } - priority: 15648 + priority: 16000 } } element { @@ -46671,7 +49560,7 @@ cont { height: 12 color: 4473924 } - priority: 15648 + priority: 16000 } } } @@ -46690,7 +49579,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46706,7 +49595,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46722,7 +49611,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46738,7 +49627,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46754,7 +49643,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46770,7 +49659,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46786,7 +49675,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46802,7 +49691,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46818,7 +49707,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46834,7 +49723,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46850,7 +49739,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46866,7 +49755,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46882,7 +49771,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46898,7 +49787,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46914,7 +49803,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46930,7 +49819,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } element { @@ -46946,7 +49835,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15662 + priority: 16000 } } } @@ -48653,11 +51542,28 @@ cont { } cont { name: "power-station" + element { + scale: 17 + symbol { + name: "power-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "power-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -48673,6 +51579,7 @@ cont { symbol { name: "power-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -48686,6 +51593,21 @@ cont { } cont { name: "power-tower" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 16851 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -49004,6 +51926,16 @@ cont { } cont { name: "railway-funicular" + element { + scale: 12 + lines { + width: 1.4 + color: 3355443 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49077,6 +52009,16 @@ cont { } cont { name: "railway-funicular-bridge" + element { + scale: 12 + lines { + width: 1.4 + color: 3355443 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49150,6 +52092,16 @@ cont { } cont { name: "railway-funicular-tunnel" + element { + scale: 12 + lines { + width: 1.4 + color: 3355443 + priority: 1635 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -49223,6 +52175,15 @@ cont { } cont { name: "railway-halt" + element { + scale: 11 + symbol { + name: "train-s" + apply_for_type: 1 + priority: 16891 + min_distance: 10 + } + } element { scale: 12 symbol { @@ -51716,9 +54677,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -51734,7 +54696,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -51743,6 +54705,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -51889,7 +54852,8 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -51905,7 +54869,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -51914,6 +54878,7 @@ cont { name: "subway-barcelona-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52058,9 +55023,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-berlin-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52076,7 +55042,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52085,6 +55051,7 @@ cont { name: "subway-berlin-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52229,9 +55196,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52247,7 +55215,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52256,6 +55224,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52400,9 +55369,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52418,7 +55388,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52427,6 +55397,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52571,9 +55542,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52589,7 +55561,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52598,6 +55570,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52742,9 +55715,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52760,7 +55734,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52769,6 +55743,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -52913,9 +55888,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -52931,7 +55907,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -52940,6 +55916,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53084,9 +56061,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53102,7 +56080,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53111,6 +56089,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53258,6 +56237,7 @@ cont { name: "subway-kiev-s" apply_for_type: 1 priority: 16027 + min_distance: 1 } caption { primary { @@ -53282,6 +56262,7 @@ cont { name: "subway-kiev-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53418,9 +56399,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53436,7 +56418,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53445,6 +56427,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53589,9 +56572,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53607,7 +56591,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53616,6 +56600,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53762,7 +56747,8 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53778,7 +56764,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53787,6 +56773,7 @@ cont { name: "subway-london-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -53931,9 +56918,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-madrid-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -53949,7 +56937,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -53958,6 +56946,7 @@ cont { name: "subway-madrid-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54105,6 +57094,7 @@ cont { name: "subway-minsk-s" apply_for_type: 1 priority: 16891 + min_distance: 1 } caption { primary { @@ -54129,6 +57119,7 @@ cont { name: "subway-minsk-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54268,6 +57259,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } } element { @@ -54276,6 +57268,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54300,6 +57293,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54324,6 +57318,7 @@ cont { name: "subway-moscow-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54462,7 +57457,8 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54478,7 +57474,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54487,6 +57483,7 @@ cont { name: "subway-newyork-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54631,9 +57628,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54649,7 +57647,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54658,6 +57656,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54804,7 +57803,8 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54820,7 +57820,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -54829,6 +57829,7 @@ cont { name: "subway-paris-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -54973,9 +57974,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -54991,7 +57993,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55000,6 +58002,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55144,9 +58147,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55162,7 +58166,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55171,6 +58175,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55315,9 +58320,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-rome-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55333,7 +58339,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55342,6 +58348,7 @@ cont { name: "subway-rome-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55483,6 +58490,7 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } } element { @@ -55497,7 +58505,7 @@ cont { height: 10 color: 8947848 stroke_color: 1712394496 - offset_y: 8 + offset_y: 6 } secondary { height: 9 @@ -55515,13 +58523,14 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { height: 11 color: 8947848 stroke_color: 1712394496 - offset_y: 8 + offset_y: 6 } secondary { height: 10 @@ -55539,6 +58548,7 @@ cont { name: "subway-spb-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55675,9 +58685,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55693,7 +58704,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55702,6 +58713,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -55846,9 +58858,10 @@ cont { element { scale: 13 symbol { - name: "train-s" + name: "subway-s" apply_for_type: 1 - priority: 16891 + priority: 16905 + min_distance: 1 } caption { primary { @@ -55864,7 +58877,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15891 + priority: 15905 } } element { @@ -55873,6 +58886,7 @@ cont { name: "subway-s" apply_for_type: 1 priority: 16905 + min_distance: 1 } caption { primary { @@ -56996,6 +60010,26 @@ cont { } cont { name: "railway-tram" + element { + scale: 13 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57049,6 +60083,26 @@ cont { } cont { name: "railway-tram-bridge" + element { + scale: 13 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57102,6 +60156,26 @@ cont { } cont { name: "railway-tram-tunnel" + element { + scale: 13 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.6 + color: 6052945 + priority: 1635 + join: ROUNDJOIN + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -57155,6 +60229,14 @@ cont { } cont { name: "railway-tram_stop" + element { + scale: 14 + symbol { + name: "tram-s" + apply_for_type: 1 + priority: 16891 + } + } element { scale: 15 symbol { @@ -58442,10 +61524,75 @@ cont { cont { name: "shop" element { - scale: 19 + scale: 15 symbol { name: "shop-m" priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58459,12 +61606,94 @@ cont { } cont { name: "shop-alcohol" + element { + scale: 13 + symbol { + name: "alcohol-s" + apply_for_type: 1 + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "alcohol-s" + apply_for_type: 1 + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "alcohol-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "alcohol-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "alcohol-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "alcohol-l" - apply_for_type: 1 priority: 16837 + min_distance: 20 } caption { primary { @@ -58480,6 +61709,7 @@ cont { symbol { name: "alcohol-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -58494,10 +61724,11 @@ cont { cont { name: "shop-bakery" element { - scale: 18 + scale: 15 symbol { - name: "bakery-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58505,14 +61736,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "bakery-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58520,17 +61800,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-beauty" element { - scale: 18 + scale: 15 symbol { - name: "beauty-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58538,14 +61819,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "beauty-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58553,17 +61883,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-beverages" element { - scale: 18 + scale: 15 symbol { - name: "alcohol-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58571,14 +61902,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "alcohol-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58586,17 +61966,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-bicycle" element { - scale: 18 + scale: 15 symbol { - name: "shop-bicycle-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58604,14 +61985,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "shop-bicycle-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58619,17 +62049,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-books" element { - scale: 18 + scale: 15 symbol { - name: "book-shop-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58637,14 +62068,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "book-shop-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58652,17 +62132,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-butcher" element { - scale: 18 + scale: 15 symbol { - name: "butcher-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58670,14 +62151,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "butcher-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58685,17 +62215,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-car" element { - scale: 18 + scale: 15 symbol { - name: "car_sharing-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58703,14 +62234,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "car_sharing-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58718,17 +62298,50 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-car_repair" + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "car-repair-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -58743,7 +62356,8 @@ cont { scale: 18 symbol { name: "car-repair-l" - priority: 16837 + priority: 16851 + min_distance: 10 } caption { primary { @@ -58751,14 +62365,15 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16837 + priority: 16851 + min_distance: 10 } caption { primary { @@ -58766,17 +62381,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-chemist" element { - scale: 18 + scale: 15 symbol { - name: "chemist-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58784,14 +62400,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "chemist-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58799,17 +62464,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-clothes" element { - scale: 18 + scale: 15 symbol { - name: "clothes-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58817,14 +62483,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "clothes-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58832,17 +62547,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-computer" element { - scale: 18 + scale: 15 symbol { - name: "computer-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58850,14 +62566,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "computer-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58865,17 +62630,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-confectionery" element { - scale: 18 + scale: 15 symbol { - name: "sweets-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58883,14 +62649,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "sweets-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58898,17 +62713,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-convenience" element { - scale: 18 + scale: 15 symbol { - name: "convenience-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58916,14 +62732,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "convenience-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58931,17 +62796,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-department_store" element { - scale: 18 + scale: 15 symbol { - name: "department_store-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58949,14 +62815,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "department_store-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58964,17 +62879,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-doityourself" element { - scale: 18 + scale: 15 symbol { - name: "doityourself-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -58982,14 +62898,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "doityourself-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -58997,17 +62962,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-electronics" element { - scale: 18 + scale: 15 symbol { - name: "electronics-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59015,14 +62981,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "electronics-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59030,17 +63045,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-florist" element { - scale: 18 + scale: 15 symbol { - name: "florist-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59048,14 +63064,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "florist-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59063,17 +63128,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-furniture" element { - scale: 18 + scale: 15 symbol { - name: "furniture-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59081,14 +63147,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "furniture-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59096,17 +63211,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-garden_centre" element { - scale: 18 + scale: 15 symbol { - name: "garden_center-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59114,14 +63230,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "garden_center-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59129,17 +63294,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-gift" element { - scale: 18 + scale: 15 symbol { - name: "gift-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59147,14 +63313,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "gift-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59162,17 +63377,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-greengrocer" element { - scale: 18 + scale: 15 symbol { - name: "greengrocer-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59180,14 +63396,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "greengrocer-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59195,17 +63460,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-hairdresser" element { - scale: 18 + scale: 15 symbol { - name: "hairdresser-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59213,14 +63479,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "hairdresser-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59228,17 +63543,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-hardware" element { - scale: 18 + scale: 15 symbol { - name: "hardware-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59246,14 +63562,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "hardware-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59261,17 +63626,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-jewelry" element { - scale: 18 + scale: 15 symbol { - name: "jewelry-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59279,14 +63645,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "jewelry-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59294,17 +63709,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-kiosk" element { - scale: 18 + scale: 15 symbol { - name: "kiosk-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59312,14 +63728,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "kiosk-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59327,18 +63792,50 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-laundry" + element { + scale: 15 + symbol { + name: "laundry-m" + priority: 16972 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15972 + } + } + element { + scale: 16 + symbol { + name: "laundry-m" + priority: 16972 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15972 + } + } element { scale: 17 symbol { name: "laundry-l" - apply_for_type: 1 priority: 16972 + min_distance: 10 } caption { primary { @@ -59354,6 +63851,7 @@ cont { symbol { name: "laundry-l" priority: 16972 + min_distance: 10 } caption { primary { @@ -59369,6 +63867,7 @@ cont { symbol { name: "laundry-l" priority: 16972 + min_distance: 10 } caption { primary { @@ -59382,12 +63881,62 @@ cont { } cont { name: "shop-mall" + element { + scale: 13 + symbol { + name: "shop-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "shop-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16864 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 16 symbol { name: "shop-m" - apply_for_type: 1 priority: 16864 + min_distance: 15 } caption { primary { @@ -59402,8 +63951,8 @@ cont { scale: 17 symbol { name: "shop-l" - apply_for_type: 1 priority: 16864 + min_distance: 10 } caption { primary { @@ -59418,8 +63967,8 @@ cont { scale: 18 symbol { name: "shop-l" - apply_for_type: 1 priority: 16864 + min_distance: 10 } caption { primary { @@ -59435,6 +63984,7 @@ cont { symbol { name: "shop-l" priority: 16864 + min_distance: 10 } caption { primary { @@ -59449,10 +63999,11 @@ cont { cont { name: "shop-mobile_phone" element { - scale: 18 + scale: 15 symbol { - name: "mobile_phone-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59460,14 +64011,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "mobile_phone-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59475,17 +64075,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-optician" element { - scale: 18 + scale: 15 symbol { - name: "optician-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59493,14 +64094,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "optician-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59508,17 +64158,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-shoes" element { - scale: 18 + scale: 15 symbol { - name: "shoes-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59526,14 +64177,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "shoes-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59541,17 +64241,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-sports" element { - scale: 18 + scale: 15 symbol { - name: "sports-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59559,14 +64260,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "sports-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59574,18 +64324,84 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } cont { name: "shop-supermarket" + element { + scale: 13 + symbol { + name: "grocery-s" + apply_for_type: 1 + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "grocery-s" + apply_for_type: 1 + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "grocery-m" + priority: 16851 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "grocery-m" + priority: 16851 + min_distance: 15 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "grocery-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -59600,8 +64416,8 @@ cont { scale: 18 symbol { name: "grocery-l" - apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -59617,6 +64433,7 @@ cont { symbol { name: "grocery-l" priority: 16851 + min_distance: 10 } caption { primary { @@ -59631,10 +64448,11 @@ cont { cont { name: "shop-toys" element { - scale: 18 + scale: 15 symbol { - name: "toys-l" - priority: 16837 + name: "shop-m" + priority: 16851 + min_distance: 20 } caption { primary { @@ -59642,14 +64460,63 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16851 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15851 } } element { scale: 19 symbol { - name: "toys-l" - priority: 16837 + name: "shop-l" + priority: 16851 + min_distance: 10 } caption { primary { @@ -59657,7 +64524,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15837 + priority: 15851 } } } @@ -59698,11 +64565,92 @@ cont { } cont { name: "sport-archery" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59718,6 +64666,7 @@ cont { symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59766,11 +64715,92 @@ cont { } cont { name: "sport-australian_football" + element { + scale: 13 + symbol { + name: "australian-football-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "australian-football-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "australian-football-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "australian-football-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "australian-football-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "australian-football-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59786,6 +64816,7 @@ cont { symbol { name: "australian-football-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59869,11 +64900,92 @@ cont { } cont { name: "sport-bowls" + element { + scale: 13 + symbol { + name: "bowls-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "bowls-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "bowls-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "bowls-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "bowls-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "bowls-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59889,6 +65001,7 @@ cont { symbol { name: "bowls-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59902,11 +65015,92 @@ cont { } cont { name: "sport-cricket" + element { + scale: 13 + symbol { + name: "cricket-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "cricket-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "cricket-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "cricket-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "cricket-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "cricket-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59922,6 +65116,7 @@ cont { symbol { name: "cricket-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59935,11 +65130,92 @@ cont { } cont { name: "sport-curling" + element { + scale: 13 + symbol { + name: "curling-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "curling-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "curling-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "curling-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "curling-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "curling-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59955,6 +65231,7 @@ cont { symbol { name: "curling-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59968,11 +65245,92 @@ cont { } cont { name: "sport-diving" + element { + scale: 13 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "diving-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -59988,6 +65346,7 @@ cont { symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60001,11 +65360,44 @@ cont { } cont { name: "sport-equestrian" + element { + scale: 16 + symbol { + name: "equestrian-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "equestrian-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "equestrian-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60021,6 +65413,7 @@ cont { symbol { name: "equestrian-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60034,11 +65427,76 @@ cont { } cont { name: "sport-football" + element { + scale: 13 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 16 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 17 symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60054,6 +65512,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60069,6 +65528,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60152,6 +65612,74 @@ cont { } cont { name: "sport-multi" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 17 area { @@ -60162,6 +65690,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60182,6 +65711,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60202,6 +65732,7 @@ cont { name: "pitch-l" apply_for_type: 1 priority: 16067 + min_distance: 10 } caption { primary { @@ -60215,11 +65746,92 @@ cont { } cont { name: "sport-scuba_diving" + element { + scale: 13 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "diving-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "diving-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "diving-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60235,6 +65847,7 @@ cont { symbol { name: "diving-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60248,11 +65861,92 @@ cont { } cont { name: "sport-shooting" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16837 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16837 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16837 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60268,6 +65962,7 @@ cont { symbol { name: "archery-l" priority: 16837 + min_distance: 10 } caption { primary { @@ -60281,6 +65976,54 @@ cont { } cont { name: "sport-soccer" + element { + scale: 13 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 14 + symbol { + name: "soccer-s" + priority: 16067 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } + element { + scale: 15 + symbol { + name: "soccer-m" + priority: 16067 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15067 + } + } element { scale: 16 area { @@ -60289,8 +66032,8 @@ cont { } symbol { name: "soccer-m" - apply_for_type: 1 priority: 16067 + min_distance: 40 } caption { primary { @@ -60310,6 +66053,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60329,6 +66073,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60348,6 +66093,7 @@ cont { symbol { name: "soccer-l" priority: 16067 + min_distance: 10 } caption { primary { @@ -60396,12 +66142,81 @@ cont { } cont { name: "sport-tennis" + element { + scale: 13 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "tennis-s" + apply_for_type: 1 + priority: 16851 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "tennis-m" + apply_for_type: 1 + priority: 16851 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60418,6 +66233,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60434,6 +66250,7 @@ cont { name: "tennis-l" apply_for_type: 1 priority: 16851 + min_distance: 10 } caption { primary { @@ -60447,11 +66264,76 @@ cont { } cont { name: "tourism-alpine_hut" + element { + scale: 14 + symbol { + name: "alpine_hut-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "alpine_hut-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "alpine_hut-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "alpine_hut-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "alpine_hut-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60467,6 +66349,7 @@ cont { symbol { name: "alpine_hut-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60480,6 +66363,40 @@ cont { } cont { name: "tourism-artwork" + element { + scale: 15 + symbol { + name: "tourism-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "tourism-m" + apply_for_type: 1 + priority: 16864 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60532,11 +66449,11 @@ cont { cont { name: "tourism-attraction" element { - scale: 15 + scale: 13 symbol { - name: "tourism-m" - apply_for_type: 1 - priority: 16851 + name: "tourism-s" + priority: 16864 + min_distance: 20 } caption { primary { @@ -60544,7 +66461,39 @@ cont { color: 5592405 offset_y: 10 } - priority: 15851 + priority: 15864 + } + } + element { + scale: 14 + symbol { + name: "tourism-s" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "tourism-m" + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 } } element { @@ -60552,6 +66501,7 @@ cont { symbol { name: "tourism-m" priority: 16864 + min_distance: 20 } caption { primary { @@ -60567,6 +66517,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60582,6 +66533,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60597,6 +66549,7 @@ cont { symbol { name: "tourism-l" priority: 16864 + min_distance: 20 } caption { primary { @@ -60610,11 +66563,38 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 13 + symbol { + name: "campsite-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } + element { + scale: 14 + symbol { + name: "campsite-s" + apply_for_type: 1 + priority: 16878 + min_distance: 12 + } + } element { scale: 15 symbol { name: "campsite-m" priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 12 + } + priority: 15878 } } element { @@ -60680,11 +66660,44 @@ cont { } cont { name: "tourism-caravan_site" + element { + scale: 16 + symbol { + name: "caravan_site-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "caravan_site-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "caravan_site-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60700,6 +66713,7 @@ cont { symbol { name: "caravan_site-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60713,11 +66727,76 @@ cont { } cont { name: "tourism-guest_house" + element { + scale: 14 + symbol { + name: "motel-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "motel-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60733,6 +66812,7 @@ cont { symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -60746,6 +66826,57 @@ cont { } cont { name: "tourism-hostel" + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60797,6 +66928,57 @@ cont { } cont { name: "tourism-hotel" + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16864 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15864 + } + } element { scale: 17 symbol { @@ -60848,6 +67030,91 @@ cont { } cont { name: "tourism-information" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60899,6 +67166,91 @@ cont { } cont { name: "tourism-information-guidepost" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60950,6 +67302,91 @@ cont { } cont { name: "tourism-information-office" + element { + scale: 12 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "information-s" + apply_for_type: 1 + priority: 16851 + min_distance: 30 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "information-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { @@ -60999,11 +67436,76 @@ cont { } cont { name: "tourism-motel" + element { + scale: 14 + symbol { + name: "motel-s" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 15 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "motel-m" + priority: 16837 + min_distance: 30 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "motel-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61019,6 +67521,7 @@ cont { symbol { name: "motel-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61032,12 +67535,60 @@ cont { } cont { name: "tourism-museum" + element { + scale: 12 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "museum-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "museum-m" priority: 16878 - min_distance: 1 + min_distance: 5 } caption { primary { @@ -61112,18 +67663,35 @@ cont { cont { name: "tourism-picnic_site" element { - scale: 17 + scale: 16 symbol { - name: "picnic-l" - priority: 16851 + name: "picnic-m" + priority: 16837 + min_distance: 30 } caption { primary { - height: 10 + height: 11 color: 5592405 offset_y: 10 } - priority: 15851 + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "picnic-l" + priority: 16837 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15837 } } element { @@ -61131,6 +67699,7 @@ cont { symbol { name: "picnic-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61146,6 +67715,7 @@ cont { symbol { name: "picnic-l" priority: 16837 + min_distance: 20 } caption { primary { @@ -61159,10 +67729,95 @@ cont { } cont { name: "tourism-viewpoint" + element { + scale: 12 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 13 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 14 + symbol { + name: "viewpoint-s" + apply_for_type: 1 + priority: 16851 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15851 + } + } + element { + scale: 15 + symbol { + name: "viewpoint-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } + element { + scale: 16 + symbol { + name: "viewpoint-m" + apply_for_type: 1 + priority: 16851 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15851 + } + } element { scale: 17 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61178,7 +67833,7 @@ cont { element { scale: 18 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61194,7 +67849,7 @@ cont { element { scale: 19 symbol { - name: "tourism-l" + name: "viewpoint-l" apply_for_type: 1 priority: 16851 } @@ -61210,11 +67865,60 @@ cont { } cont { name: "tourism-zoo" + element { + scale: 12 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 13 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "zoo-s" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 6 + } + priority: 15878 + } + } element { scale: 15 symbol { name: "zoo-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -61230,6 +67934,7 @@ cont { symbol { name: "zoo-m" priority: 16878 + min_distance: 5 } caption { primary { @@ -63014,6 +69719,14 @@ cont { } cont { name: "waterway-waterfall" + element { + scale: 11 + symbol { + name: "waterfall-s" + priority: 16878 + min_distance: 15 + } + } element { scale: 12 symbol { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 20be1c82df..2968079dd0 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 62b994ee03..345a1a0b49 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -1,466 +1,480 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index d554ab2a56..fdc8fd6924 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 9b427e755a..82b8d067f4 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -8,457 +8,471 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_legacy/symbols.png b/data/resources-6plus_legacy/symbols.png index e864ccc67c..2f8269917b 100644 Binary files a/data/resources-6plus_legacy/symbols.png and b/data/resources-6plus_legacy/symbols.png differ diff --git a/data/resources-6plus_legacy/symbols.sdf b/data/resources-6plus_legacy/symbols.sdf index 463e38b79a..7967b056bf 100644 --- a/data/resources-6plus_legacy/symbols.sdf +++ b/data/resources-6plus_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index c589be33cf..2e6a43408a 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 71deb23cff..722de264c3 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,466 +1,480 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 540d28124c..ead697f262 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 619f130e64..cd4fbedbc9 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -8,457 +8,471 @@ - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_legacy/symbols.png b/data/resources-hdpi_legacy/symbols.png index 91b1088d18..10f28bb4f2 100644 Binary files a/data/resources-hdpi_legacy/symbols.png and b/data/resources-hdpi_legacy/symbols.png differ diff --git a/data/resources-hdpi_legacy/symbols.sdf b/data/resources-hdpi_legacy/symbols.sdf index 6c8ad91da7..3a78d6694b 100644 --- a/data/resources-hdpi_legacy/symbols.sdf +++ b/data/resources-hdpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png index c9743d94b4..d25ff96511 100644 Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf index a296d0f4b5..9b14b78686 100644 --- a/data/resources-ldpi_clear/symbols.sdf +++ b/data/resources-ldpi_clear/symbols.sdf @@ -1,466 +1,480 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png index 58105d9098..371f044da5 100644 Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf index d344f2892f..1fcafdc497 100644 --- a/data/resources-ldpi_dark/symbols.sdf +++ b/data/resources-ldpi_dark/symbols.sdf @@ -1,464 +1,478 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_legacy/symbols.png b/data/resources-ldpi_legacy/symbols.png index d23e55b059..236905636b 100644 Binary files a/data/resources-ldpi_legacy/symbols.png and b/data/resources-ldpi_legacy/symbols.png differ diff --git a/data/resources-ldpi_legacy/symbols.sdf b/data/resources-ldpi_legacy/symbols.sdf index cba2893fd8..a26f5135d5 100644 --- a/data/resources-ldpi_legacy/symbols.sdf +++ b/data/resources-ldpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 9a1e67ad1b..b17a62aa0c 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 9dd8fd5b63..3540e373bf 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,469 +1,483 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 57df07d9a5..8ab2f2dde4 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 05abd386c6..eeb21d3a93 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -20,448 +20,462 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_legacy/symbols.png b/data/resources-mdpi_legacy/symbols.png index 2c678d5c5a..ef4711bf74 100644 Binary files a/data/resources-mdpi_legacy/symbols.png and b/data/resources-mdpi_legacy/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 27ad9b9ed0..fbf083c948 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index ad83f41aee..39a51aa58f 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -21,449 +21,463 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 44805202d8..f19cd9b41f 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 257dc017c8..42e6d93aff 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -1,467 +1,481 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_legacy/symbols.png b/data/resources-xhdpi_legacy/symbols.png index 692ec388c5..56b2f16684 100644 Binary files a/data/resources-xhdpi_legacy/symbols.png and b/data/resources-xhdpi_legacy/symbols.png differ diff --git a/data/resources-xhdpi_legacy/symbols.sdf b/data/resources-xhdpi_legacy/symbols.sdf index fa66ddc9c5..e303764fa1 100644 --- a/data/resources-xhdpi_legacy/symbols.sdf +++ b/data/resources-xhdpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index fa30a2cb57..80d2a4e8ed 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 4cd454631a..670a40eb26 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -21,449 +21,463 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index b76cbc74cd..25f48e1163 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index cb12017968..f0e57cbb3c 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -20,448 +20,462 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_legacy/symbols.png b/data/resources-xxhdpi_legacy/symbols.png index 368eed2cca..7f25684bd1 100644 Binary files a/data/resources-xxhdpi_legacy/symbols.png and b/data/resources-xxhdpi_legacy/symbols.png differ diff --git a/data/resources-xxhdpi_legacy/symbols.sdf b/data/resources-xxhdpi_legacy/symbols.sdf index c4da6c5053..1a064a9313 100644 --- a/data/resources-xxhdpi_legacy/symbols.sdf +++ b/data/resources-xxhdpi_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-yota_legacy/symbols.png b/data/resources-yota_legacy/symbols.png index 4e46db39aa..e0581e6c02 100644 Binary files a/data/resources-yota_legacy/symbols.png and b/data/resources-yota_legacy/symbols.png differ diff --git a/data/resources-yota_legacy/symbols.sdf b/data/resources-yota_legacy/symbols.sdf index 14ae67f309..ac31337562 100644 --- a/data/resources-yota_legacy/symbols.sdf +++ b/data/resources-yota_legacy/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg b/data/styles/clear/style-clear/symbols/alpine_hut-s.svg new file mode 100644 index 0000000000..16d14a9f2f --- /dev/null +++ b/data/styles/clear/style-clear/symbols/alpine_hut-s.svg @@ -0,0 +1,12 @@ + + + + alpine_hut-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/archery-s.svg b/data/styles/clear/style-clear/symbols/archery-s.svg new file mode 100644 index 0000000000..38b3be0705 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/archery-s.svg @@ -0,0 +1,12 @@ + + + + archery-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/australian-football-s.svg b/data/styles/clear/style-clear/symbols/australian-football-s.svg new file mode 100644 index 0000000000..362834fbb0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/australian-football-s.svg @@ -0,0 +1,12 @@ + + + + australian-football-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/beach-s.svg b/data/styles/clear/style-clear/symbols/beach-s.svg new file mode 100644 index 0000000000..241a1c6263 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/beach-s.svg @@ -0,0 +1,12 @@ + + + + beach-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bowls-s.svg b/data/styles/clear/style-clear/symbols/bowls-s.svg new file mode 100644 index 0000000000..3aba114242 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bowls-s.svg @@ -0,0 +1,12 @@ + + + + bowls-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/cricket-s.svg b/data/styles/clear/style-clear/symbols/cricket-s.svg new file mode 100644 index 0000000000..985ce3bb1e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cricket-s.svg @@ -0,0 +1,12 @@ + + + + cricket-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/curling-s.svg b/data/styles/clear/style-clear/symbols/curling-s.svg new file mode 100644 index 0000000000..c2a7fc80ab --- /dev/null +++ b/data/styles/clear/style-clear/symbols/curling-s.svg @@ -0,0 +1,12 @@ + + + + curling-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/diving-s.svg b/data/styles/clear/style-clear/symbols/diving-s.svg new file mode 100644 index 0000000000..9f3ab1d58b --- /dev/null +++ b/data/styles/clear/style-clear/symbols/diving-s.svg @@ -0,0 +1,12 @@ + + + + diving-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/marketplace-s.svg b/data/styles/clear/style-clear/symbols/marketplace-s.svg new file mode 100644 index 0000000000..0f2e888ad7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/marketplace-s.svg @@ -0,0 +1,12 @@ + + + + marketplace-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/motel-s.svg b/data/styles/clear/style-clear/symbols/motel-s.svg new file mode 100644 index 0000000000..1f585f36fc --- /dev/null +++ b/data/styles/clear/style-clear/symbols/motel-s.svg @@ -0,0 +1,12 @@ + + + + motel-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/toll_booth-s.svg b/data/styles/clear/style-clear/symbols/toll_booth-s.svg new file mode 100644 index 0000000000..d7fc3a43e0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toll_booth-s.svg @@ -0,0 +1,12 @@ + + + + toll_booth-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/viewpoint-l.svg b/data/styles/clear/style-clear/symbols/viewpoint-l.svg new file mode 100644 index 0000000000..e550b8ee17 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/viewpoint-l.svg @@ -0,0 +1,12 @@ + + + + viewpoint-l + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/viewpoint-m.svg b/data/styles/clear/style-clear/symbols/viewpoint-m.svg new file mode 100644 index 0000000000..a5b45e83d7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/viewpoint-m.svg @@ -0,0 +1,12 @@ + + + + viewpoint-m + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/viewpoint-s.svg b/data/styles/clear/style-clear/symbols/viewpoint-s.svg new file mode 100644 index 0000000000..c23f5c8369 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/viewpoint-s.svg @@ -0,0 +1,12 @@ + + + + viewpoint-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/alpine_hut-s.svg b/data/styles/clear/style-night/symbols/alpine_hut-s.svg new file mode 100644 index 0000000000..43668de987 --- /dev/null +++ b/data/styles/clear/style-night/symbols/alpine_hut-s.svg @@ -0,0 +1,17 @@ + + + + alpine_hut-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/archery-s.svg b/data/styles/clear/style-night/symbols/archery-s.svg new file mode 100644 index 0000000000..689a537b2b --- /dev/null +++ b/data/styles/clear/style-night/symbols/archery-s.svg @@ -0,0 +1,17 @@ + + + + archery-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/australian-football-s.svg b/data/styles/clear/style-night/symbols/australian-football-s.svg new file mode 100644 index 0000000000..ed33a37b11 --- /dev/null +++ b/data/styles/clear/style-night/symbols/australian-football-s.svg @@ -0,0 +1,17 @@ + + + + australian-football-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/beach-s.svg b/data/styles/clear/style-night/symbols/beach-s.svg new file mode 100644 index 0000000000..ec0f537908 --- /dev/null +++ b/data/styles/clear/style-night/symbols/beach-s.svg @@ -0,0 +1,24 @@ + + + + beach-s + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/bowls-s.svg b/data/styles/clear/style-night/symbols/bowls-s.svg new file mode 100644 index 0000000000..d2a4f6b720 --- /dev/null +++ b/data/styles/clear/style-night/symbols/bowls-s.svg @@ -0,0 +1,17 @@ + + + + bowls-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cricket-s.svg b/data/styles/clear/style-night/symbols/cricket-s.svg new file mode 100644 index 0000000000..c03fdf2e1c --- /dev/null +++ b/data/styles/clear/style-night/symbols/cricket-s.svg @@ -0,0 +1,17 @@ + + + + cricket-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/curling-s.svg b/data/styles/clear/style-night/symbols/curling-s.svg new file mode 100644 index 0000000000..8b7a829fa5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/curling-s.svg @@ -0,0 +1,17 @@ + + + + curling-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/diving-s.svg b/data/styles/clear/style-night/symbols/diving-s.svg new file mode 100644 index 0000000000..c4ddac45e8 --- /dev/null +++ b/data/styles/clear/style-night/symbols/diving-s.svg @@ -0,0 +1,17 @@ + + + + diving-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/marketplace-s.svg b/data/styles/clear/style-night/symbols/marketplace-s.svg new file mode 100644 index 0000000000..0abbc91743 --- /dev/null +++ b/data/styles/clear/style-night/symbols/marketplace-s.svg @@ -0,0 +1,17 @@ + + + + marketplace-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/motel-s.svg b/data/styles/clear/style-night/symbols/motel-s.svg new file mode 100644 index 0000000000..4f6f4189d3 --- /dev/null +++ b/data/styles/clear/style-night/symbols/motel-s.svg @@ -0,0 +1,17 @@ + + + + motel-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/toll_booth-s.svg b/data/styles/clear/style-night/symbols/toll_booth-s.svg new file mode 100644 index 0000000000..e71ceb2a26 --- /dev/null +++ b/data/styles/clear/style-night/symbols/toll_booth-s.svg @@ -0,0 +1,17 @@ + + + + toll_booth-s + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/viewpoint-l.svg b/data/styles/clear/style-night/symbols/viewpoint-l.svg new file mode 100644 index 0000000000..abafc8b281 --- /dev/null +++ b/data/styles/clear/style-night/symbols/viewpoint-l.svg @@ -0,0 +1,12 @@ + + + + viewpoint-l + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/clear/style-night/symbols/viewpoint-m.svg new file mode 100644 index 0000000000..b7c942f3da --- /dev/null +++ b/data/styles/clear/style-night/symbols/viewpoint-m.svg @@ -0,0 +1,12 @@ + + + + viewpoint-m + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/clear/style-night/symbols/viewpoint-s.svg new file mode 100644 index 0000000000..1185df73ea --- /dev/null +++ b/data/styles/clear/style-night/symbols/viewpoint-s.svg @@ -0,0 +1,12 @@ + + + + viewpoint-s + Created with Sketch. + + + + + + + \ No newline at end of file