diff --git a/data/classificator.txt b/data/classificator.txt index f35facf8a7..f38402066e 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -755,7 +755,9 @@ world + peak - rock - saddle - + scree - scrub - + shingle - spring - strait - tree_row - diff --git a/data/colors.txt b/data/colors.txt index 0f81ce0dc7..552a00367d 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -59,6 +59,7 @@ 2236962 2301728 2302755 +2367520 2374579 2399474 2496790 @@ -232,6 +233,7 @@ 13224123 13229526 13407549 +13420474 13484259 13538264 13615592 @@ -241,6 +243,7 @@ 13942770 13947850 14209512 +14275263 14802147 14934482 14951168 @@ -256,7 +259,6 @@ 15214341 15260347 15263452 -15590876 15591638 15592411 15592899 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 46c39bc38a..f4666ea5e6 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 d61df1f584..1f42c2cde8 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -57220,21 +57220,21 @@ cont { element { scale: 12 area { - color: 15590876 + color: 14275263 priority: -1920 } } element { scale: 13 area { - color: 15590876 + color: 14275263 priority: -1920 } } element { scale: 14 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57249,7 +57249,7 @@ cont { element { scale: 15 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57264,7 +57264,7 @@ cont { element { scale: 16 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57279,7 +57279,7 @@ cont { element { scale: 17 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57294,7 +57294,7 @@ cont { element { scale: 18 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57309,7 +57309,7 @@ cont { element { scale: 19 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57324,7 +57324,7 @@ cont { element { scale: 20 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -59757,8 +59757,95 @@ cont { } } } +cont { + name: "natural-scree" + element { + scale: 11 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-scrub" + element { + scale: 10 + area { + color: 13620648 + priority: -1870 + } + } + element { + scale: 11 + area { + color: 13620648 + priority: -1870 + } + } element { scale: 12 area { @@ -59823,6 +59910,72 @@ cont { } } } +cont { + name: "natural-shingle" + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-spring" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index d6921240ca..99f7538ca0 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 7b3146f436..b97009e19e 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -54499,21 +54499,21 @@ cont { element { scale: 12 area { - color: 15590876 + color: 14275263 priority: -1920 } } element { scale: 13 area { - color: 15590876 + color: 14275263 priority: -1920 } } element { scale: 14 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54528,7 +54528,7 @@ cont { element { scale: 15 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54543,7 +54543,7 @@ cont { element { scale: 16 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54558,7 +54558,7 @@ cont { element { scale: 17 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54573,7 +54573,7 @@ cont { element { scale: 18 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54588,7 +54588,7 @@ cont { element { scale: 19 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -54603,7 +54603,7 @@ cont { element { scale: 20 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -56765,8 +56765,95 @@ cont { } } } +cont { + name: "natural-scree" + element { + scale: 11 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-scrub" + element { + scale: 10 + area { + color: 13620648 + priority: -1870 + } + } + element { + scale: 11 + area { + color: 13620648 + priority: -1870 + } + } element { scale: 12 area { @@ -56831,6 +56918,72 @@ cont { } } } +cont { + name: "natural-shingle" + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-spring" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 1bfd6522ab..c15726398b 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 56d9e146e6..92bba4511c 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -56991,8 +56991,95 @@ cont { } } } +cont { + name: "natural-scree" + element { + scale: 11 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 12 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 2367520 + priority: -1920 + } + } +} cont { name: "natural-scrub" + element { + scale: 10 + area { + color: 988160 + priority: -1870 + } + } + element { + scale: 11 + area { + color: 988160 + priority: -1870 + } + } element { scale: 12 area { @@ -57057,6 +57144,72 @@ cont { } } } +cont { + name: "natural-shingle" + element { + scale: 12 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 2367520 + priority: -1920 + } + } +} cont { name: "natural-spring" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 2720de6c61..b287f3a2bb 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 14fb5c4dbc..8b2eb200e7 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -57862,14 +57862,14 @@ cont { element { scale: 12 area { - color: 15590876 + color: 14275263 priority: -1920 } } element { scale: 13 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57885,7 +57885,7 @@ cont { element { scale: 13 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -57893,7 +57893,7 @@ cont { element { scale: 14 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57909,7 +57909,7 @@ cont { element { scale: 14 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -57917,7 +57917,7 @@ cont { element { scale: 15 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57933,7 +57933,7 @@ cont { element { scale: 15 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -57941,7 +57941,7 @@ cont { element { scale: 16 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57957,7 +57957,7 @@ cont { element { scale: 16 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -57965,7 +57965,7 @@ cont { element { scale: 17 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -57981,7 +57981,7 @@ cont { element { scale: 17 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -57989,7 +57989,7 @@ cont { element { scale: 18 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -58005,7 +58005,7 @@ cont { element { scale: 18 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -58013,7 +58013,7 @@ cont { element { scale: 19 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -58029,7 +58029,7 @@ cont { element { scale: 19 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -58037,7 +58037,7 @@ cont { element { scale: 20 area { - color: 15590876 + color: 14275263 priority: -1920 } caption { @@ -58053,7 +58053,7 @@ cont { element { scale: 20 area { - color: 15590876 + color: 14275263 priority: -1920 } apply_if: "!name" @@ -60528,8 +60528,95 @@ cont { } } } +cont { + name: "natural-scree" + element { + scale: 11 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-scrub" + element { + scale: 10 + area { + color: 13620648 + priority: -1870 + } + } + element { + scale: 11 + area { + color: 13620648 + priority: -1870 + } + } element { scale: 12 area { @@ -60594,6 +60681,72 @@ cont { } } } +cont { + name: "natural-shingle" + element { + scale: 12 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 13420474 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 13420474 + priority: -1920 + } + } +} cont { name: "natural-spring" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 3019573411..e2bbb49a41 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index ccd9020a5f..8232045949 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -60754,8 +60754,95 @@ cont { } } } +cont { + name: "natural-scree" + element { + scale: 11 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 12 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 2367520 + priority: -1920 + } + } +} cont { name: "natural-scrub" + element { + scale: 10 + area { + color: 988160 + priority: -1870 + } + } + element { + scale: 11 + area { + color: 988160 + priority: -1870 + } + } element { scale: 12 area { @@ -60820,6 +60907,72 @@ cont { } } } +cont { + name: "natural-shingle" + element { + scale: 12 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 14 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 15 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 16 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 17 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 18 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 19 + area { + color: 2367520 + priority: -1920 + } + } + element { + scale: 20 + area { + color: 2367520 + priority: -1920 + } + } +} cont { name: "natural-spring" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index fb660787a0..6bfffe9bdf 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index d5f5cc6f90..1fe7a13c95 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -32154,63 +32154,63 @@ cont { element { scale: 12 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 13 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 14 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 15 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 16 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 17 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 18 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 19 area { - color: 15590876 + color: 14275263 priority: -1930 } } element { scale: 20 area { - color: 15590876 + color: 14275263 priority: -1930 } } diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index 0a907ccdbb..fac25c830e 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z10- === 130 landuse-grass # area z12- @@ -116,8 +116,8 @@ landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) natural-bare_rock # area z12- (also has caption z14-) -natural-shingle -natural-scree +natural-scree # area z11- +natural-shingle # area z12- === 80 leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 474d6fc84a..029f9c6b0d 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z10- === 130 landuse-grass # area z12- @@ -116,8 +116,8 @@ landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) natural-bare_rock # area z12- (also has caption z13-) -natural-shingle -natural-scree +natural-scree # area z11- +natural-shingle # area z12- === 80 leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) diff --git a/data/types.txt b/data/types.txt index b206339d10..cdf8686797 100644 --- a/data/types.txt +++ b/data/types.txt @@ -436,8 +436,8 @@ mapswithme *sport|australian_football *leisure|bowling_alley *healthcare|speech_therapist -mapswithme -mapswithme +*natural|scree +*natural|shingle *aerialway|t-bar *amenity|parking|lane|fee *amenity|parking|street_side|fee diff --git a/data/visibility.txt b/data/visibility.txt index 39d9b80148..07a9794fa1 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -755,7 +755,9 @@ world 000000000000000000000 + peak 000000000000000000000 - rock 000000000000000000000 - saddle 000000000000000000000 - + scree 000000000000000000000 - scrub 000000000000001111111 - + shingle 000000000000000000000 - spring 000000000000000000000 - strait 000000000000000000000 - tree_row 000000000000000000000 -