diff --git a/data/classificator.txt b/data/classificator.txt index dcad65f43..4c357b529 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -627,7 +627,6 @@ world + education - farmland - farmyard - - field - flowerbed - forest + coniferous - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3a0118e93..44fe04c56 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 f5f7f5efc..65ef26a51 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -48267,72 +48267,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49650,6 +49584,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -50049,6 +49990,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -58540,6 +58488,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -60270,6 +60225,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -60336,6 +60298,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -61195,6 +61164,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 17ab4bd88..c31280e05 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index d35a181fb..ba3fa4c1c 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -45664,72 +45664,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 1251584 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -47047,6 +46981,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -47446,6 +47387,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 988160 + priority: -1920 + } + } element { scale: 12 area { @@ -55200,6 +55148,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 3156522 + priority: -1920 + } + } element { scale: 12 area { @@ -56786,6 +56741,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -56852,6 +56814,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -57564,6 +57533,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 988160 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index b9590e638..e17a1dec9 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 899a8bf7a..ecfcd66a7 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -45400,72 +45400,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -46783,6 +46717,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -47182,6 +47123,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -54954,6 +54902,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -56540,6 +56495,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -56606,6 +56568,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -57338,6 +57307,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 35a42ad75..fe6615a5c 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 bce8d2f1b..05c023b4a 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -48203,72 +48203,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 1251584 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49678,6 +49612,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -50077,6 +50018,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 988160 + priority: -1920 + } + } element { scale: 12 area { @@ -58900,6 +58848,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 3156522 + priority: -1920 + } + } element { scale: 12 area { @@ -60783,6 +60738,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -60849,6 +60811,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -61680,6 +61649,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 988160 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 79e36124e..17cba79b3 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 6259b5f07..aaaa54dd3 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -47939,72 +47939,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49414,6 +49348,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -49813,6 +49754,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -58654,6 +58602,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -60537,6 +60492,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -60603,6 +60565,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -61454,6 +61423,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index d634a7b12..262274f1c 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index db8796559..45730b3cd 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -27409,72 +27409,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 20 - area { - color: 593674 - priority: -1930 - } - } -} cont { name: "landuse-forest" element { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 302b94c0d..7d24c8a31 100644 Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 12cb644ee..0e3a523b3 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -26869,72 +26869,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 16 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 17 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 18 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 19 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 20 - area { - color: 13031851 - priority: -1930 - } - } -} cont { name: "landuse-forest" element { diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 204547d6a..b1287d7e8 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -65,12 +65,12 @@ leisure-miniature_golf # area z14- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z11- === 130 -landuse-grass # area z12- -natural-grassland # area z12- -natural-heath # area z12- +landuse-grass # area z11- +natural-grassland # area z11- +natural-heath # area z11- === 120 area:highway-footway # area z14- (also has caption z15-) @@ -106,13 +106,13 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-meadow # area z12- +landuse-meadow # area z11- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) 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-bare_rock # area z11- (also has caption z14-) natural-scree # area z11- natural-shingle # area z12- === 80 diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 140b04f2b..abfdbf799 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -560,7 +560,7 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -natural-bare_rock # caption z14- (also has area z12-) +natural-bare_rock # caption z14- (also has area z11-) natural-bay # caption z14- natural-beach # caption z15- (also has area z10-) natural-beach-gravel # caption z15- (also has area z10-) 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 9fc8a2eac..f306a68de 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 @@ -65,12 +65,12 @@ leisure-miniature_golf # area z14- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z11- === 130 -landuse-grass # area z12- -natural-grassland # area z12- -natural-heath # area z12- +landuse-grass # area z11- +natural-grassland # area z11- +natural-heath # area z11- === 120 area:highway-footway # area z14- (also has caption z15-) @@ -106,13 +106,13 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-meadow # area z12- +landuse-meadow # area z11- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) 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-bare_rock # area z11- (also has caption z13-) natural-scree # area z11- natural-shingle # area z12- === 80 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5a730a268..3a9529933 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -560,7 +560,7 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -natural-bare_rock # caption z13- (also has area z12-) +natural-bare_rock # caption z13- (also has area z11-) natural-bay # caption z14- natural-beach # caption z14- (also has area z10-) natural-beach-gravel # caption z14- (also has area z10-) diff --git a/data/types.txt b/data/types.txt index 80570fbab..d537dc37f 100644 --- a/data/types.txt +++ b/data/types.txt @@ -315,7 +315,7 @@ highway|path *aeroway|gate *railway|preserved *highway|path|horse -*landuse|field +mapswithme *hwtag|nocycleway *leisure|water_park *natural|wetland|bog diff --git a/data/visibility.txt b/data/visibility.txt index f442cadb6..c678a9ac5 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -627,7 +627,6 @@ world 000000000000000000000 + education 000000000000000000000 - farmland 000000000000001111111 - farmyard 000000000000001111111 - - field 000000000000111111111 - flowerbed 000000000000000000000 - forest 000000000011111111111 + coniferous 000000000011111111111 -