diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index e28204719d..92d25e8b54 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -483,6 +483,7 @@ Service Area Speed Camera Stairs + Ladder Bridge diff --git a/data/categories.txt b/data/categories.txt index d227e08056..f9be7bec10 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -8166,6 +8166,45 @@ sw:Jia fa:مسیر mr:मार्ग +highway-ladder +en:Ladder|Climb +ar:السلم +be:Драбіны +bg:Стълба +ca:Escala +cs:Žebřík +da:Stige +de:Leiter +el:Σκάλα +es:Escalera +et:Redel +eu:Eskailera +fa:نردبان +fi:Tikkaat +fr:Échelle +he:סוּלָם +hi:सीढ़ीhu:Létra +id:Tangga +it:Scala +ja:はしご +ko:사다리 +lv:Trepes +mr:शिडीnb:Stige +nl:Ladder +pl:Drabina +pt:Escada +ro:Scară +ru:Лестница +sk:Rebrík +sv:Stege +sw:Ngazi +th:บันไดปีน +tr:Merdiven +uk:Драбина. +vi:Thang +zh-Hans:梯子 +zh-Hant:梯子 + highway-pedestrian|highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-unclassified|highway-motorway_link|highway-motorway|highway-cycleway en:Street|Road|Drive|Lane|Avenue ru:Улица diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 35b77b7cbc..f899f90dc2 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -594,7 +594,7 @@ emergency|lifeguard;475; emergency|mountain_rescue;476; aerialway|platter;477; man_made|flare;478; -deprecated|deprecated;479;x +highway|ladder;479; railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480; boundary|protected_area|1;[boundary=protected_area][protect_class=1],[boundary=protected_area][protect_class=1a],[boundary=protected_area][protect_class=1b];;name;int_name;481; boundary|protected_area|2;[boundary=protected_area][protect_class=2];;name;int_name;482; @@ -1740,4 +1740,4 @@ railway|subway_entrance|hongkong;[railway=subway_entrance][city=hongkong];;name; railway|station|light_rail|berlin;[railway=station][station=light_rail][city=berlin],[railway=halt][station=light_rail][city=berlin];;name;int_name;1619; railway|station|subway|shenzhen;[railway=station][transport=subway][city=shenzhen],[railway=station][station=subway][city=shenzhen];;name;int_name;1620; railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name;int_name;1621; -shop|hearing_aids;1622; +shop|hearing_aids;1622; \ No newline at end of file diff --git a/data/styles/default/dark/symbols/ladder-m.svg b/data/styles/default/dark/symbols/ladder-m.svg new file mode 100644 index 0000000000..aed7819df9 --- /dev/null +++ b/data/styles/default/dark/symbols/ladder-m.svg @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 6a05256924..938c2d2c14 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1041,6 +1041,7 @@ node|z17-[aeroway=gate], area|z17-[aeroway=gate], node|z17-[sport], area|z17-[sport], +node|z17-[highway=ladder], node|z18-[amenity=dojo], area|z18-[amenity=dojo], node|z18-[amenity=vending_machine], @@ -1549,6 +1550,9 @@ node|z16-[barrier=turnstile], node|z16-[barrier=entrance], {icon-image: entrance-barrier-s.svg; font-size: 11;} +node|z17-[highway=ladder], +{icon-image: ladder-m.svg;font-size: 11;} + node|z16-[barrier=gate], node|z16-[barrier=kissing_gate], {icon-image: gate-s.svg;font-size: 11;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 2f7063ee5d..afd3033126 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1093,6 +1093,7 @@ man_made-flagpole # icon z15- man_made-flare # icon z16- (also has caption(optional) z18-) man_made-tower # icon z16- (also has caption(optional) z18-) man_made-tower-communication # icon z16- (also has caption(optional) z18-) +highway-ladder === 850 junction # caption z17- diff --git a/data/styles/default/light/symbols/ladder-m.svg b/data/styles/default/light/symbols/ladder-m.svg new file mode 100644 index 0000000000..08a8175575 --- /dev/null +++ b/data/styles/default/light/symbols/ladder-m.svg @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 751d733066..59c123de6d 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -362,6 +362,9 @@ node|z14-[barrier=border_control], node|z14-[highway=ford], {icon-image: ford-m.svg;} +node|z16-[highway=ladder], +{icon-image: ladder-m.svg;} + node|z13[power=tower], {icon-image: mast-m.svg;} node|z14-[power=tower], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index a0743b8cc7..f43ac5ad0b 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -713,6 +713,7 @@ highway-path-tunnel # pathtext z13- (also has li === 2820 highway-steps # pathtext z13- (also has line z12-) +highway-ladder highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 172e8a8d74..6b1ab8de20 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -540,6 +540,7 @@ "type.highway.services" = "Service Area"; "type.highway.speed_camera" = "Speed Camera"; "type.highway.steps" = "Stairs"; +"type.highway.ladder" = "Ladder"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.steps.bridge" = "Bridge";