diff --git a/data/classificator.txt b/data/classificator.txt index 19daeb15c3..d48a54b31d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -89,7 +89,10 @@ world + nursing_home - parcel_locker - parking + - fee - + fee + + lane - + street_side - + {} lane - multi-storey - no-access - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 011bc1d7c5..e26e371810 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 97d786d7a4..f53ee11654 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -6509,7 +6509,7 @@ cont { } } cont { - name: "amenity-parking-lane" + name: "amenity-parking-fee-lane" element { scale: 15 area { @@ -6530,10 +6530,134 @@ cont { color: 15921852 priority: -1900 } + } + element { + scale: 18 + area { + color: 15921852 + priority: -1900 + } symbol { - name: "parking-s" + name: "parking_pay-s" priority: 150 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-fee-street_side" + element { + scale: 15 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 17 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 18 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-lane" + element { + scale: 15 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 17 + area { + color: 15921852 + priority: -1900 + } } element { scale: 18 @@ -6966,10 +7090,6 @@ cont { color: 15921852 priority: -1900 } - symbol { - name: "parking-s" - priority: 150 - } } element { scale: 18 @@ -7016,43 +7136,32 @@ cont { name: "amenity-parking-underground" element { scale: 15 - area { - color: 15921852 - priority: -1900 + symbol { + name: "parking_underground-m" + priority: 300 + min_distance: 5 } } element { scale: 16 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-s" + name: "parking_underground-m" priority: 300 min_distance: 5 } } element { scale: 17 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } } element { scale: 18 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } @@ -7068,12 +7177,8 @@ cont { } element { scale: 19 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } @@ -7170,50 +7275,6 @@ cont { } cont { name: "amenity-parking_space" - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } element { scale: 19 caption { @@ -7228,27 +7289,6 @@ cont { } cont { name: "amenity-parking_space-disabled" - element { - scale: 15 - symbol { - name: "parking-disabled-m" - priority: -9970 - } - } - element { - scale: 16 - symbol { - name: "parking-disabled-m" - priority: -9970 - } - } - element { - scale: 17 - symbol { - name: "parking-disabled-m" - priority: -9970 - } - } element { scale: 18 symbol { @@ -7275,50 +7315,6 @@ cont { } cont { name: "amenity-parking_space-permissive" - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } element { scale: 19 caption { @@ -7333,50 +7329,6 @@ cont { } cont { name: "amenity-parking_space-private" - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } element { scale: 19 caption { @@ -7391,50 +7343,6 @@ cont { } cont { name: "amenity-parking_space-underground" - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: -9970 - } - } element { scale: 19 caption { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index d2b33147e2..8ee558462d 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 04d0445f34..584c1f35b5 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -6475,31 +6475,113 @@ cont { } } cont { - name: "amenity-parking-lane" - element { - scale: 15 - area { - color: 15921852 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 15921852 - priority: -1900 - } - } + name: "amenity-parking-fee-lane" element { scale: 17 area { color: 15921852 priority: -1900 } + } + element { + scale: 18 + area { + color: 15921852 + priority: -1900 + } symbol { - name: "parking-s" + name: "parking_pay-s" priority: 150 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-fee-street_side" + element { + scale: 17 + area { + color: 15921852 + priority: -1900 + } + } + element { + scale: 18 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 15921852 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-lane" + element { + scale: 17 + area { + color: 15921852 + priority: -1900 + } } element { scale: 18 @@ -6848,20 +6930,6 @@ cont { } cont { name: "amenity-parking-private" - element { - scale: 15 - area { - color: 15921852 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 15921852 - priority: -1900 - } - } element { scale: 17 area { @@ -6912,30 +6980,12 @@ cont { } cont { name: "amenity-parking-street_side" - element { - scale: 15 - area { - color: 15921852 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 15921852 - priority: -1900 - } - } element { scale: 17 area { color: 15921852 priority: -1900 } - symbol { - name: "parking-s" - priority: 150 - } } element { scale: 18 @@ -6980,45 +7030,26 @@ cont { } cont { name: "amenity-parking-underground" - element { - scale: 15 - area { - color: 15921852 - priority: -1900 - } - } element { scale: 16 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-s" + name: "parking_underground-m" priority: 300 min_distance: 5 } } element { scale: 17 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } } element { scale: 18 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } @@ -7034,12 +7065,8 @@ cont { } element { scale: 19 - area { - color: 15921852 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 9ce396fa39..56884373ca 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index e0ba8eb7c2..e6c9ca2361 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -6475,31 +6475,113 @@ cont { } } cont { - name: "amenity-parking-lane" - element { - scale: 15 - area { - color: 2038555 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -1900 - } - } + name: "amenity-parking-fee-lane" element { scale: 17 area { color: 2038555 priority: -1900 } + } + element { + scale: 18 + area { + color: 2038555 + priority: -1900 + } symbol { - name: "parking-s" + name: "parking_pay-s" priority: 150 } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 2038555 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-fee-street_side" + element { + scale: 17 + area { + color: 2038555 + priority: -1900 + } + } + element { + scale: 18 + area { + color: 2038555 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } + element { + scale: 19 + area { + color: 2038555 + priority: -1900 + } + symbol { + name: "parking_pay-s" + priority: 150 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9850 + } + } +} +cont { + name: "amenity-parking-lane" + element { + scale: 17 + area { + color: 2038555 + priority: -1900 + } } element { scale: 18 @@ -6848,20 +6930,6 @@ cont { } cont { name: "amenity-parking-private" - element { - scale: 15 - area { - color: 2038555 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -1900 - } - } element { scale: 17 area { @@ -6912,30 +6980,12 @@ cont { } cont { name: "amenity-parking-street_side" - element { - scale: 15 - area { - color: 2038555 - priority: -1900 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -1900 - } - } element { scale: 17 area { color: 2038555 priority: -1900 } - symbol { - name: "parking-s" - priority: 150 - } } element { scale: 18 @@ -6980,45 +7030,26 @@ cont { } cont { name: "amenity-parking-underground" - element { - scale: 15 - area { - color: 2038555 - priority: -1900 - } - } element { scale: 16 - area { - color: 2038555 - priority: -1900 - } symbol { - name: "parking-s" + name: "parking_underground-m" priority: 300 min_distance: 5 } } element { scale: 17 - area { - color: 2038555 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } } element { scale: 18 - area { - color: 2038555 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } @@ -7034,12 +7065,8 @@ cont { } element { scale: 19 - area { - color: 2038555 - priority: -1900 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 300 min_distance: 10 } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index cb0f41c7a6..53fd640686 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index af276b86f4..5b48316f63 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -1976,6 +1976,132 @@ cont { } } } +cont { + name: "amenity-parking-fee-lane" + element { + scale: 15 + area { + color: 15921870 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 15 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } +} +cont { + name: "amenity-parking-fee-street_side" + element { + scale: 15 + area { + color: 15921870 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 15 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } +} cont { name: "amenity-parking-lane" element { @@ -2562,10 +2688,6 @@ cont { name: "amenity-parking-underground" element { scale: 15 - area { - color: 15921870 - priority: -1840 - } symbol { name: "parking-m" priority: 2550 @@ -2574,12 +2696,8 @@ cont { } element { scale: 16 - area { - color: 15921870 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2595,12 +2713,8 @@ cont { } element { scale: 17 - area { - color: 16579778 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 15 } @@ -2616,12 +2730,8 @@ cont { } element { scale: 18 - area { - color: 16579778 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2637,12 +2747,8 @@ cont { } element { scale: 19 - area { - color: 16579778 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2719,196 +2825,6 @@ cont { } } } -cont { - name: "amenity-parking_space" - element { - scale: 15 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-disabled" - element { - scale: 15 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-permissive" - element { - scale: 15 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-private" - element { - scale: 15 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-underground" - element { - scale: 15 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -1870 - } - } -} cont { name: "amenity-place_of_worship" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 0206827f96..a1de38ecf3 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 3785404fad..593deb0ebc 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -1976,6 +1976,132 @@ cont { } } } +cont { + name: "amenity-parking-fee-lane" + element { + scale: 15 + area { + color: 1643785 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 16 + area { + color: 1643785 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 17 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 15 + } + } + element { + scale: 18 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 19 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } +} +cont { + name: "amenity-parking-fee-street_side" + element { + scale: 15 + area { + color: 1643785 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 16 + area { + color: 1643785 + priority: -1840 + } + symbol { + name: "parking_pay-m" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 17 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 15 + } + } + element { + scale: 18 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } + element { + scale: 19 + area { + color: 2038026 + priority: -1840 + } + symbol { + name: "parking_pay-s" + priority: 2520 + min_distance: 10 + } + } +} cont { name: "amenity-parking-lane" element { @@ -2562,10 +2688,6 @@ cont { name: "amenity-parking-underground" element { scale: 15 - area { - color: 1643785 - priority: -1840 - } symbol { name: "parking-m" priority: 2550 @@ -2574,12 +2696,8 @@ cont { } element { scale: 16 - area { - color: 1643785 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2595,12 +2713,8 @@ cont { } element { scale: 17 - area { - color: 2038026 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 15 } @@ -2616,12 +2730,8 @@ cont { } element { scale: 18 - area { - color: 2038026 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2637,12 +2747,8 @@ cont { } element { scale: 19 - area { - color: 2038026 - priority: -1840 - } symbol { - name: "parking-m" + name: "parking_underground-m" priority: 2550 min_distance: 10 } @@ -2719,196 +2825,6 @@ cont { } } } -cont { - name: "amenity-parking_space" - element { - scale: 15 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-disabled" - element { - scale: 15 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-permissive" - element { - scale: 15 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-private" - element { - scale: 15 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -1870 - } - } -} -cont { - name: "amenity-parking_space-underground" - element { - scale: 15 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -1870 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -1870 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -1870 - } - } -} cont { name: "amenity-place_of_worship" element { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 0986bd5be5..d40abc1bb7 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 313ffd3cc5..cad7718598 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index b98941f3d0..4c6ede48f2 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index baa285931f..de7e9fdbc2 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 8395681269..ff4a149caf 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 688888eb94..e01b7b50f4 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index eadd5b1315..6bf10f94af 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index b019190113..bc2294f24d 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 3429923f27..8435e390c1 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 82db4966ec..9ed4db57ac 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 3ecacbec1d..a7866950fd 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 53c724f1dd..723fd7b58f 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index aacd331019..9930bc7529 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 2bb021867c..871d103011 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index a910b23ee7..5907e2a5eb 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 9ded5c9663..51e2f38378 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 8f3d0df365..89d19a0216 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 1fb5ea26a7..7fa187fd24 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index a47a217cdb..c697434a0f 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 18866cc2f0..73f40194a5 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 2a885b4546..516f12d98f 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index d983f68e6c..2f7a443bd8 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -1,720 +1,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index 90321c1839..54a3a03aa4 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index cec9b57077..e790aacc85 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -1,719 +1,719 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index c6b72e2449..9e5fb1518c 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -81,15 +81,15 @@ railway-platform # area z16- (also has captio 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 z15- (also has icon z17-, caption(optional) z18-) -amenity-parking-fee-lane # area z15- (also has icon z17-, caption(optional) z18-) -amenity-parking-fee-street_side # area z15- (also has icon z17-, caption(optional) z18-) +amenity-parking-fee-lane # area z17- (also has icon z18-, caption(optional) z18-) +amenity-parking-fee-street_side # area z17- (also has icon z18-, caption(optional) z18-) +amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-no-access # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-private # area z15- (also has icon z18-, caption(optional) z18-) -amenity-parking-street_side # area z15- (also has icon z17-, caption(optional) z18-) +amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) === 100 natural-wetland # area z11- (also has caption z16-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index aba7f7f987..e42f251c3e 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1192,7 +1192,7 @@ amenity-parking # icon z16- (also has captio amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-underground # icon z16- (also has caption(optional) z18-, area z15-) +amenity-parking-underground # icon z16- (also has caption(optional) z18-) === 300 amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) @@ -1212,19 +1212,19 @@ leisure-garden-residential # caption z18- (also has are entrance-main # icon z18- (also has caption(optional) z18-) === 170 -amenity-parking-fee-lane # icon z17- (also has caption(optional) z18-, area z15-) -amenity-parking-fee-street_side # icon z17- (also has caption(optional) z18-, area z15-) -amenity-parking-lane # icon z17- (also has caption(optional) z18-, area z15-) -amenity-parking-street_side # icon z17- (also has caption(optional) z18-, area z15-) +amenity-parking-fee-lane # icon z18- (also has caption(optional) z18-, area z17-) +amenity-parking-fee-street_side # icon z18- (also has caption(optional) z18-, area z17-) +amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) === 150 amenity-parking-no-access # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-private # icon z18- (also has caption(optional) z18-, area z15-) +amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) === 100 # # All automatic optional captions priorities are below 0. -# They follow the order of their corresponding icons. +# They follow the order of their correspoding icons. # # aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) @@ -2061,7 +2061,7 @@ amenity-parking-private # icon z18- (also has captio # amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) -# amenity-parking-underground # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) # === -9700 # amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) @@ -2079,12 +2079,14 @@ amenity-parking-private # icon z18- (also has captio # entrance-main # caption(optional) z18- (also has icon z18-) # === -9830 -# amenity-parking-lane # caption(optional) z18- (also has icon z17-, area z15-) -# amenity-parking-street_side # caption(optional) z18- (also has icon z17-, area z15-) +# amenity-parking-fee-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-fee-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) # === -9850 # amenity-parking-no-access # caption(optional) z18- (also has icon z16-, area z15-) -# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) # === -9900 man_made-survey_point # icon z16- (also has caption(optional) z16-) 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 9869fde4a2..fb4ce243ad 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 @@ -16,9 +16,9 @@ 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-fee-lane # area z15- (also has icon z15-) +amenity-parking-fee-street_side # area z15- (also has icon z15-) amenity-parking-lane # area z15- (also has icon z17-) -amenity-parking-fee-lane # area z15- (also has icon z17-) -amenity-parking-fee-street_side # area z15- (also has icon z17-) amenity-parking-multi-storey # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-no-access # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-park_and_ride # area z15- (also has icon z15-, caption(optional) z16-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index d6a735f73b..0e121cca95 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -187,7 +187,7 @@ amenity-parking-fee # icon z15- (also has captio amenity-parking-multi-storey # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-park_and_ride # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-permissive # icon z15- (also has caption(optional) z16-, area z15-) -amenity-parking-underground # icon z15- (also has caption(optional) z16-, area z15-) +amenity-parking-underground # icon z15- (also has caption(optional) z16-) === 2550 amenity-motorcycle_parking # icon z17- @@ -195,8 +195,8 @@ amenity-parking_entrance # icon z16- amenity-parking_entrance-permissive # icon z16- === 2530 -amenity-parking-fee-lane # icon z17- (also has area z15-) -amenity-parking-fee-street_side # icon z17- (also has area z15-) +amenity-parking-fee-lane # icon z15- (also has area z15-) +amenity-parking-fee-street_side # icon z15- (also has area z15-) amenity-parking-lane # icon z17- (also has area z15-) amenity-parking-street_side # icon z17- (also has area z15-) === 2520 @@ -727,7 +727,7 @@ building-garage # caption z18- (also has are # amenity-parking-multi-storey # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-park_and_ride # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-permissive # caption(optional) z16- (also has icon z15-, area z15-) -# amenity-parking-underground # caption(optional) z16- (also has icon z15-, area z15-) +# amenity-parking-underground # caption(optional) z16- (also has icon z15-) # === -7450 # boundary-national_park # caption(optional) z12- (also has icon z12-) diff --git a/data/types.txt b/data/types.txt index 96207087e4..34ac1e3942 100644 --- a/data/types.txt +++ b/data/types.txt @@ -439,8 +439,8 @@ mapswithme mapswithme mapswithme *aerialway|t-bar -mapswithme -mapswithme +*amenity|parking|fee|lane +*amenity|parking|fee|street_side *highway|path|difficult_alpine_hiking *earthquake:damage|spontaneous_camp mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index ab1ea3df44..b6e888493e 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -89,7 +89,10 @@ world 00000000000000000000 + nursing_home 00000000000000000000 - parcel_locker 00000000000000000111 - parking 00000000000000011111 + - fee 00000000000000011111 - + fee 00000000000000011111 + + lane 00000000000000011111 - + street_side 00000000000000011111 - + {} lane 00000000000000011111 - multi-storey 00000000000000011111 - no-access 00000000000000011111 - @@ -103,11 +106,11 @@ world 00000000000000000000 + permissive 00000000000000001111 - private 00000000000000000000 - {} - parking_space 00000000000000011111 + - disabled 00000000000000011111 - - permissive 00000000000000011111 - - private 00000000000000011111 - - underground 00000000000000011111 - + parking_space 00000000000000000000 + + disabled 00000000000000000000 - + permissive 00000000000000000000 - + private 00000000000000000000 - + underground 00000000000000000000 - {} payment_terminal 00000000000000000000 - pharmacy 00000000000000000000 -