diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c4edd00f59..79062d18f9 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 7146c02d44..56b232bfa8 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -52004,6 +52004,20 @@ cont { } cont { name: "leisure-miniature_golf" + element { + scale: 12 + area { + color: 13029267 + priority: -1860 + } + } + element { + scale: 13 + area { + color: 13029267 + priority: -1860 + } + } element { scale: 14 area { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index a4d49c1ea6..c74564bfd9 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 47188730a5..603de1a800 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -26895,6 +26895,20 @@ cont { } cont { name: "landuse-allotments" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -27311,6 +27325,20 @@ 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 { @@ -28724,6 +28752,20 @@ cont { } cont { name: "landuse-grass" + element { + scale: 12 + area { + color: 593674 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1920 + } + } element { scale: 14 area { @@ -28953,6 +28995,20 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -29263,6 +29319,20 @@ cont { } cont { name: "landuse-orchard" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -29489,6 +29559,20 @@ cont { } cont { name: "landuse-recreation_ground" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -29916,6 +30000,20 @@ cont { } cont { name: "landuse-village_green" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -29968,6 +30066,20 @@ cont { } cont { name: "landuse-vineyard" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { @@ -30274,6 +30386,20 @@ cont { } cont { name: "leisure-golf_course" + element { + scale: 12 + area { + color: 593674 + priority: -1910 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1910 + } + } element { scale: 14 area { @@ -30326,6 +30452,20 @@ cont { } cont { name: "leisure-miniature_golf" + element { + scale: 12 + area { + color: 593674 + priority: -1910 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1910 + } + } element { scale: 14 area { @@ -33396,6 +33536,20 @@ cont { } cont { name: "natural-grassland" + element { + scale: 12 + area { + color: 593674 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1920 + } + } element { scale: 14 area { @@ -33448,6 +33602,20 @@ cont { } cont { name: "natural-heath" + element { + scale: 12 + area { + color: 593674 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1920 + } + } element { scale: 14 area { @@ -33643,6 +33811,20 @@ cont { } cont { name: "natural-scrub" + element { + scale: 12 + area { + color: 593674 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 593674 + priority: -1930 + } + } element { scale: 14 area { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index b4d6aa5e6b..4315358288 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 75d426dd93..850cdf08a9 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -26355,6 +26355,20 @@ cont { } cont { name: "landuse-allotments" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -26771,6 +26785,20 @@ 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 { @@ -28184,6 +28212,20 @@ cont { } cont { name: "landuse-grass" + element { + scale: 12 + area { + color: 13031851 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1920 + } + } element { scale: 14 area { @@ -28413,6 +28455,20 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -28723,6 +28779,20 @@ cont { } cont { name: "landuse-orchard" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -28949,6 +29019,20 @@ cont { } cont { name: "landuse-recreation_ground" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -29376,6 +29460,20 @@ cont { } cont { name: "landuse-village_green" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -29428,6 +29526,20 @@ cont { } cont { name: "landuse-vineyard" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { @@ -29734,6 +29846,20 @@ cont { } cont { name: "leisure-golf_course" + element { + scale: 12 + area { + color: 13031851 + priority: -1910 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1910 + } + } element { scale: 14 area { @@ -29786,6 +29912,20 @@ cont { } cont { name: "leisure-miniature_golf" + element { + scale: 12 + area { + color: 13031851 + priority: -1910 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1910 + } + } element { scale: 14 area { @@ -32856,6 +32996,20 @@ cont { } cont { name: "natural-grassland" + element { + scale: 12 + area { + color: 13031851 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1920 + } + } element { scale: 14 area { @@ -32908,6 +33062,20 @@ cont { } cont { name: "natural-heath" + element { + scale: 12 + area { + color: 13031851 + priority: -1920 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1920 + } + } element { scale: 14 area { @@ -33103,6 +33271,20 @@ cont { } cont { name: "natural-scrub" + element { + scale: 12 + area { + color: 13031851 + priority: -1930 + } + } + element { + scale: 13 + area { + color: 13031851 + priority: -1930 + } + } element { scale: 14 area { diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 236f695f39..6c81a9abaa 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -46,31 +46,31 @@ leisure-swimming_pool # area z13- leisure-swimming_pool-private # area z13- === 100 -leisure-golf_course # area z14- -leisure-miniature_golf # area z14- +leisure-golf_course # area z12- +leisure-miniature_golf # area z12- natural-wetland # area z11- (also has caption z16-) natural-wetland-bog # area z11- (also has caption z16-) natural-wetland-marsh # area z11- (also has caption z16-) === 90 -landuse-grass # area z14- -natural-grassland # area z14- -natural-heath # area z14- +landuse-grass # area z12- +natural-grassland # area z12- +natural-heath # area z12- === 80 landuse-farmyard # area z14- === 71 -landuse-allotments # area z14- +landuse-allotments # area z12- landuse-farmland # area z14- -landuse-field # area z14- -landuse-meadow # area z14- -landuse-orchard # area z14- -landuse-recreation_ground # area z14- -landuse-village_green # area z14- -landuse-vineyard # area z14- +landuse-field # area z12- +landuse-meadow # area z12- +landuse-orchard # area z12- +landuse-recreation_ground # area z12- +landuse-village_green # area z12- +landuse-vineyard # area z12- natural-bare_rock # area z12- -natural-scrub # area z14- +natural-scrub # area z12- === 70 leisure-garden # area z12- diff --git a/data/visibility.txt b/data/visibility.txt index 73d39595be..fe4405ce83 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -608,7 +608,7 @@ world 000000000000000000000 + roundabout 000000000000000001111 - {} landuse 000000000000000000000 + - allotments 000000000000001111111 - + allotments 000000000000111111111 - basin 000000000000111111111 - brownfield 000000000000000000000 - cemetery 000000000000001111111 + @@ -620,7 +620,7 @@ world 000000000000000000000 + education 000000000000000000000 - farmland 000000000000001111111 - farmyard 000000000000001111111 - - field 000000000000001111111 - + field 000000000000111111111 - flowerbed 000000000000000000000 - forest 000000000011111111111 + coniferous 000000000011111111111 - @@ -628,27 +628,27 @@ world 000000000000000000000 + mixed 000000000011111111111 - {} garages 000000000000000111111 - - grass 000000000000001111111 - + grass 000000000000111111111 - greenfield 000000000000000000000 - greenhouse_horticulture 000000000000000000000 - industrial 000000000000000111111 + mine 000000000000000111111 - {} landfill 000000000000000111111 - - meadow 000000000000001111111 - + meadow 000000000000111111111 - military 000000000000111111111 + danger_area 000000000011111111111 - {} - orchard 000000000000001111111 - + orchard 000000000000111111111 - quarry 000000000000000111111 - railway 000000000000000111111 - - recreation_ground 000000000000001111111 - + recreation_ground 000000000000111111111 - reservoir 000000000011111111111 - residential 000000000000000000000 - retail 000000000000000000000 - salt_pond 111111111111111111111 - - village_green 000000000000001111111 - - vineyard 000000000000001111111 - + village_green 000000000000111111111 - + vineyard 000000000000111111111 - {} leisure 000000000000000000000 + adult_gaming_centre 000000000000000000000 - @@ -663,11 +663,11 @@ world 000000000000000000000 + garden 000000000000111111111 + residential 000000000000111111111 - {} - golf_course 000000000000001111111 - + golf_course 000000000000111111111 - hackerspace 000000000000000000000 - ice_rink 000000000000000000000 - marina 000000000000000000000 - - miniature_golf 000000000000001111111 - + miniature_golf 000000000000111111111 - nature_reserve 000000000011111111111 - outdoor_seating 000000000000000000000 - park 000000000011111111111 + @@ -745,15 +745,15 @@ world 000000000000000000000 + earth_bank 000000000000000011111 - geyser 000000000000000000000 - glacier 111111111111111111111 - - grassland 000000000000001111111 - - heath 000000000000001111111 - + grassland 000000000000111111111 - + heath 000000000000111111111 - hot_spring 000000000000000000000 - land 111111111111111111111 - peak 000000000000000000000 - rock 000000000000000000000 - saddle 000000000000000000000 - scree 000000000000000000000 - - scrub 000000000000001111111 - + scrub 000000000000111111111 - shingle 000000000000000000000 - spring 000000000000000000000 + drinking_water_no 000000000000000000000 -