diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml index 328db5bb4..f5cfb0b72 100644 --- a/android/app/src/main/res/values-ru/types_strings.xml +++ b/android/app/src/main/res/values-ru/types_strings.xml @@ -182,6 +182,7 @@ Техосмотр автомобиля Топливная колонка Ветеринарная клиника + Приют для животных Урна Мусорный контейнер Станция перевалки отходов diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 5a7a5ae04..f5daa3358 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -187,6 +187,7 @@ Vehicle Inspection Fuel Pump Veterinary Doctor + Animal Shelter Trash Bin Dumpster Waste Transfer Station diff --git a/data/categories.txt b/data/categories.txt index e0facb8b9..b3e7dcbae 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -12994,6 +12994,10 @@ sk:4Veterinár fa:دامپزشکی mr:पशुवैद्यकीय डॉक्टर|प्राण्यांचा डॉक्टर +amenity-animal_shelter +en:Animal Shelter +ru:Приют для животных + @charging_station en:4Charging Station|charging ru:4Зарядная станция|зарядка|электрозарядка|зарядить diff --git a/data/editor.config b/data/editor.config index efead9f4a..3415d1136 100644 --- a/data/editor.config +++ b/data/editor.config @@ -455,6 +455,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b7e74989d..aafa9e027 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1024,7 +1024,7 @@ man_made|crane;899; railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel barrier|wicket_gate;901; railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel -deprecated|deprecated;903;x +amenity|animal_shelter;903; railway|subway|lightblue;[railway=subway][colour=lightblue];x;name;int_name;904;railway|subway|tunnel amenity|motorcycle_rental;[amenity=motorcycle_rental],[shop=motorcycle][motorcycle:rental=yes],[shop=motorcycle][rental=yes],[amenity=scooter_rental];;;;905; railway|subway|lightgreen;[railway=subway][colour=lightgreen];x;name;int_name;906;railway|subway|tunnel diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 6612a26a4..17caec6a4 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -788,6 +788,7 @@ node|z17-[leisure=amusement_arcade], node|z17-[amenity=courthouse], node|z17-[amenity=nursing_home], node|z17-[amenity=social_facility], +node|z17-[amenity=animal_shelter], node|z17-[amenity=kindergarten], node|z17-[amenity=childcare], node|z17-[amenity=school], @@ -922,6 +923,11 @@ node|z16-[amenity=veterinary], node|z18-[amenity=veterinary], {font-size: 11;} +node|z17-[amenity=animal_shelter], +{icon-image: dog_park-m.svg;} +node|z18-[amenity=animal_shelter], +{font-size: 11;} + node|z16-[amenity=pharmacy], {icon-image: pharmacy-m.svg;icon-min-distance: 20;} node|z17-[amenity=pharmacy], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index f15dc1d6f..aa7ee84b5 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -916,6 +916,7 @@ railway-level_crossing # icon z17- railway-platform # caption z16- (also has area z16-) === 1650 +amenity-animal_shelter # icon z17- (also has caption(optional) z17-) amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) @@ -1877,6 +1878,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # tourism-picnic_site # caption(optional) z16- (also has icon z16-) # === -8200 +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) # amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3b14846e5..01fd40b15 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -916,6 +916,7 @@ railway-level_crossing # icon z17- railway-platform # caption z16- (also has area z16-) === 1650 +amenity-animal_shelter # icon z17- (also has caption(optional) z17-) amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) @@ -1880,6 +1881,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # tourism-picnic_site # caption(optional) z14- (also has icon z14-) # === -8200 +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) # amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 06bc978ec..cee9b71b1 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -197,6 +197,7 @@ "type.amenity.vehicle_inspection" = "Vehicle Inspection"; "type.amenity.vending_machine.fuel" = "Fuel Pump"; "type.amenity.veterinary" = "Veterinary Doctor"; +"type.amenity.animal_shelter" = "Animal Shelter"; "type.amenity.waste_basket" = "Trash Bin"; "type.amenity.waste_disposal" = "Dumpster"; "type.amenity.waste_transfer_station" = "Waste Transfer Station"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings index 698f0504a..18ddbfa26 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings @@ -184,6 +184,7 @@ "type.amenity.vehicle_inspection" = "Техосмотр автомобиля"; "type.amenity.vending_machine.fuel" = "Топливная колонка"; "type.amenity.veterinary" = "Ветеринарная клиника"; +"type.amenity.animal_shelter" = "Приют для животных"; "type.amenity.waste_basket" = "Урна"; "type.amenity.waste_disposal" = "Мусорный контейнер"; "type.amenity.waste_transfer_station" = "Станция перевалки отходов";