From 4b443889da705f3e4d27d4fdb5dc9ca1049e51b6 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 19 Sep 2021 14:46:27 +0300 Subject: [PATCH] [styles] Regenerated styles. Signed-off-by: Viktor Govako --- data/classificator.txt | 7 +- data/drules_proto.bin | Bin 207966 -> 208939 bytes data/drules_proto.txt | 345 ++++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 208708 -> 209681 bytes data/drules_proto_clear.txt | 345 ++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 207498 -> 208469 bytes data/drules_proto_dark.txt | 345 ++++++++++++++++++++++++++++ data/drules_proto_vehicle_clear.bin | Bin 129615 -> 130263 bytes data/drules_proto_vehicle_clear.txt | 216 +++++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 129399 -> 130047 bytes data/drules_proto_vehicle_dark.txt | 216 +++++++++++++++++ data/types.txt | 8 +- data/visibility.txt | 7 +- 13 files changed, 1483 insertions(+), 6 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 875354fc38..5c9af09104 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -48,6 +48,7 @@ world + drinking_water - driving_school - embassy - + events_venue - fast_food - ferry_terminal - fire_station - @@ -63,6 +64,7 @@ world + internet_cafe - kindergarten - library - + loading_dock - marketplace - motorcycle_parking - nightclub - @@ -582,7 +584,10 @@ world + natural + bare_rock - bay - - beach - + beach + + gravel - + sand - + {} cape - cave_entrance - cliff - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 454a3d1eeef933c7d29531629959822351559bfc..5105450b8bc9738448b46694178c998f59f339b9 100644 GIT binary patch delta 323 zcmcb2gJ<;vo(+L|T0vYQiMgqHnI)CFsb#5oCB^YTvNTmlh(l0|kBgIoOW;VyL?#VJ ziTl$h{$>&uyI%p65=N7%*c_ne#4VnUFe@iNF(orEJw7ErIeRjHtFDGRhp>_$7Z=cm zqQt!9RNZ0$Mu|1GS^`|$P%9J|ftDO8ZJubkeWE4f>M*87tlRA-FrH;(w3^;HlTnnD zmy07ku_z@qZ@R%;Mp@<<4&mvBa~OrETTEnBn;tilQHj|KA|%R=q)=vi#w12lHJKAk zTq1diC8b4)Il4)yiOCtd=|zcUsX0O-99+{kY-beR-n^Yric#tq6PFOGy5hvV6u7E( LpemqBrrRX|ps8eU delta 60 zcmV-C0K@;Q;0)f_46soyv!yOU3xiWSw^KR+s#XH31h@Z?0nGscT$fOr0Tq`XlL1G! Sp_2hMCWmUg0k>+r0>N|d`WONL diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 0092266002..8aa13867e6 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -3875,6 +3875,42 @@ cont { } } } +cont { + name: "amenity-events_venue" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } +} cont { name: "amenity-fast_food" element { @@ -4881,6 +4917,43 @@ cont { } } } +cont { + name: "amenity-loading_dock" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + priority: 15044 + } + } + element { + scale: 19 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 4473924 + offset_x: 1 + offset_y: 1 + } + priority: 15044 + } + } +} cont { name: "amenity-marketplace" element { @@ -34275,6 +34348,26 @@ cont { } apply_if: "name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } element { scale: 19 area { @@ -34304,6 +34397,26 @@ cont { } apply_if: "name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } } cont { name: "leisure-golf_course" @@ -37612,6 +37725,238 @@ cont { } } } +cont { + name: "natural-beach-gravel" + element { + scale: 10 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} +cont { + name: "natural-beach-sand" + element { + scale: 10 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} cont { name: "natural-cape" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 2e1d5d5d7940c587f434e2b172576c6198afeeb7..aa38212af88fd04feeb0445f43fad44dec1288ed 100644 GIT binary patch delta 301 zcmX?dk7wdDo(+L|!9iRiiMgqHnI)CFsb#5oCB^YTvNTmlh(l0|kBgIoOW;VyL?#VJ ziTf2mF(E8s!sud~1N6ReiDx4W&dEy>5U5+#o0O16N^$( z^QJpaXOx|Ow4X7SNyut?{B%?qne9pw80FO@PB3wafjEPGKRk}DaFQpwQ2~@yjRs{e~4P4Fu delta 53 zcmV-50LuT7<_yH%46soyv!yQe3WEnaw+A`_uv7x71h=`40nGuI!jJ)7w_A|`A0~$m Lx&gNix&i}vTDcUV diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index a1f08df478..31c75ad88e 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -3875,6 +3875,42 @@ cont { } } } +cont { + name: "amenity-events_venue" + element { + scale: 17 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15455 + } + } +} cont { name: "amenity-fast_food" element { @@ -4847,6 +4883,43 @@ cont { } } } +cont { + name: "amenity-loading_dock" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + priority: 15044 + } + } + element { + scale: 19 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 4473924 + offset_x: 1 + offset_y: 1 + } + priority: 15044 + } + } +} cont { name: "amenity-marketplace" element { @@ -34067,6 +34140,26 @@ cont { } apply_if: "name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } element { scale: 19 area { @@ -34096,6 +34189,26 @@ cont { } apply_if: "name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } } cont { name: "leisure-golf_course" @@ -37396,6 +37509,238 @@ cont { } } } +cont { + name: "natural-beach-gravel" + element { + scale: 10 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} +cont { + name: "natural-beach-sand" + element { + scale: 10 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 16575614 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 16575614 + priority: -15538 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} cont { name: "natural-cape" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 394bbba1936a967ad0f7173b42cc8a1f073e80c8..c3b282292baf2a805e60cdacb4e8570c67f7c135 100644 GIT binary patch delta 290 zcmeCW%5(J&&xSxfu^=vy#N5=p%#upo)UwpPlHzzESvs9@GNZ88{R$x=4k0Z*E=~?E zfvc;oGHEbMfW?H-#Wn}%J>e41Mwpe8pO})FmmZ&zpPW6JwMAD$okLhjkc$gwLs4R0 za;k2z0Heg3S}g%CZm8J`j6l+zg7<46soyv!yQM3WN1IxAi#z>s11v1h?Xk0mK29;gJDcw|J5P6D5Zq Lx&gNzx&k(IsUa6L diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index ed2bc8f9c4..3e9d24d356 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -3875,6 +3875,42 @@ cont { } } } +cont { + name: "amenity-events_venue" + element { + scale: 17 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 18 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15455 + } + } + element { + scale: 19 + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15455 + } + } +} cont { name: "amenity-fast_food" element { @@ -4847,6 +4883,43 @@ cont { } } } +cont { + name: "amenity-loading_dock" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 5592405 + offset_x: 1 + text: "ref" + } + priority: 15044 + } + } + element { + scale: 19 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16044 + } + caption { + primary { + height: 10 + color: 5592405 + offset_x: 1 + offset_y: 1 + } + priority: 15044 + } + } +} cont { name: "amenity-marketplace" element { @@ -34218,6 +34291,26 @@ cont { } apply_if: "name" } + element { + scale: 18 + area { + color: 1317888 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } element { scale: 19 area { @@ -34247,6 +34340,26 @@ cont { } apply_if: "name" } + element { + scale: 19 + area { + color: 1317888 + priority: -15963 + } + symbol { + name: "garden-m" + priority: 16037 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15037 + } + apply_if: "!name" + } } cont { name: "leisure-golf_course" @@ -37513,6 +37626,238 @@ cont { } } } +cont { + name: "natural-beach-gravel" + element { + scale: 10 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} +cont { + name: "natural-beach-sand" + element { + scale: 10 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 11 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 12 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 13 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 14 + area { + color: 2631706 + priority: -15538 + } + } + element { + scale: 15 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + } + priority: 15462 + } + } + element { + scale: 16 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 17 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 18 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } + element { + scale: 19 + area { + color: 2631706 + priority: -15538 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15462 + } + } +} cont { name: "natural-cape" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index c1909d4a6a30084b6274493d99317144aaa90cbd..f3338819be8b4106117bf2b614c23ee0a6aa4199 100644 GIT binary patch delta 102 zcmX^Ah5h#6HC6<&HCFbZRr6wk4=%yDXmZjzhiE?mFX8bBP>Fb8+ gQe2GE)9bkyJ){mWaS5TSE>6r#L07vSsP@8p0E@^Zf&c&j delta 17 Zcmccqll}Y`_J%Et$GNuq^D=h42LMrZ2r~cx diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 5b39791eb8..4eeb55a070 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -22700,6 +22700,222 @@ cont { } } } +cont { + name: "natural-beach-gravel" + element { + scale: 10 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 11 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 12 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 13 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 14 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 15 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 16 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 17 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 18 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 19 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } +} +cont { + name: "natural-beach-sand" + element { + scale: 10 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 11 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 12 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 13 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 14 + area { + color: 2801593470 + priority: -15989 + } + } + element { + scale: 15 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 16 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 17 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 18 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } + element { + scale: 19 + area { + color: 2801593470 + priority: -15989 + } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 15011 + } + } +} cont { name: "natural-cape" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index d4d7e6512a29ba2c26d8385c5cb0ef2dad56271a..3187dfbfa9b4c134ac5ea3416bf35403d3b0be57 100644 GIT binary patch delta 71 zcmezViT(d~_J%EtXZR!zF>#6HC6<&HCFbZRr6wk4=%yDXmZj!wpU=yv%P4k$iAxAo Nx;QZ}1tfXnH30MG8&d!P delta 17 ZcmezWo&EbK_J%EtXZW^<2r{mI1prpT2(JJD diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index b0ef41ddae..a2a754a8f8 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -23090,6 +23090,222 @@ cont { } } } +cont { + name: "natural-beach-gravel" + element { + scale: 10 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 11 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 12 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 13 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 14 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 15 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 16 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 17 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 18 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 19 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } +} +cont { + name: "natural-beach-sand" + element { + scale: 10 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 11 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 12 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 13 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 14 + area { + color: 2787649562 + priority: -15989 + } + } + element { + scale: 15 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 16 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 17 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 18 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } + element { + scale: 19 + area { + color: 2787649562 + priority: -15989 + } + caption { + primary { + height: 10 + color: 6710886 + } + priority: 15011 + } + } +} cont { name: "natural-cape" element { diff --git a/data/types.txt b/data/types.txt index eaa16c9469..bf60fad94d 100644 --- a/data/types.txt +++ b/data/types.txt @@ -185,7 +185,7 @@ landuse|forest|coniferous *amenity|hunting_stand *boundary|administrative|9 *amenity|fountain -mapswithme +*natural|beach|sand *amenity|bar *landuse|garages *boundary|administrative|2 @@ -193,7 +193,7 @@ mapswithme *highway|track|bridge *highway|path|bridge *piste:type|nordic -mapswithme +*natural|beach|gravel *railway|crossing *boundary|national_park landuse|forest|deciduous @@ -378,9 +378,9 @@ mapswithme *highway|bridleway|bridge highway|service|driveway mapswithme -mapswithme +*amenity|events_venue *railway|narrow_gauge|tunnel -mapswithme +*amenity|loading_dock *waterway|dock mapswithme highway|service|driveway diff --git a/data/visibility.txt b/data/visibility.txt index 2b33060fcf..c3cff18f9f 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -48,6 +48,7 @@ world 00000000000000000000 + drinking_water 00000000000000000000 - driving_school 00000000000000000000 - embassy 00000000000000000000 - + events_venue 00000000000000000000 - fast_food 00000000000000000111 - ferry_terminal 00000000000000000000 - fire_station 00000000000000000000 - @@ -63,6 +64,7 @@ world 00000000000000000000 + internet_cafe 00000000000000000000 - kindergarten 00000000000000000000 - library 00000000000000000000 - + loading_dock 00000000000000000000 - marketplace 00000000000000000000 - motorcycle_parking 00000000000000000000 - nightclub 00000000000000000000 - @@ -582,7 +584,10 @@ world 00000000000000000000 + natural 00000000000000000000 + bare_rock 00000000000000000000 - bay 00000000000000111111 - - beach 00000000001111111111 - + beach 00000000001111111111 + + gravel 00000000001111111111 - + sand 00000000001111111111 - + {} cape 00000000000000111111 - cave_entrance 00000000000000000000 - cliff 00000000000000000000 -