diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 65ffd5662..91c93e459 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -43,6 +43,11 @@ Motorcycle Rental Car Sharing Car Wash + Telescope + Telescope (Optical) + Telescope (Radio) + Telescope (Gamma) + Observatory Casino Gambling Adult Gaming Centre diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 988370596..17c6b8eae 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -345,6 +345,8 @@ "shop-dry_cleaning": "3Dry Cleaner|cleaning", "shop-tyres|@shop": "3Tyre|tyres", "amenity-car_wash": "3Car Wash", +"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "5Telescope", +"man_made-observatory": "4Observatory", "amenity-veterinary": "Veterinary Doctor|4veterinary", "amenity-animal_shelter": "Animal Shelter", "@charging_station": "4Charging Station|charging", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 314e0914c..43d9062dc 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -634,11 +634,11 @@ deprecated|deprecated;511;x deprecated|deprecated;512;x sport|curling;513; deprecated|deprecated;514;x -deprecated|deprecated;515;x -deprecated|deprecated;516;x -deprecated|deprecated;517;x -deprecated|deprecated;518;x -deprecated|deprecated;519;x +man_made|telescope;515; +man_made|telescope|optical;[man_made=telescope][telescope:type=optical];;name;int_name;516; +man_made|telescope|radio;[man_made=telescope][telescope:type=radio];;name;int_name;517; +man_made|telescope|gamma;[man_made=telescope][telescope:type=gamma];;name;int_name;518; +man_made|observatory;519; sport|diving;520; #~270k uses. man_made|utility_pole;521; diff --git a/data/styles/default/dark/symbols/observatory-m.svg b/data/styles/default/dark/symbols/observatory-m.svg new file mode 100644 index 000000000..bc147d4fe --- /dev/null +++ b/data/styles/default/dark/symbols/observatory-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-gamma-m.svg b/data/styles/default/dark/symbols/telescope-gamma-m.svg new file mode 100644 index 000000000..119beb8d6 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-gamma-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-m.svg b/data/styles/default/dark/symbols/telescope-m.svg new file mode 100644 index 000000000..54c1e4ce7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-optical-m.svg b/data/styles/default/dark/symbols/telescope-optical-m.svg new file mode 100644 index 000000000..c6da5b2c7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-optical-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-radio-m.svg b/data/styles/default/dark/symbols/telescope-radio-m.svg new file mode 100644 index 000000000..38db2ffc7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-radio-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index b17a02e45..17f3d11ee 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -915,6 +915,11 @@ node|z15-[leisure=sports_centre][sport=swimming], node|z17-[highway=ladder], node|z18-[amenity=dojo], node|z18-[amenity=vending_machine], +node|z18-[man_made=telescope], +node|z17-[man_made=telescope][telescope:type=optical], +node|z17-[man_made=telescope][telescope:type=radio], +node|z17-[man_made=telescope][telescope:type=gamma], +node|z16-[man_made=observatory], node|z17-[amenity=fire_station], node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], @@ -1576,6 +1581,18 @@ node|z17-[amenity=parcel_locker], node|z18-[amenity=vending_machine][vending=fuel], {icon-image: fuel-dispenser-m.svg;} +node|z18-[man_made=telescope], +{icon-image: telescope-m.svg;} +node|z17-[man_made=telescope][telescope:type=optical], +{icon-image: telescope-optical-m.svg;} +node|z17-[man_made=telescope][telescope:type=radio], +{icon-image: telescope-radio-m.svg;} +node|z17-[man_made=telescope][telescope:type=gamma], +{icon-image: telescope-gamma-m.svg;} + +node|z16-[man_made=observatory], +{icon-image: observatory-m.svg;} + node|z17-[aeroway=gate], {icon-image: airport_gate-m.svg;font-size: 11;} diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss index ee9c8dc32..8f18a1f62 100644 --- a/data/styles/default/include/Icons_Label_Colors.mapcss +++ b/data/styles/default/include/Icons_Label_Colors.mapcss @@ -135,6 +135,7 @@ node[amenity=university][name], node[barrier=border_control], node[building=guardhouse], node[man_made=communications_tower], +node[man_made=observatory], node[office=diplomatic], node[office=security], node[shop=money_lender], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 7dbaa87ad..fa908eed0 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -989,6 +989,7 @@ leisure-escape_game # icon z17- (also has captio leisure-fitness_centre # icon z16- (also has caption(optional) z17-) leisure-hackerspace # icon z17- (also has caption(optional) z17-) leisure-sauna # icon z17- (also has caption(optional) z17-) +man_made-observatory # icon z16- (also has caption(optional) z16-) office-estate_agent # icon z18- (also has caption(optional) z18-) office-government # icon z18- (also has caption(optional) z18-) office-insurance # icon z18- (also has caption(optional) z18-) @@ -1134,6 +1135,8 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-) highway-elevator # icon z17- leisure-picnic_table # icon z17- (also has caption(optional) z17-) +man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +man_made-telescope-radio # icon z17- (also has caption(optional) z17-) man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) @@ -2009,6 +2012,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-fitness_centre # caption(optional) z17- (also has icon z16-) # leisure-hackerspace # caption(optional) z17- (also has icon z17-) # leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z16-) # office-estate_agent # caption(optional) z18- (also has icon z18-) # office-government # caption(optional) z18- (also has icon z18-) # office-insurance # caption(optional) z18- (also has icon z18-) @@ -2149,6 +2153,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-) # leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) # man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) # man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) # natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) @@ -2337,6 +2343,7 @@ amenity-vending_machine-food # icon z18- (also has captio amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) building-address # caption z16- +man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 amenity-bench # icon z18- (also has caption(optional) z19-) @@ -2346,6 +2353,7 @@ amenity-waste_disposal # icon z18- (also has captio emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) emergency-phone # icon z17- +man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 amenity-waste_basket # icon z18- (also has caption(optional) z19-) @@ -2379,6 +2387,8 @@ entrance-exit # icon z17- (also has captio # entrance-exit # caption(optional) z19- (also has icon z17-) # man_made-cairn # caption(optional) z19- (also has icon z19-) # man_made-survey_point # caption(optional) z18- (also has icon z18-) +# man_made-telescope # caption(optional) z18- (also has icon z18-) +# man_made-telescope-optical # caption(optional) z17- (also has icon z17-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z16- (also has icon z16-) # tourism-information-board # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/default/light/symbols/observatory-m.svg b/data/styles/default/light/symbols/observatory-m.svg new file mode 100644 index 000000000..b6dfbcfaf --- /dev/null +++ b/data/styles/default/light/symbols/observatory-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-gamma-m.svg b/data/styles/default/light/symbols/telescope-gamma-m.svg new file mode 100644 index 000000000..cf6949a0b --- /dev/null +++ b/data/styles/default/light/symbols/telescope-gamma-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-m.svg b/data/styles/default/light/symbols/telescope-m.svg new file mode 100644 index 000000000..747d7da42 --- /dev/null +++ b/data/styles/default/light/symbols/telescope-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-optical-m.svg b/data/styles/default/light/symbols/telescope-optical-m.svg new file mode 100644 index 000000000..4fd3b184e --- /dev/null +++ b/data/styles/default/light/symbols/telescope-optical-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-radio-m.svg b/data/styles/default/light/symbols/telescope-radio-m.svg new file mode 100644 index 000000000..e8b0fdb7a --- /dev/null +++ b/data/styles/default/light/symbols/telescope-radio-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 5e6532c57..7b937f3d5 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -269,6 +269,9 @@ node|z16-[man_made=survey_point], area|z14-[highway=rest_area], {icon-image: picnic-m.svg;} +node|z15-[man_made=observatory], +{icon-image: observatory-m.svg;} + node|z15-[amenity=toilets], {icon-image: toilets-m.svg; font-size: 11;} diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 8c25a3c0d..ce75f564a 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -989,6 +989,7 @@ leisure-escape_game # icon z17- (also has captio leisure-fitness_centre # icon z16- (also has caption(optional) z17-) leisure-hackerspace # icon z17- (also has caption(optional) z17-) leisure-sauna # icon z17- (also has caption(optional) z17-) +man_made-observatory # icon z15- (also has caption(optional) z16-) office-estate_agent # icon z18- (also has caption(optional) z18-) office-government # icon z18- (also has caption(optional) z18-) office-insurance # icon z18- (also has caption(optional) z18-) @@ -1134,6 +1135,8 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) highway-elevator # icon z17- leisure-picnic_table # icon z15- (also has caption(optional) z16-) +man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +man_made-telescope-radio # icon z17- (also has caption(optional) z17-) man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) @@ -2012,6 +2015,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-fitness_centre # caption(optional) z17- (also has icon z16-) # leisure-hackerspace # caption(optional) z17- (also has icon z17-) # leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z15-) # office-estate_agent # caption(optional) z18- (also has icon z18-) # office-government # caption(optional) z18- (also has icon z18-) # office-insurance # caption(optional) z18- (also has icon z18-) @@ -2152,6 +2156,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-) # leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) # man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) # man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) # natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) @@ -2343,6 +2349,7 @@ amenity-vending_machine-food # icon z18- (also has captio amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) building-address # caption z16- +man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 amenity-bench # icon z18- (also has caption(optional) z19-) @@ -2352,6 +2359,7 @@ amenity-waste_disposal # icon z18- (also has captio emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) emergency-phone # icon z17- +man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 amenity-waste_basket # icon z18- (also has caption(optional) z19-) @@ -2385,6 +2393,8 @@ entrance-exit # icon z17- (also has captio # entrance-exit # caption(optional) z19- (also has icon z17-) # man_made-cairn # caption(optional) z17- (also has icon z17-) # man_made-survey_point # caption(optional) z15- (also has icon z14-) +# man_made-telescope # caption(optional) z18- (also has icon z18-) +# man_made-telescope-optical # caption(optional) z17- (also has icon z17-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z15- (also has icon z15-) # tourism-information-board # caption(optional) z15- (also has icon z15-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 0a72298a0..03c6d3c7b 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -38,6 +38,11 @@ "type.amenity.motorcycle_rental" = "Motorcycle Rental"; "type.amenity.car_sharing" = "Car Sharing"; "type.amenity.car_wash" = "Car Wash"; +"type.man_made.telescope" = "Telescope"; +"type.man_made.telescope.optical" = "Telescope (Optical)"; +"type.man_made.telescope.radio" = "Telescope (Radio)"; +"type.man_made.telescope.gamma" = "Telescope (Gamma)"; +"type.man_made.observatory" = "Observatory"; "type.amenity.casino" = "Casino"; "type.amenity.gambling" = "Gambling"; "type.leisure.adult_gaming_centre" = "Adult Gaming Centre"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 219dc9f33..fe4a006f5 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -44,6 +44,11 @@ "type.amenity.motorcycle_rental" = "Motorcycle Rental"; "type.amenity.car_sharing" = "Car Sharing"; "type.amenity.car_wash" = "Car Wash"; +"type.man_made.telescope" = "Telescope"; +"type.man_made.telescope.optical" = "Telescope (Optical)"; +"type.man_made.telescope.radio" = "Telescope (Radio)"; +"type.man_made.telescope.gamma" = "Telescope (Gamma)"; +"type.man_made.observatory" = "Observatory"; "type.amenity.casino" = "Casino"; "type.amenity.gambling" = "Gambling"; "type.amenity.studio" = "Media Studio";