diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 953e197ec3..952740065d 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -428,7 +428,7 @@ highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; natural|volcano;355; deprecated:amenity|parking|underground|fee:01.2020;[amenity=parking][location=underground][fee?],[amenity=parking][parking=underground][fee?];x;name;int_name;356;amenity|parking|underground amenity|parking|underground;[amenity=parking][location=underground],[amenity=parking][parking=underground];;name;int_name;357; -deprecated|deprecated;358;x +amenity|parking|street_side;[amenity=parking][parking=street_side];;name;int_name;358; amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359; leisure|recreation_ground;360; highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361; @@ -438,6 +438,7 @@ sport|9pin;364; sport|10pin;365; piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366; railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367; +amenity|parking|lane;[amenity=parking][parking=lane];;name;int_name;368; railway|rail|main|tunnel;[railway=rail][usage=main][!highspeed][!service][tunnel?];;name;int_name;369; highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370; railway|construction;371; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 604c265b88..0c2e75da4d 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -2754,6 +2754,14 @@ zh-Hans = 地下停车场 zh-Hant = 地下停車場 + [type.amenity.parking.street_side] + ref = type.amenity.parking + en = Street-Side Parking + + [type.amenity.parking.lane] + ref = type.amenity.parking + en = Roadside Lane Parking + [type.amenity.parking_entrance] en = Parking Entrance af = Parkeeringang diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index e63c7e725e..cba22fddbf 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1,6 +1,4 @@ /* ~~~~ CONTENT OF ICONS~~~~~ - -1.Z-INDEX of ICONS 2.NATURAL 3.TRANSPORT 3.1 Train Station @@ -2492,50 +2490,59 @@ area|z15-[amenity=sanitary_dump_station] /* 7.1 Parking */ -node|z16[amenity=parking], -area|z16[amenity=parking] -{icon-image: parking-s.svg;icon-min-distance: 25;} - +node|z16-[amenity=parking], +area|z16-[amenity=parking], +{icon-image: parking-s.svg;icon-min-distance: 5;} node|z17-[amenity=parking], -area|z17-[amenity=parking] -{icon-image: parking-m.svg;} +area|z17-[amenity=parking], +{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10} -node|z18-[amenity=parking], -area|z18-[amenity=parking] -{font-size: 11;} +/* no icon as these subtypes should display later */ +node|z16-[amenity=parking][access=private], +area|z16-[amenity=parking][access=private], +node|z16-[amenity=parking][parking=street_side], +area|z16-[amenity=parking][parking=street_side], +node|z16-[amenity=parking][parking=lane], +area|z16-[amenity=parking][parking=lane], +/* =no doesn't work in kothic */ +/* node|z16-[amenity=parking][access=no], */ +/* area|z16-[amenity=parking][access=no], */ +{icon-image: ;icon-min-distance: 0;} -node|z16-17[amenity=parking][access=permissive], -node|z16-17[amenity=parking][access=private], -{icon-image: zero-icon.svg;} +node|z16-[amenity=parking][fee?], +area|z16-[amenity=parking][fee?], +{icon-image: parking_pay-s.svg;} +node|z17-[amenity=parking][fee?], +area|z17-[amenity=parking][fee?], +{icon-image: parking_pay-m.svg} +node|z17-[amenity=parking][parking=street_side], +area|z17-[amenity=parking][parking=street_side], +node|z17-[amenity=parking][parking=lane], +area|z17-[amenity=parking][parking=lane], +{icon-image: parking-s.svg;} -node|z17[amenity=parking_entrance], -area|z17[amenity=parking_entrance] +node|z17-[amenity=parking_entrance], +area|z17-[amenity=parking_entrance], {icon-image: parking_entrance-m.svg;} -node|z17[amenity=parking_entrance][access=permissive], -node|z17[amenity=parking_entrance][access=private] -{icon-image: zero-icon.svg;} +node|z17-[amenity=parking_entrance][access=private], +area|z17-[amenity=parking_entrance][access=private], +{icon-image: ;text: none;} -node|z18-[amenity=parking_entrance], -area|z18-[amenity=parking_entrance] -{icon-image: parking_entrance-m.svg;font-size: 11;} +node|z18-[amenity=parking][access=private], +area|z18-[amenity=parking][access=private], +/* node|z18-[amenity=parking][access=no], */ +/* area|z18-[amenity=parking][access=no], */ +{icon-image:parking_private-m.svg;} node|z17-[amenity=bicycle_parking], -area|z17-[amenity=bicycle_parking] -{icon-image: bike-parking-m.svg;icon-min-distance: 20;} +area|z17-[amenity=bicycle_parking], +{icon-image: bicycle-parking-m.svg;} node|z17-[amenity=motorcycle_parking], -area|z17-[amenity=motorcycle_parking] -{icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;} - -node|z18-[amenity=bicycle_parking], -area|z18-[amenity=bicycle_parking] -{icon-image: bike-parking-m.svg;icon-min-distance: 20;} - -node|z18-[amenity=motorcycle_parking], -area|z18-[amenity=motorcycle_parking] -{icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;} +area|z17-[amenity=motorcycle_parking], +{icon-image: motorcycle-parking-m.svg;} node|z18-[amenity=parking_space][parking_space=disabled], -area|z18-[amenity=parking_space][parking_space=disabled] +area|z18-[amenity=parking_space][parking_space=disabled], {icon-image: parking-disabled-m.svg;} diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 590bca29a7..53c85abe85 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -877,10 +877,14 @@ waterway-lock_gate # icon z16- amenity-parking-no-access # caption z18- and icon z16- (also has area z15-) amenity-parking-permissive # caption z18- and icon z16- (also has area z15-) -amenity-parking-private # caption z18- and icon z16- (also has area z15-) +amenity-parking-private # caption z18- and icon z18- (also has area z15-) amenity-parking-underground # caption z18- and icon z16- (also has area z15-) === 2150 +amenity-parking-lane # caption z18- and icon z17- (also has area z15-) +amenity-parking-street_side # caption z18- and icon z17- (also has area z15-) +=== 2125 + leisure-marina # caption z16- and icon z16- === 2100 @@ -1087,7 +1091,7 @@ amenity-music_school # caption z19 and icon z17- amenity-nursing_home # caption z17- and icon z17- amenity-parking_entrance # caption z19 and icon z17- amenity-parking_entrance-permissive # caption z19 and icon z17- -amenity-parking_entrance-private # caption z19 and icon z17- +amenity-parking_entrance-private # caption z19 amenity-payment_terminal # caption z17- and icon z17- leisure-fitness_centre # caption z17- and icon z17- leisure-fitness_station # caption z17- and icon z17- diff --git a/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg b/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg new file mode 100644 index 0000000000..7e1d13875d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/clear/style-clear/symbols/bike-parking-m.svg b/data/styles/clear/style-clear/symbols/bike-parking-m.svg deleted file mode 100644 index d988f223b8..0000000000 --- a/data/styles/clear/style-clear/symbols/bike-parking-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - bike-parking-m - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg b/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg index f1cf20059a..9229e2c413 100644 --- a/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg +++ b/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg @@ -1,10 +1 @@ - - motorcycle-parking-m - - - - - - - - + diff --git a/data/styles/clear/style-clear/symbols/parking-m.svg b/data/styles/clear/style-clear/symbols/parking-m.svg index 95d877d4e9..f5c14b39cf 100644 --- a/data/styles/clear/style-clear/symbols/parking-m.svg +++ b/data/styles/clear/style-clear/symbols/parking-m.svg @@ -1,10 +1 @@ - - parking-m - - - - - - - - + diff --git a/data/styles/clear/style-clear/symbols/parking-s.svg b/data/styles/clear/style-clear/symbols/parking-s.svg index fcbed91d8f..6360376725 100644 --- a/data/styles/clear/style-clear/symbols/parking-s.svg +++ b/data/styles/clear/style-clear/symbols/parking-s.svg @@ -1,10 +1,5 @@ - - parking-s - - - - - - - + + parking-m + + diff --git a/data/styles/clear/style-clear/symbols/parking_entrance-m.svg b/data/styles/clear/style-clear/symbols/parking_entrance-m.svg index 155ab6cb96..d090f327fa 100644 --- a/data/styles/clear/style-clear/symbols/parking_entrance-m.svg +++ b/data/styles/clear/style-clear/symbols/parking_entrance-m.svg @@ -1,25 +1,6 @@ - - parking_entrance-m - - - - - - - - - - parking_entrance-m - - - - - - - - - - - - + + + parking_entrance-m + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-m.svg b/data/styles/clear/style-clear/symbols/parking_pay-m.svg index c8665f5914..9a0681d90a 100644 --- a/data/styles/clear/style-clear/symbols/parking_pay-m.svg +++ b/data/styles/clear/style-clear/symbols/parking_pay-m.svg @@ -1,10 +1,7 @@ - - parking_pay-m - - - - - - - + + + parking_pay-m + + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-s.svg b/data/styles/clear/style-clear/symbols/parking_pay-s.svg new file mode 100644 index 0000000000..2b2311a8a1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/parking_pay-s.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking_private-m.svg b/data/styles/clear/style-clear/symbols/parking_private-m.svg new file mode 100644 index 0000000000..2b1691afc8 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/parking_private-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-parking-m.svg b/data/styles/clear/style-night/symbols/bicycle-parking-m.svg new file mode 100644 index 0000000000..82156e85fc --- /dev/null +++ b/data/styles/clear/style-night/symbols/bicycle-parking-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/clear/style-night/symbols/bike-parking-m.svg b/data/styles/clear/style-night/symbols/bike-parking-m.svg deleted file mode 100644 index bb716868aa..0000000000 --- a/data/styles/clear/style-night/symbols/bike-parking-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - bike-parking-m - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg b/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg index 9e84d999e0..463e01d7eb 100644 --- a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg +++ b/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg @@ -1,10 +1 @@ - - motorcycle-parking-m - - - - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/parking-m.svg b/data/styles/clear/style-night/symbols/parking-m.svg index 83715563bd..62e55e687a 100644 --- a/data/styles/clear/style-night/symbols/parking-m.svg +++ b/data/styles/clear/style-night/symbols/parking-m.svg @@ -1,10 +1,5 @@ - - parking-m - - - - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/clear/style-night/symbols/parking-s.svg index 14983637c5..4894a21ca5 100644 --- a/data/styles/clear/style-night/symbols/parking-s.svg +++ b/data/styles/clear/style-night/symbols/parking-s.svg @@ -1,10 +1 @@ - - parking-s - - - - - - - - + diff --git a/data/styles/clear/style-night/symbols/parking_entrance-m.svg b/data/styles/clear/style-night/symbols/parking_entrance-m.svg index 600dd11a82..e63d3d7aac 100644 --- a/data/styles/clear/style-night/symbols/parking_entrance-m.svg +++ b/data/styles/clear/style-night/symbols/parking_entrance-m.svg @@ -1,27 +1,6 @@ - - parking_entrance-m - - - - - - - - - - parking_entrance-m - - - - - - - - - - - - - - + + + parking_entrance-m + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-m.svg b/data/styles/clear/style-night/symbols/parking_pay-m.svg index 54b93b9839..52cef42a99 100644 --- a/data/styles/clear/style-night/symbols/parking_pay-m.svg +++ b/data/styles/clear/style-night/symbols/parking_pay-m.svg @@ -1,10 +1,7 @@ - - parking_pay-m - - - - - - - + + + parking_pay-m + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-s.svg b/data/styles/clear/style-night/symbols/parking_pay-s.svg new file mode 100644 index 0000000000..793a295393 --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_pay-s.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/clear/style-night/symbols/parking_private-m.svg b/data/styles/clear/style-night/symbols/parking_private-m.svg new file mode 100644 index 0000000000..566d87b3a0 --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_private-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 5b8c5d61a7..5a9f2ecf0a 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -1,6 +1,4 @@ /* ~~~~ CONTENT OF ICONS~~~~~ - -1.Z-INDEX of ICONS 2.NATURAL 3.TRANSPORT 3.1 Train Station @@ -886,27 +884,45 @@ area|z16-[amenity=water_point], /* 7.1 Parking */ node|z15-[amenity=parking], -area|z15-[amenity=parking] -{icon-image: parking-m.svg; icon-min-distance: 3;} - +area|z15-[amenity=parking], +{icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z17[amenity=parking], -area|z17[amenity=parking] -{icon-min-distance: 15;} +area|z17[amenity=parking], +{icon-min-distance: 15;font-size: 13.75;} +node|z18-[amenity=parking], +area|z18-[amenity=parking], +{font-size: 14.5;} -node|z18[amenity=parking], -area|z18[amenity=parking] -{icon-min-distance: 10;} +/* no icon as these subtypes should display later */ +node|z15-[amenity=parking][access=private], +area|z15-[amenity=parking][access=private], +node|z15-[amenity=parking][parking=street_side], +area|z15-[amenity=parking][parking=street_side], +node|z15-[amenity=parking][parking=lane], +area|z15-[amenity=parking][parking=lane], +{icon-image: ;text: none;} -node|z19-[amenity=parking], -area|z19-[amenity=parking] -{icon-min-distance: 6;} +node|z15-[amenity=parking][fee?], +area|z15-[amenity=parking][fee?], +{icon-image: parking_pay-m.svg;} -node|z15-18[amenity=parking][access=permissive], -node|z15-18[amenity=parking][access=private], -{icon-image: zero-icon.svg;} +node|z17-[amenity=parking][access=private], +area|z17-[amenity=parking][access=private], +{icon-image: parking_private-m.svg;text: name;} -/* -node|z17-[amenity=bicycle_parking], -area|z17-[amenity=bicycle_parking] -{icon-image: bike-parking-m.svg;icon-min-distance: 20;} -*/ +node|z17-[amenity=parking][parking=street_side], +area|z17-[amenity=parking][parking=street_side], +node|z17-[amenity=parking][parking=lane], +area|z17-[amenity=parking][parking=lane], +{icon-image: parking-s.svg;} + +node|z16-[amenity=parking_entrance], +area|z16-[amenity=parking_entrance], +{icon-image: parking_entrance-m.svg; font-size: 12.5;} +node|z16-[amenity=parking_entrance][access=private], +area|z16-[amenity=parking_entrance][access=private], +{icon-image: ;} + +node|z17-[amenity=motorcycle_parking], +area|z17-[amenity=motorcycle_parking], +{icon-image: motorcycle-parking-m.svg;} diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index b42f3c1391..c4d204e865 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -186,6 +186,12 @@ amenity-parking-permissive # caption z16- and icon z15- amenity-parking-underground # caption z16- and icon z15- (also has area z15-) === 2550 +amenity-motorcycle_parking # icon z17- +amenity-parking_entrance +amenity-parking-lane # icon z17- (also has area z15-) +amenity-parking-street_side # icon z17- (also has area z15-) +=== 2525 + boundary-national_park # caption z12- and icon z12- boundary-protected_area # caption z12- and icon z12- boundary-protected_area-1 # caption z12- and icon z12- @@ -610,7 +616,7 @@ railway-subway_entrance-yokohama # caption z17- and icon z16- === 550 amenity-parking-no-access # caption z16- and icon z15- (also has area z15-) -amenity-parking-private # caption z16- and icon z15- (also has area z15-) +amenity-parking-private # caption z17- and icon z17- (also has area z15-) === 500 natural-wetland # caption z16- (also has area z11-)