diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 85749ed9b..59af04214 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 c5bf7f970..a413262af 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -3539,8 +3539,26 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3557,6 +3575,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3573,6 +3595,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3589,6 +3615,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3606,8 +3636,26 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3624,6 +3672,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3640,6 +3692,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3656,6 +3712,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -8060,8 +8120,26 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8078,6 +8156,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8094,6 +8176,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8110,6 +8196,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12499,24 +12589,25 @@ cont { cont { name: "amenity-ranger_station" element { - scale: 14 - symbol { - name: "ranger-station-m" - priority: 4400 - min_distance: 10 + scale: 13 + area { + color: 16445409 + priority: -1830 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5600 + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 } } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12534,6 +12625,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12551,6 +12646,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12568,6 +12667,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12585,6 +12688,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12602,6 +12709,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -49032,6 +49143,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } + } element { scale: 17 caption { @@ -50769,6 +50890,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 @@ -50776,6 +50905,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 @@ -50783,6 +50920,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 @@ -50790,6 +50935,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 @@ -50797,6 +50950,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 @@ -50804,6 +50965,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -52542,6 +52711,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 17 @@ -52549,6 +52725,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 18 @@ -52556,6 +52739,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 19 @@ -52563,6 +52753,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 20 @@ -52570,6 +52767,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } } cont { @@ -133662,6 +133866,10 @@ cont { name: "tourism-information-office" element { scale: 13 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133679,6 +133887,10 @@ cont { } element { scale: 14 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133696,6 +133908,10 @@ cont { } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133713,6 +133929,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133730,6 +133950,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133747,6 +133971,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133764,6 +133992,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133781,6 +134013,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133801,40 +134037,24 @@ cont { name: "tourism-information-visitor_centre" element { scale: 13 - symbol { - name: "information-office-m" - priority: 4400 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5600 + area { + color: 16445409 + priority: -1830 } } element { scale: 14 - symbol { - name: "information-office-m" - priority: 4400 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5600 + area { + color: 16445409 + priority: -1830 } } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133852,6 +134072,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133869,6 +134093,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133886,6 +134114,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133903,6 +134135,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133920,6 +134156,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 1992ca982..75c8ec97e 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 3014def41..fca34e2cf 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -3507,8 +3507,23 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3525,6 +3540,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3541,6 +3559,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3557,6 +3578,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3574,8 +3598,23 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3592,6 +3631,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3608,6 +3650,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3624,6 +3669,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -7866,8 +7914,23 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7884,6 +7947,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7900,6 +7966,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7916,6 +7985,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12074,8 +12146,23 @@ cont { } cont { name: "amenity-ranger_station" + element { + scale: 13 + area { + priority: -1830 + } + } + element { + scale: 14 + area { + priority: -1830 + } + } element { scale: 15 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12093,6 +12180,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12110,6 +12200,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12127,6 +12220,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12144,6 +12240,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12161,6 +12260,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -45842,6 +45944,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } + } element { scale: 17 caption { @@ -47576,36 +47688,84 @@ cont { area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -49336,6 +49496,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 17 @@ -49343,6 +49510,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 18 @@ -49350,6 +49524,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 19 @@ -49357,6 +49538,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 20 @@ -49364,6 +49552,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } } cont { @@ -127565,6 +127760,9 @@ cont { name: "tourism-information-office" element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127582,6 +127780,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127599,6 +127800,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127616,6 +127820,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127633,6 +127840,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127650,6 +127860,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127668,8 +127881,23 @@ cont { } cont { name: "tourism-information-visitor_centre" + element { + scale: 13 + area { + priority: -1830 + } + } + element { + scale: 14 + area { + priority: -1830 + } + } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127687,6 +127915,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127704,6 +127935,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127721,6 +127955,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127738,6 +127975,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127755,6 +127995,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e3641662b..98f5c1422 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 65dc98463..9997f8deb 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -3507,8 +3507,26 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3525,6 +3543,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3541,6 +3563,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3557,6 +3583,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3574,8 +3604,26 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3592,6 +3640,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3608,6 +3660,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3624,6 +3680,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -7902,8 +7962,26 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7920,6 +7998,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7936,6 +8018,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7952,6 +8038,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12196,8 +12286,26 @@ cont { } cont { name: "amenity-ranger_station" + element { + scale: 13 + area { + color: 16445409 + priority: -1830 + } + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 + } + } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12215,6 +12323,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12232,6 +12344,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12249,6 +12365,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12266,6 +12386,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12283,6 +12407,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -45736,6 +45864,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } + } element { scale: 17 caption { @@ -47473,6 +47611,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 @@ -47480,6 +47626,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 @@ -47487,6 +47641,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 @@ -47494,6 +47656,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 @@ -47501,6 +47671,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 @@ -47508,6 +47686,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -49246,6 +49432,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 17 @@ -49253,6 +49446,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 18 @@ -49260,6 +49460,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 19 @@ -49267,6 +49474,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 20 @@ -49274,6 +49488,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } } cont { @@ -127641,6 +127862,10 @@ cont { name: "tourism-information-office" element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127658,6 +127883,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127675,6 +127904,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127692,6 +127925,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127709,6 +127946,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127726,6 +127967,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127744,8 +127989,26 @@ cont { } cont { name: "tourism-information-visitor_centre" + element { + scale: 13 + area { + color: 16445409 + priority: -1830 + } + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 + } + } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127763,6 +128026,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127780,6 +128047,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127797,6 +128068,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127814,6 +128089,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127831,6 +128110,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index bcbf5df28..d01721d03 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 1b745ce8a..a14de9d24 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -3530,8 +3530,23 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3548,6 +3563,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3564,6 +3582,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3580,6 +3601,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3597,8 +3621,23 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3615,6 +3654,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3631,6 +3673,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3647,6 +3692,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -8008,8 +8056,23 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8026,6 +8089,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8042,6 +8108,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8058,6 +8127,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12217,11 +12289,23 @@ cont { cont { name: "amenity-ranger_station" element { - scale: 14 + scale: 13 + area { + priority: -1830 + } + symbol { + name: "ranger-station-m" + priority: 4400 + } + } + element { + scale: 14 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 - min_distance: 10 } caption { primary { @@ -12235,6 +12319,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12252,6 +12339,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12269,6 +12359,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12286,6 +12379,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12303,6 +12399,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12320,6 +12419,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -48539,6 +48641,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } + } element { scale: 17 caption { @@ -50365,36 +50477,84 @@ cont { area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -52125,6 +52285,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 17 @@ -52132,6 +52299,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 18 @@ -52139,6 +52313,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 19 @@ -52146,6 +52327,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 20 @@ -52153,6 +52341,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } } cont { @@ -133925,6 +134120,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133942,6 +134140,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133959,6 +134160,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133976,6 +134180,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133993,6 +134200,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134010,6 +134220,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134030,6 +134243,9 @@ cont { name: "tourism-information-visitor_centre" element { scale: 13 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134037,6 +134253,9 @@ cont { } element { scale: 14 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134053,6 +134272,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134070,6 +134292,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134087,6 +134312,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134104,6 +134332,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134121,6 +134352,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134138,6 +134372,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index d2affef34..78b2c865e 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 e9ecbbd9e..75a478c98 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -3530,8 +3530,26 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3548,6 +3566,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3564,6 +3586,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3580,6 +3606,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3597,8 +3627,26 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3615,6 +3663,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3631,6 +3683,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3647,6 +3703,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -8044,8 +8104,26 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8062,6 +8140,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8078,6 +8160,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8094,6 +8180,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12339,11 +12429,25 @@ cont { cont { name: "amenity-ranger_station" element { - scale: 14 + scale: 13 + area { + color: 16445409 + priority: -1830 + } + symbol { + name: "ranger-station-m" + priority: 4400 + } + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 - min_distance: 10 } caption { primary { @@ -12357,6 +12461,10 @@ cont { } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12374,6 +12482,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12391,6 +12503,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12408,6 +12524,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12425,6 +12545,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12442,6 +12566,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -48433,6 +48561,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } + } element { scale: 17 caption { @@ -50262,6 +50400,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 @@ -50269,6 +50415,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 @@ -50276,6 +50430,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 @@ -50283,6 +50445,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 @@ -50290,6 +50460,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 @@ -50297,6 +50475,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -52035,6 +52221,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 17 @@ -52042,6 +52235,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 18 @@ -52049,6 +52249,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 19 @@ -52056,6 +52263,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 20 @@ -52063,6 +52277,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } } cont { @@ -134001,6 +134222,10 @@ cont { } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134018,6 +134243,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134035,6 +134264,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134052,6 +134285,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134069,6 +134306,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134086,6 +134327,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134106,6 +134351,10 @@ cont { name: "tourism-information-visitor_centre" element { scale: 13 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134113,6 +134362,10 @@ cont { } element { scale: 14 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134129,6 +134382,10 @@ cont { } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134146,6 +134403,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134163,6 +134424,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134180,6 +134445,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134197,6 +134466,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134214,6 +134487,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 8ac5ad005..db10949bc 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 35962ce9f..f13b2b94f 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -2125,6 +2125,9 @@ cont { name: "amenity-motorcycle_parking" element { scale: 17 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2132,6 +2135,9 @@ cont { } element { scale: 18 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2139,6 +2145,9 @@ cont { } element { scale: 19 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2146,6 +2155,9 @@ cont { } element { scale: 20 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -28861,30 +28873,70 @@ cont { area { priority: -1850 } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 17 area { priority: -1850 } + caption { + primary { + height: 13 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 18 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 19 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 20 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } } cont { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 4fb1af8b9..08cb5cd60 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 1e66199eb..43fdc515e 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -2141,6 +2141,10 @@ cont { name: "amenity-motorcycle_parking" element { scale: 17 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2148,6 +2152,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2155,6 +2163,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2162,6 +2174,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -28361,6 +28377,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 17 @@ -28368,6 +28392,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 13 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 18 @@ -28375,6 +28407,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 19 @@ -28382,6 +28422,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 20 @@ -28389,6 +28437,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } } cont { 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 2d32ee8f0..b16c5c5dd 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 @@ -58,22 +58,22 @@ amenity-fire_station # area z15- (also has icon z amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) -amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z15-) leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) -tourism-information-office -tourism-information-visitor_centre +tourism-information-office # area z15- (also has icon z15-, caption(optional) z15-) +tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) @@ -103,6 +103,9 @@ public_transport-platform # area z16- (also has captio railway-platform # area z16- (also has caption z16-) === 110 +amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) @@ -117,9 +120,6 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) -amenity-bicycle_parking -amenity-bicycle_parking-covered -amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) @@ -199,7 +199,7 @@ amenity-university # area z13- (also has icon z aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) landuse-education # area z13- -landuse-retail # area z13- +landuse-retail # area z13- (also has caption z16-) leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) natural-beach # area z10- (also has caption z15-) natural-beach-gravel # area z10- (also has caption z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8be3f19a4..1894b6352 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 -amenity-ranger_station # icon z15- (also has caption(optional) z15-) +amenity-ranger_station # icon z15- (also has caption(optional) z15-, area z13-) historic-monument # icon z13- (also has caption(optional) z13-) -tourism-information-office # icon z15- (also has caption(optional) z15-) -tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-) +tourism-information-office # icon z15- (also has caption(optional) z15-, area z15-) +tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-, area z13-) === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1098,8 +1098,8 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z17- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) -landuse-garages landuse-farmland # caption z15- (also has area z10-) +landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) leisure-ice_rink # icon z17- (also has caption(optional) z17-) @@ -1208,9 +1208,9 @@ amenity-parking-underground # icon z16- (also has captio amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) === 300 -amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) -amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) -amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) @@ -1252,7 +1252,7 @@ amenity-parking-street_side # icon z18- (also has captio amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) === 150 -landuse-commercial # caption z17- +landuse-commercial # caption z16- landuse-construction # caption z15- (also has area z13-) landuse-farmyard # caption z15- (also has area z10-) landuse-industrial # caption z15- (also has area z13-) @@ -1260,8 +1260,8 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) -landuse-retail landuse-residential # caption z17- +landuse-retail # caption z16- (also has area z13-) leisure-common # caption z17- leisure-slipway # caption z17- leisure-track # caption z16- (also has line z15-) @@ -1516,10 +1516,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 -# amenity-ranger_station # caption(optional) z15- (also has icon z15-) +# amenity-ranger_station # caption(optional) z15- (also has icon z15-, area z13-) # historic-monument # caption(optional) z13- (also has icon z13-) -# tourism-information-office # caption(optional) z15- (also has icon z15-) -# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-) +# tourism-information-office # caption(optional) z15- (also has icon z15-, area z15-) +# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-, area z13-) # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -2142,9 +2142,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) # === -9700 -# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) -# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) -# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) 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 3976c68d3..390e15000 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 @@ -58,22 +58,22 @@ amenity-fire_station # area z15- (also has icon z amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) -amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) highway-rest_area # area z13- (also has icon z14-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z15-) leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) -tourism-information-office -tourism-information-visitor_centre +tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +tourism-information-visitor_centre # area z13- (also has icon z13-, caption(optional) z14-) === 170 highway-footway-area # area z14- (also has line z11-, pathtext z13-) @@ -103,6 +103,9 @@ public_transport-platform # area z16- (also has captio railway-platform # area z16- (also has caption z16-) === 110 +amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) @@ -117,9 +120,6 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) -amenity-bicycle_parking -amenity-bicycle_parking-covered -amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) @@ -199,7 +199,7 @@ amenity-university # area z13- (also has icon z aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) landuse-education # area z13- -landuse-retail # area z13- +landuse-retail # area z13- (also has caption z16-) leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) natural-beach # area z10- (also has caption z14-) natural-beach-gravel # area z10- (also has caption z14-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 370a7759e..7765af9d7 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 -amenity-ranger_station # icon z14- (also has caption(optional) z14-) +amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) historic-monument # icon z13- (also has caption(optional) z13-) -tourism-information-office # icon z13- (also has caption(optional) z14-) -tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-) +tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1099,8 +1099,8 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z16- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) -landuse-garages landuse-farmland # caption z15- (also has area z10-) +landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) leisure-ice_rink # icon z17- (also has caption(optional) z17-) @@ -1209,9 +1209,9 @@ amenity-parking-underground # icon z16- (also has captio amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) === 300 -amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) -amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) -amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) @@ -1255,7 +1255,7 @@ amenity-parking-street_side # icon z18- (also has captio amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) === 150 -landuse-commercial # caption z17- +landuse-commercial # caption z16- landuse-construction # caption z15- (also has area z13-) landuse-farmyard # caption z15- (also has area z10-) landuse-industrial # caption z15- (also has area z13-) @@ -1263,8 +1263,8 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) -landuse-retail landuse-residential # caption z17- +landuse-retail # caption z16- (also has area z13-) leisure-common # caption z17- leisure-slipway # caption z17- leisure-track # caption z16- (also has line z15-) @@ -1519,10 +1519,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 -# amenity-ranger_station # caption(optional) z14- (also has icon z14-) +# amenity-ranger_station # caption(optional) z14- (also has icon z13-, area z13-) # historic-monument # caption(optional) z13- (also has icon z13-) -# tourism-information-office # caption(optional) z14- (also has icon z13-) -# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-) +# tourism-information-office # caption(optional) z14- (also has icon z13-, area z15-) +# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-, area z13-) # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -2147,9 +2147,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) # === -9700 -# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) -# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) -# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) 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 e0a1b5761..7fad027b4 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 @@ -14,6 +14,7 @@ # - BG-top: water (linear and areal) # - BG-by-size: landcover areas sorted by their size +amenity-motorcycle_parking # area z17- (also has icon z17-) amenity-parking # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-fee # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-lane # area z15- (also has icon z17-) @@ -28,7 +29,6 @@ amenity-parking-private # area z15- (also has icon z amenity-parking-street_side # area z15- (also has icon z17-) amenity-parking-street_side-fee # area z15- (also has icon z15-) amenity-parking-street_side-private # area z15- (also has icon z17-, caption(optional) z17-) -amenity-motorcycle_parking === 160 amenity-car_wash # area z17- (also has icon z17-, caption(optional) z17-) @@ -37,7 +37,7 @@ amenity-fuel # area z15- (also has icon z amenity-vehicle_inspection # area z17- (also has icon z17-) highway-rest_area # area z13- (also has icon z14-, caption(optional) z14-) highway-services # area z13- (also has icon z12-, caption(optional) z13-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z16-) leisure-stadium # area z15- === 150 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index e67834ddb..e583f20fb 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -239,10 +239,10 @@ amenity-parking-underground # icon z15- (also has captio amenity-parking-underground-fee # icon z15- (also has caption(optional) z16-) === 2550 -amenity-motorcycle_parking # icon z17- +amenity-motorcycle_parking # icon z17- (also has area z17-) amenity-parking_entrance # icon z16- amenity-parking_entrance-permissive # icon z16- -landuse-garages +landuse-garages # caption z16- (also has area z13-) === 2530 amenity-parking-lane # icon z17- (also has area z15-)