diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index b2106472f..65ffd5662 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -123,6 +123,7 @@ Parking Space Parking Space Disabled Parking Space + Car Pooling Payment Centre Payment Terminal Pharmacy diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 117e22a8b..988370596 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -419,6 +419,7 @@ "amenity-internet_cafe": "3Internet Cafe", "amenity-motorcycle_parking": "4Motorcycle Parking", "amenity-parking_space-disabled|@category_parking": "Disabled Parking Space", +"amenity-car_pooling|@category_parking": "Car Pooling", "amenity-nursing_home": "4Nursing Home", "amenity-payment_terminal": "Payment Terminal", "amenity-payment_centre": "Payment Centre", diff --git a/data/editor.config b/data/editor.config index 0b82f3c89..326d7707f 100644 --- a/data/editor.config +++ b/data/editor.config @@ -386,6 +386,11 @@ + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 008584951..314e0914c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -628,7 +628,7 @@ drinking_water|no;505; deprecated|deprecated;506;x deprecated|deprecated;507;x deprecated|deprecated;508;x -deprecated:railway|spur|bridge:06.2023;509;x +amenity|car_pooling;509; deprecated|deprecated;510;x deprecated|deprecated;511;x deprecated|deprecated;512;x diff --git a/data/styles/default/dark/symbols/parking_pooling-m.svg b/data/styles/default/dark/symbols/parking_pooling-m.svg new file mode 100644 index 000000000..6e49e9aee --- /dev/null +++ b/data/styles/default/dark/symbols/parking_pooling-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/parking_pooling-s.svg b/data/styles/default/dark/symbols/parking_pooling-s.svg new file mode 100644 index 000000000..3ab9d7a54 --- /dev/null +++ b/data/styles/default/dark/symbols/parking_pooling-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 8a45a1c71..40538888a 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -428,6 +428,7 @@ area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], area|z14-[landuse=cemetery], area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], area|z16-[public_transport=platform], area|z16-[railway=platform], {fill-opacity: 1;} @@ -590,6 +591,7 @@ area|z10-[landuse=farmyard], /* Parking */ area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-color: @parking;} area|z15-[amenity=parking][location=underground], diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 65020ef7d..b17a02e45 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -2157,6 +2157,7 @@ node|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], node|z17-[amenity=car_wash], node|z18-[amenity=parking], +node|z18-[amenity=car_pooling], node|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} @@ -2231,6 +2232,11 @@ node|z16-[amenity=parking], node|z17-[amenity=parking], {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10} +node|z16-[amenity=car_pooling], +{icon-image: parking-pooling-s.svg;icon-min-distance: 5;} +node|z17-[amenity=car_pooling], +{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10} + node|z16-[amenity=parking][location=underground], {icon-image:parking_underground-m.svg;} 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 2f4d81604..5fb9b7151 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 @@ -140,6 +140,7 @@ railway-platform # area z16- (also has captio 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-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) 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-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 9a9d3a514..7dbaa87ad 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1255,6 +1255,7 @@ power-portal # icon z19- power-tower # icon z19- === 450 +amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) 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-) @@ -2246,6 +2247,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # man_made-water_tower # caption(optional) z18- (also has icon z16-) # === -9550 +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) # 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-) diff --git a/data/styles/default/light/symbols/parking_pooling-m.svg b/data/styles/default/light/symbols/parking_pooling-m.svg new file mode 100644 index 000000000..3042d2538 --- /dev/null +++ b/data/styles/default/light/symbols/parking_pooling-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/parking_pooling-s.svg b/data/styles/default/light/symbols/parking_pooling-s.svg new file mode 100644 index 000000000..8f210c3f9 --- /dev/null +++ b/data/styles/default/light/symbols/parking_pooling-s.svg @@ -0,0 +1 @@ + \ No newline at end of file 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 8e1c646ed..491a6a56f 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 @@ -140,6 +140,7 @@ railway-platform # area z16- (also has captio 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-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) 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-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5fd0bbcf7..8c25a3c0d 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1256,6 +1256,7 @@ power-portal # icon z13- power-tower # icon z13- === 450 +amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) 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-) @@ -2252,6 +2253,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # man_made-water_tower # caption(optional) z14- (also has icon z13-) # === -9550 +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) # 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-) diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 42dc2b0e7..82aac515b 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -294,6 +294,7 @@ area|z14-[landuse=cemetery], area|z14-[amenity=university], area|z15-[leisure=stadium], area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-opacity: 1;} /* 7.1 Industrial */ @@ -385,8 +386,10 @@ area|z14-[landuse=farmyard], /* Parking */ area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-color: @parking;fill-opacity: 1;} area|z17-[amenity=parking], +area|z17-[amenity=car_pooling], {fill-color: @parking_l;fill-opacity: 1;} area|z15-[amenity=parking][location=underground], diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index f7b9e4cf5..864fb22c7 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -600,6 +600,7 @@ node|z14-[amenity=charging_station][motorcar?][capacity?], node|z15-[amenity=sanitary_dump_station], node|z16-[amenity=charging_station], node|z16-[amenity=parking], +node|z16-[amenity=car_pooling], area|z16-[landuse=garages], node|z16-[tourism=caravan_site], node|z17-[amenity=car_wash], @@ -732,9 +733,13 @@ node|z18-[amenity=water_point][drinking_water=not], node|z15-[amenity=parking], {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;} +node|z15-[amenity=car_pooling], +{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z17[amenity=parking], +node|z17[amenity=car_pooling], {icon-min-distance: 15;font-size: 13.75;} node|z18-[amenity=parking], +node|z18-[amenity=car_pooling], {font-size: 14.5;} node|z15-[amenity=parking][location=underground], 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 156c124e2..d13ca4644 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-car_pooling # area z15- (also has icon z15-, caption(optional) z16-) 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-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 424a61231..f93063b30 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -234,6 +234,7 @@ amenity-sanitary_dump_station # icon z15- (also has captio shop-caravan # icon z17- === 2600 +amenity-car_pooling # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-fee # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-multi-storey # icon z15- (also has caption(optional) z16-, area z15-) @@ -819,6 +820,7 @@ entrance-main # icon z18- (also has captio # amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) # === -7400 +# amenity-car_pooling # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-fee # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-multi-storey # caption(optional) z16- (also has icon z15-, area z15-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 1ca4ac5b3..0a72298a0 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -115,6 +115,7 @@ "type.amenity.parking_space.private" = "Parking Space"; "type.amenity.parking_space.underground" = "Parking Space"; "type.amenity.parking_space.disabled" = "Disabled Parking Space"; +"type.amenity.car_pooling" = "Car Pooling"; "type.amenity.payment_centre" = "Payment Centre"; "type.amenity.payment_terminal" = "Payment Terminal"; "type.amenity.pharmacy" = "Pharmacy"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index ebe1bffe8..219dc9f33 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -126,6 +126,7 @@ "type.amenity.parking_space.private" = "Parking Space"; "type.amenity.parking_space.underground" = "Parking Space"; "type.amenity.parking_space.disabled" = "Disabled Parking Space"; +"type.amenity.car_pooling" = "Car Pooling"; "type.amenity.payment_terminal" = "Payment Terminal"; "type.amenity.payment_centre" = "Payment Centre"; "type.amenity.pharmacy" = "Pharmacy";