[routing] Added additional hwtags. #5192
101 changed files with 1777 additions and 72 deletions
|
|
@ -1408,11 +1408,13 @@
|
|||
<string name="type.power.pole">عمود كهرباء</string>
|
||||
<string name="type.power.substation">محطة كهرباء فرعية</string>
|
||||
<string name="type.power.tower">عمود كهرباء</string>
|
||||
<string name="type.railway.funicular">حبلي</string>
|
||||
<string name="type.railway.halt">محطة سكك حديدية</string>
|
||||
<string name="type.railway.level_crossing">مزلقان</string>
|
||||
<string name="type.railway.monorail">اتجاه واحد</string>
|
||||
<string name="type.railway.rail">خط سكة حديد</string>
|
||||
<string name="type.railway.station">محطة سكك حديدية</string>
|
||||
<string name="type.railway.station.funicular">حبلي</string>
|
||||
<string name="type.railway.station.light_rail">محطة سكك حديدية</string>
|
||||
<string name="type.railway.station.monorail">محطة سكك حديدية</string>
|
||||
<string name="type.railway.station.subway">محطة مترو</string>
|
||||
|
|
|
|||
|
|
@ -1068,7 +1068,9 @@
|
|||
<string name="type.power.plant.hydro">Гідраэлектрастанцыя</string>
|
||||
<string name="type.power.plant.solar">Сонечная электрастанцыя</string>
|
||||
<string name="type.power.plant.wind">Ветраэлектрастанцыя</string>
|
||||
<string name="type.railway.funicular">Фунікулёр</string>
|
||||
<string name="type.railway.platform">Чыгуначная платформа</string>
|
||||
<string name="type.railway.station.funicular">Фунікулёр</string>
|
||||
<string name="type.shop.bathroom_furnishing">Мэбля для ванных пакояў</string>
|
||||
<string name="type.shop.beverages">Напоі</string>
|
||||
<string name="type.shop.cannabis">Крама канабіса</string>
|
||||
|
|
|
|||
|
|
@ -939,6 +939,8 @@
|
|||
<string name="type.power.plant.hydro">Водноелектрическа централа</string>
|
||||
<string name="type.power.plant.solar">Слънчева електроцентрала</string>
|
||||
<string name="type.power.plant.wind">Вятърна електроцентрала</string>
|
||||
<string name="type.railway.funicular">Фуникуляр</string>
|
||||
<string name="type.railway.station.funicular">Фуникуляр</string>
|
||||
<string name="type.shop.bathroom_furnishing">Обзавеждане за баня</string>
|
||||
<string name="type.shop.cannabis">Магазин за канабис</string>
|
||||
<string name="type.shop.carpet">Килими</string>
|
||||
|
|
|
|||
|
|
@ -757,6 +757,8 @@
|
|||
<string name="type.power.plant.hydro">Central hidroelèctrica</string>
|
||||
<string name="type.power.plant.solar">Central d\'energia solar</string>
|
||||
<string name="type.power.plant.wind">Central eòlica</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.shop.bathroom_furnishing">Mobles de bany</string>
|
||||
<string name="type.shop.cannabis">Botiga de cànnabis</string>
|
||||
<string name="type.shop.carpet">Catifes</string>
|
||||
|
|
|
|||
|
|
@ -1304,11 +1304,13 @@
|
|||
<string name="type.power.pole">Sloup elektrického vedení</string>
|
||||
<string name="type.power.substation">Rozvodna</string>
|
||||
<string name="type.power.tower">Sloup elektrického vedení</string>
|
||||
<string name="type.railway.funicular">Lanovka</string>
|
||||
<string name="type.railway.halt">Železniční stanice</string>
|
||||
<string name="type.railway.level_crossing">Přejezd</string>
|
||||
<string name="type.railway.monorail">Jednokolejná železnice</string>
|
||||
<string name="type.railway.rail">Železnice</string>
|
||||
<string name="type.railway.station">Železniční stanice</string>
|
||||
<string name="type.railway.station.funicular">Lanovka</string>
|
||||
<string name="type.railway.station.light_rail">Železniční stanice</string>
|
||||
<string name="type.railway.station.monorail">Železniční stanice</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1285,11 +1285,13 @@
|
|||
<string name="type.power.pole">El-pol</string>
|
||||
<string name="type.power.substation">Transformerstation</string>
|
||||
<string name="type.power.tower">El-pol</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.halt">Togstation</string>
|
||||
<string name="type.railway.level_crossing">Niveauskæring</string>
|
||||
<string name="type.railway.monorail">Monorail</string>
|
||||
<string name="type.railway.rail">Jernbane</string>
|
||||
<string name="type.railway.station">Togstation</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Togstation</string>
|
||||
<string name="type.railway.station.monorail">Togstation</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1481,6 +1481,7 @@
|
|||
<string name="type.railway.spur.bridge">Anschlussgleis</string>
|
||||
<string name="type.railway.spur.tunnel">Anschlussgleis</string>
|
||||
<string name="type.railway.station">Bahnhof</string>
|
||||
<string name="type.railway.station.funicular">Standseilbahn</string>
|
||||
<string name="type.railway.station.light_rail">Stadtbahnbahnhof</string>
|
||||
<string name="type.railway.station.monorail">Bahnhof</string>
|
||||
<string name="type.railway.station.subway">U-Bahn-Station</string>
|
||||
|
|
@ -1900,6 +1901,7 @@
|
|||
<string name="type.waterway">Wasserweg</string>
|
||||
<string name="type.waterway.canal">Kanal</string>
|
||||
<string name="type.waterway.canal.tunnel">Kanal</string>
|
||||
<string name="type.waterway.fish_pass">Fischtreppe</string>
|
||||
<string name="type.waterway.dam">Staudamm</string>
|
||||
<string name="type.waterway.ditch">Graben</string>
|
||||
<string name="type.waterway.ditch.tunnel">Graben</string>
|
||||
|
|
|
|||
|
|
@ -1297,11 +1297,13 @@
|
|||
<string name="type.power.pole">Πυλώνες μεταφοράς ρεύματος</string>
|
||||
<string name="type.power.substation">Υποσταθμός</string>
|
||||
<string name="type.power.tower">Πυλώνες μεταφοράς ρεύματος</string>
|
||||
<string name="type.railway.funicular">Μονωτικό τρενάκι</string>
|
||||
<string name="type.railway.halt">Σιδηροδρομικός σταθμός</string>
|
||||
<string name="type.railway.level_crossing">Σιδηροδρομική διέλευση</string>
|
||||
<string name="type.railway.monorail">Μονοαξονικός σιδηρόδρομος</string>
|
||||
<string name="type.railway.rail">Σιδηρόδρομος</string>
|
||||
<string name="type.railway.station">Σιδηροδρομικός σταθμός</string>
|
||||
<string name="type.railway.station.funicular">Μονωτικό τρενάκι</string>
|
||||
<string name="type.railway.station.light_rail">Σιδηροδρομικός σταθμός</string>
|
||||
<string name="type.railway.station.monorail">Σιδηροδρομικός σταθμός</string>
|
||||
<string name="type.railway.station.subway">Μετρό</string>
|
||||
|
|
|
|||
|
|
@ -1483,6 +1483,7 @@
|
|||
<string name="type.railway.platform">Plataforma de vía férrea</string>
|
||||
<string name="type.railway.rail">Ferrocarril</string>
|
||||
<string name="type.railway.station">Estación de tren</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Estación de tren</string>
|
||||
<string name="type.railway.station.monorail">Estación de tren</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1471,7 +1471,7 @@
|
|||
<string name="type.railway.construction">Raudtee ehitus</string>
|
||||
<string name="type.railway.crossing">Raudtee ülesõit</string>
|
||||
<string name="type.railway.disused">Kasutamata raudtee</string>
|
||||
<string name="type.railway.funicular">Funikulöör</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.funicular.bridge">Funikulöör</string>
|
||||
<string name="type.railway.funicular.tunnel">Funikulöör</string>
|
||||
<string name="type.railway.halt">Murdepunkt</string>
|
||||
|
|
@ -1501,6 +1501,7 @@
|
|||
<string name="type.railway.spur.bridge">Rööbastee sild</string>
|
||||
<string name="type.railway.spur.tunnel">Rööbastee tunnel</string>
|
||||
<string name="type.railway.station">Raudtee jaam</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Raudtee jaam</string>
|
||||
<string name="type.railway.station.monorail">Raudtee jaam</string>
|
||||
<string name="type.railway.station.subway">Metroo</string>
|
||||
|
|
|
|||
|
|
@ -1406,11 +1406,13 @@
|
|||
<string name="type.power.substation">Azpiestazioa</string>
|
||||
<string name="type.power.tower">Zutabe elektrikoa</string>
|
||||
<string name="type.public_transport">Garraio publikoa</string>
|
||||
<string name="type.railway.funicular">Funikularra</string>
|
||||
<string name="type.railway.halt">Tren geltokian</string>
|
||||
<string name="type.railway.level_crossing">Trenbide-pasagunea</string>
|
||||
<string name="type.railway.monorail">Tren monoraila</string>
|
||||
<string name="type.railway.rail">Trenbidea</string>
|
||||
<string name="type.railway.station">Tren geltokian</string>
|
||||
<string name="type.railway.station.funicular">Funikularra</string>
|
||||
<string name="type.railway.station.light_rail">Tren geltokian</string>
|
||||
<string name="type.railway.station.monorail">Tren geltokian</string>
|
||||
<string name="type.railway.station.subway">Metroa</string>
|
||||
|
|
|
|||
|
|
@ -1207,11 +1207,13 @@
|
|||
<string name="type.power.plant.wind">نیروگاه بادی</string>
|
||||
<string name="type.power.pole">برج قدرت</string>
|
||||
<string name="type.power.tower">برج قدرت</string>
|
||||
<string name="type.railway.funicular">فونیکولور</string>
|
||||
<string name="type.railway.halt">ایستگاه قطار</string>
|
||||
<string name="type.railway.level_crossing">تقاطع راه آهن</string>
|
||||
<string name="type.railway.monorail">مونوریل</string>
|
||||
<string name="type.railway.rail">راه آهن</string>
|
||||
<string name="type.railway.station">ایستگاه قطار</string>
|
||||
<string name="type.railway.station.funicular">فونیکولور</string>
|
||||
<string name="type.railway.station.light_rail">ایستگاه قطار</string>
|
||||
<string name="type.railway.station.monorail">ایستگاه قطار</string>
|
||||
<string name="type.railway.station.subway">حمل و نقل</string>
|
||||
|
|
|
|||
|
|
@ -1346,11 +1346,13 @@
|
|||
<string name="type.power.pole">Sähköpylväs</string>
|
||||
<string name="type.power.substation">Muuntoasema</string>
|
||||
<string name="type.power.tower">Sähköpylväs</string>
|
||||
<string name="type.railway.funicular">Köysirata</string>
|
||||
<string name="type.railway.halt">Rautatieasema</string>
|
||||
<string name="type.railway.level_crossing">Rautatien tasoristeys</string>
|
||||
<string name="type.railway.monorail">Monorail (kohorata)</string>
|
||||
<string name="type.railway.rail">Rautatie</string>
|
||||
<string name="type.railway.station">Rautatieasema</string>
|
||||
<string name="type.railway.station.funicular">Köysirata</string>
|
||||
<string name="type.railway.station.light_rail">Rautatieasema</string>
|
||||
<string name="type.railway.station.monorail">Rautatieasema</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1450,6 +1450,7 @@
|
|||
<string name="type.railway.rail.bridge">Chemin de fer</string>
|
||||
<string name="type.railway.rail.tunnel">Chemin de fer</string>
|
||||
<string name="type.railway.station">Gare</string>
|
||||
<string name="type.railway.station.funicular">Funiculaire</string>
|
||||
<string name="type.railway.station.light_rail">Gare</string>
|
||||
<string name="type.railway.station.monorail">Gare</string>
|
||||
<string name="type.railway.station.subway">Station de métro</string>
|
||||
|
|
|
|||
|
|
@ -1314,11 +1314,13 @@
|
|||
<string name="type.power.pole">Villanyoszlop</string>
|
||||
<string name="type.power.substation">Kapcsolószekrény</string>
|
||||
<string name="type.power.tower">Villanyoszlop</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.halt">Vonatmegálló</string>
|
||||
<string name="type.railway.level_crossing">Vasúti átjáró</string>
|
||||
<string name="type.railway.monorail">Egysínű vasút</string>
|
||||
<string name="type.railway.rail">Vasút</string>
|
||||
<string name="type.railway.station">Vonatmegálló</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Vonatmegálló</string>
|
||||
<string name="type.railway.station.monorail">Vonatmegálló</string>
|
||||
<string name="type.railway.station.subway">Földalatti</string>
|
||||
|
|
|
|||
|
|
@ -1289,11 +1289,13 @@
|
|||
<string name="type.power.pole">Menara listrik</string>
|
||||
<string name="type.power.substation">Stasiun bawah tanah</string>
|
||||
<string name="type.power.tower">Menara listrik</string>
|
||||
<string name="type.railway.funicular">Kereta gantung</string>
|
||||
<string name="type.railway.halt">Rel kereta api</string>
|
||||
<string name="type.railway.level_crossing">Perlintasan Kereta Api</string>
|
||||
<string name="type.railway.monorail">Monorel</string>
|
||||
<string name="type.railway.rail">Kereta api</string>
|
||||
<string name="type.railway.station">Rel kereta api</string>
|
||||
<string name="type.railway.station.funicular">Kereta gantung</string>
|
||||
<string name="type.railway.station.light_rail">Rel kereta api</string>
|
||||
<string name="type.railway.station.monorail">Rel kereta api</string>
|
||||
<string name="type.railway.station.subway">Stasiun bawah tanah</string>
|
||||
|
|
|
|||
|
|
@ -1423,12 +1423,14 @@
|
|||
<string name="type.public_transport">Trasporto pubblico</string>
|
||||
<string name="type.railway">Ferrovia</string>
|
||||
<string name="type.railway.construction">Binari in costruzione</string>
|
||||
<string name="type.railway.funicular">Funicolare</string>
|
||||
<string name="type.railway.halt">Stazione ferroviaria</string>
|
||||
<string name="type.railway.level_crossing">Passaggio a livello</string>
|
||||
<string name="type.railway.light_rail">Metropolitana</string>
|
||||
<string name="type.railway.monorail">Monorotaia</string>
|
||||
<string name="type.railway.rail">Binari</string>
|
||||
<string name="type.railway.station">Stazione ferroviaria</string>
|
||||
<string name="type.railway.station.funicular">Funicolare</string>
|
||||
<string name="type.railway.station.light_rail">Stazione ferroviaria</string>
|
||||
<string name="type.railway.station.monorail">Stazione ferroviaria</string>
|
||||
<string name="type.railway.station.subway">Stazione della metrò</string>
|
||||
|
|
|
|||
|
|
@ -610,6 +610,8 @@
|
|||
<string name="type.power.plant.hydro">תחנת כוח הידרואלקטרית</string>
|
||||
<string name="type.power.plant.solar">תחנת כוח סולארית</string>
|
||||
<string name="type.power.plant.wind">תחנת כוח רוח</string>
|
||||
<string name="type.railway.funicular">רַכֶּבֶל</string>
|
||||
<string name="type.railway.station.funicular">רַכֶּבֶל</string>
|
||||
<string name="type.shop.bathroom_furnishing">ריהוט חדר רחצה</string>
|
||||
<string name="type.shop.cannabis">חנות קנאביס</string>
|
||||
<string name="type.shop.carpet">שטיחים</string>
|
||||
|
|
|
|||
|
|
@ -1390,7 +1390,7 @@
|
|||
<string name="type.railway.construction">建設中の鉄道</string>
|
||||
<string name="type.railway.crossing">歩行者用踏切</string>
|
||||
<string name="type.railway.disused">休止線</string>
|
||||
<string name="type.railway.funicular">ケーブルカー</string>
|
||||
<string name="type.railway.funicular">フニクラ</string>
|
||||
<string name="type.railway.funicular.bridge">ケーブルカー(橋)</string>
|
||||
<string name="type.railway.funicular.tunnel">ケーブルカー(トンネル)</string>
|
||||
<string name="type.railway.halt">鉄道駅</string>
|
||||
|
|
@ -1420,6 +1420,7 @@
|
|||
<string name="type.railway.spur.bridge">引き込み線(橋)</string>
|
||||
<string name="type.railway.spur.tunnel">引き込み線(トンネル)</string>
|
||||
<string name="type.railway.station">鉄道駅</string>
|
||||
<string name="type.railway.station.funicular">フニクラ</string>
|
||||
<string name="type.railway.station.light_rail">鉄道駅</string>
|
||||
<string name="type.railway.station.monorail">鉄道駅</string>
|
||||
<string name="type.railway.station.subway">地下鉄</string>
|
||||
|
|
|
|||
|
|
@ -1294,11 +1294,13 @@
|
|||
<string name="type.power.pole">전봇대</string>
|
||||
<string name="type.power.substation">변전소</string>
|
||||
<string name="type.power.tower">전봇대</string>
|
||||
<string name="type.railway.funicular">케이블카</string>
|
||||
<string name="type.railway.halt">기차역</string>
|
||||
<string name="type.railway.level_crossing">철도 건널목</string>
|
||||
<string name="type.railway.monorail">모노레일</string>
|
||||
<string name="type.railway.rail">철로</string>
|
||||
<string name="type.railway.station">기차역</string>
|
||||
<string name="type.railway.station.funicular">케이블카</string>
|
||||
<string name="type.railway.station.light_rail">기차역</string>
|
||||
<string name="type.railway.station.monorail">기차역</string>
|
||||
<string name="type.railway.station.subway">지하철</string>
|
||||
|
|
|
|||
|
|
@ -1336,7 +1336,7 @@
|
|||
<string name="type.railway">रेल्वे</string>
|
||||
<string name="type.railway.construction">रेल्वेचे बांधकाम</string>
|
||||
<string name="type.railway.crossing">रेल्वे ओलांडणी</string>
|
||||
<string name="type.railway.funicular">हवाई रज्जुमार्ग</string>
|
||||
<string name="type.railway.funicular">फ्युनिक्युलर</string>
|
||||
<string name="type.railway.funicular.bridge">हवाई रज्जुमार्ग</string>
|
||||
<string name="type.railway.funicular.tunnel">हवाई रज्जुमार्ग</string>
|
||||
<string name="type.railway.halt">रेल्वे स्थानक</string>
|
||||
|
|
@ -1353,6 +1353,7 @@
|
|||
<string name="type.railway.rail.motor_vehicle">रेल्वे</string>
|
||||
<string name="type.railway.rail.tunnel">रेल्वे</string>
|
||||
<string name="type.railway.station">रेल्वे स्थानक</string>
|
||||
<string name="type.railway.station.funicular">फ्युनिक्युलर</string>
|
||||
<string name="type.railway.station.light_rail">रेल्वे स्थानक</string>
|
||||
<string name="type.railway.station.monorail">रेल्वे स्थानक</string>
|
||||
<string name="type.railway.station.subway">भुयारी मार्ग</string>
|
||||
|
|
|
|||
|
|
@ -1349,6 +1349,7 @@
|
|||
<string name="type.power.tower">Strømmast</string>
|
||||
<string name="type.public_transport">Offentlig transport</string>
|
||||
<string name="type.railway">Jernbane</string>
|
||||
<string name="type.railway.funicular">Kabelbane</string>
|
||||
<string name="type.railway.halt">Togstasjon</string>
|
||||
<string name="type.railway.level_crossing">Planovergang</string>
|
||||
<string name="type.railway.monorail">Monorail</string>
|
||||
|
|
@ -1357,6 +1358,7 @@
|
|||
<string name="type.railway.preserved">Museumsjernbane</string>
|
||||
<string name="type.railway.rail">Toglinje</string>
|
||||
<string name="type.railway.station">Togstasjon</string>
|
||||
<string name="type.railway.station.funicular">Kabelbane</string>
|
||||
<string name="type.railway.station.light_rail">Togstasjon</string>
|
||||
<string name="type.railway.station.monorail">Togstasjon</string>
|
||||
<string name="type.railway.station.subway">T-bane</string>
|
||||
|
|
|
|||
|
|
@ -1476,7 +1476,7 @@
|
|||
<string name="type.railway.construction">Treinspoor in aanbouw</string>
|
||||
<string name="type.railway.crossing">Spoorwegovergang</string>
|
||||
<string name="type.railway.disused">Ongebruikt spoor</string>
|
||||
<string name="type.railway.funicular">Kabelspoorweg</string>
|
||||
<string name="type.railway.funicular">Tunnel</string>
|
||||
<string name="type.railway.funicular.bridge">Kabelspoorbuur</string>
|
||||
<string name="type.railway.funicular.tunnel">Kabelspoortunnel</string>
|
||||
<string name="type.railway.halt">Station</string>
|
||||
|
|
@ -1506,6 +1506,7 @@
|
|||
<string name="type.railway.spur.bridge">Zijspoor-brug</string>
|
||||
<string name="type.railway.spur.tunnel">Zijspoor-tunnel</string>
|
||||
<string name="type.railway.station">Station</string>
|
||||
<string name="type.railway.station.funicular">Tunnel</string>
|
||||
<string name="type.railway.station.light_rail">Station</string>
|
||||
<string name="type.railway.station.monorail">Station</string>
|
||||
<string name="type.railway.station.subway">Metrostation</string>
|
||||
|
|
|
|||
|
|
@ -1439,11 +1439,13 @@
|
|||
<string name="type.public_transport">Transport publiczny</string>
|
||||
<string name="type.public_transport.platform">Przystanek transportu publicznego</string>
|
||||
<string name="type.railway">Kolej</string>
|
||||
<string name="type.railway.funicular">Kolejka linowa</string>
|
||||
<string name="type.railway.halt">Przystanek kolejowy</string>
|
||||
<string name="type.railway.level_crossing">Przejazd kolejowy</string>
|
||||
<string name="type.railway.monorail">Kolej jednoszynowa</string>
|
||||
<string name="type.railway.rail">Kolej</string>
|
||||
<string name="type.railway.station">Dworzec kolejowy</string>
|
||||
<string name="type.railway.station.funicular">Kolejka linowa</string>
|
||||
<string name="type.railway.station.light_rail">Dworzec kolejowy</string>
|
||||
<string name="type.railway.station.monorail">Dworzec kolejowy</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1330,7 +1330,6 @@
|
|||
<string name="type.railway.construction">Ferrovia em construção</string>
|
||||
<string name="type.railway.crossing">Passagem pedestre</string>
|
||||
<string name="type.railway.disused">Ferrovia em desuso</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.funicular.bridge">Funicular</string>
|
||||
<string name="type.railway.funicular.tunnel">Funicular</string>
|
||||
<string name="type.railway.halt">Ponto de parada</string>
|
||||
|
|
|
|||
|
|
@ -1454,6 +1454,7 @@
|
|||
<string name="type.railway.spur.bridge">Ramal de ferrovia</string>
|
||||
<string name="type.railway.spur.tunnel">Ramal de ferrovia</string>
|
||||
<string name="type.railway.station">Estação de comboios</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Estação de comboios</string>
|
||||
<string name="type.railway.station.monorail">Estação de comboios</string>
|
||||
<string name="type.railway.station.subway">Estação de metro</string>
|
||||
|
|
|
|||
|
|
@ -1309,11 +1309,13 @@
|
|||
<string name="type.power.pole">Stâlp de electricitate</string>
|
||||
<string name="type.power.substation">Stație subterană</string>
|
||||
<string name="type.power.tower">Stâlp de electricitate</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.halt">Feroviar</string>
|
||||
<string name="type.railway.level_crossing">Trecere feroviară</string>
|
||||
<string name="type.railway.monorail">Cale ferată monoșină</string>
|
||||
<string name="type.railway.rail">Cale ferată</string>
|
||||
<string name="type.railway.station">Feroviar</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Feroviar</string>
|
||||
<string name="type.railway.station.monorail">Feroviar</string>
|
||||
<string name="type.railway.station.subway">Metrou</string>
|
||||
|
|
|
|||
|
|
@ -1531,6 +1531,7 @@
|
|||
<string name="type.railway.spur.bridge">Подъездная Ж/Д</string>
|
||||
<string name="type.railway.spur.tunnel">Подъездная Ж/Д</string>
|
||||
<string name="type.railway.station">Ж/д станция</string>
|
||||
<string name="type.railway.station.funicular">Фуникулер</string>
|
||||
<string name="type.railway.station.light_rail">Ж/д станция</string>
|
||||
<string name="type.railway.station.monorail">Ж/д станция</string>
|
||||
<string name="type.railway.station.subway">Метро</string>
|
||||
|
|
|
|||
|
|
@ -1287,11 +1287,13 @@
|
|||
<string name="type.power.pole">Stĺp elektrického vedenia</string>
|
||||
<string name="type.power.substation">Rozvodňa</string>
|
||||
<string name="type.power.tower">Stĺp elektrického vedenia</string>
|
||||
<string name="type.railway.funicular">Lanovka</string>
|
||||
<string name="type.railway.halt">Železničná stanica</string>
|
||||
<string name="type.railway.level_crossing">Križovanie úrovní</string>
|
||||
<string name="type.railway.monorail">Jednokoľajnicová dráha</string>
|
||||
<string name="type.railway.rail">Železnica</string>
|
||||
<string name="type.railway.station">Železničná stanica</string>
|
||||
<string name="type.railway.station.funicular">Lanovka</string>
|
||||
<string name="type.railway.station.light_rail">Železničná stanica</string>
|
||||
<string name="type.railway.station.monorail">Železničná stanica</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1285,11 +1285,13 @@
|
|||
<string name="type.power.pole">Elstolpe</string>
|
||||
<string name="type.power.substation">Ställverk</string>
|
||||
<string name="type.power.tower">Elstolpe</string>
|
||||
<string name="type.railway.funicular">Linbana</string>
|
||||
<string name="type.railway.halt">Tågstation</string>
|
||||
<string name="type.railway.level_crossing">Järnvägskorsning</string>
|
||||
<string name="type.railway.monorail">Monorail</string>
|
||||
<string name="type.railway.rail">Järnväg</string>
|
||||
<string name="type.railway.station">Tågstation</string>
|
||||
<string name="type.railway.station.funicular">Linbana</string>
|
||||
<string name="type.railway.station.light_rail">Tågstation</string>
|
||||
<string name="type.railway.station.monorail">Tågstation</string>
|
||||
<string name="type.railway.station.subway">Tunnelbana</string>
|
||||
|
|
|
|||
|
|
@ -539,9 +539,11 @@
|
|||
<string name="type.power.plant.hydro">Kiwanda cha umeme wa maji</string>
|
||||
<string name="type.power.plant.solar">Kiwanda cha nishati ya jua</string>
|
||||
<string name="type.power.plant.wind">Kiwanda cha nguvu cha upepo</string>
|
||||
<string name="type.railway.funicular">Funicular</string>
|
||||
<string name="type.railway.level_crossing">Tambuka Reli</string>
|
||||
<string name="type.railway.monorail">Mfumo wa reli moja</string>
|
||||
<string name="type.railway.rail">Njia ya Reli</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.subway_entrance">Lango la kuingilia stesheni ya reli</string>
|
||||
<string name="type.railway.subway_entrance.adana">Lango la kuingilia stesheni ya reli</string>
|
||||
<string name="type.railway.subway_entrance.algiers">Lango la kuingilia stesheni ya reli</string>
|
||||
|
|
|
|||
|
|
@ -1294,11 +1294,13 @@
|
|||
<string name="type.power.pole">เสาไฟฟ้า</string>
|
||||
<string name="type.power.substation">สถานีไฟฟ้า</string>
|
||||
<string name="type.power.tower">เสาไฟฟ้า</string>
|
||||
<string name="type.railway.funicular">รถกระเช้าไฟฟ้า</string>
|
||||
<string name="type.railway.halt">สถานีรถไฟ</string>
|
||||
<string name="type.railway.level_crossing">ทางรถไฟตัดผ่านถนน</string>
|
||||
<string name="type.railway.monorail">รางรถไฟรางเดี่ยว</string>
|
||||
<string name="type.railway.rail">รถไฟ</string>
|
||||
<string name="type.railway.station">สถานีรถไฟ</string>
|
||||
<string name="type.railway.station.funicular">รถกระเช้าไฟฟ้า</string>
|
||||
<string name="type.railway.station.light_rail">สถานีรถไฟ</string>
|
||||
<string name="type.railway.station.monorail">สถานีรถไฟ</string>
|
||||
<string name="type.railway.station.subway">รถไฟ</string>
|
||||
|
|
|
|||
|
|
@ -1506,6 +1506,7 @@
|
|||
<string name="type.railway.spur.bridge">Düz Ray</string>
|
||||
<string name="type.railway.spur.tunnel">Düz Ray</string>
|
||||
<string name="type.railway.station">Tren İstasyonu</string>
|
||||
<string name="type.railway.station.funicular">Füniküler</string>
|
||||
<string name="type.railway.station.light_rail">Tren İstasyonu</string>
|
||||
<string name="type.railway.station.monorail">Tren İstasyonu</string>
|
||||
<string name="type.railway.station.subway">Metro</string>
|
||||
|
|
|
|||
|
|
@ -1491,6 +1491,7 @@
|
|||
<string name="type.railway.spur.bridge">Під\'їздна залізниця</string>
|
||||
<string name="type.railway.spur.tunnel">Під\'їздна залізниця</string>
|
||||
<string name="type.railway.station">Залізничний вокзал</string>
|
||||
<string name="type.railway.station.funicular">Фунікулер</string>
|
||||
<string name="type.railway.station.light_rail">Залізничний вокзал</string>
|
||||
<string name="type.railway.station.monorail">Залізничний вокзал</string>
|
||||
<string name="type.railway.station.subway">Метро</string>
|
||||
|
|
|
|||
|
|
@ -1290,11 +1290,13 @@
|
|||
<string name="type.power.pole">Trụ Điện</string>
|
||||
<string name="type.power.substation">Trạm biến áp</string>
|
||||
<string name="type.power.tower">Trụ Điện</string>
|
||||
<string name="type.railway.funicular">Đường sắt leo núi</string>
|
||||
<string name="type.railway.halt">Đường tàu hỏa</string>
|
||||
<string name="type.railway.level_crossing">Chỗ qua đường sắt</string>
|
||||
<string name="type.railway.monorail">Đường sắt một chiều</string>
|
||||
<string name="type.railway.rail">Đường sắt</string>
|
||||
<string name="type.railway.station">Đường tàu hỏa</string>
|
||||
<string name="type.railway.station.funicular">Đường sắt leo núi</string>
|
||||
<string name="type.railway.station.light_rail">Đường tàu hỏa</string>
|
||||
<string name="type.railway.station.monorail">Đường tàu hỏa</string>
|
||||
<string name="type.railway.station.subway">Ngầm</string>
|
||||
|
|
|
|||
|
|
@ -1328,6 +1328,7 @@
|
|||
<string name="type.power.pole">電塔</string>
|
||||
<string name="type.power.substation">變電所</string>
|
||||
<string name="type.power.tower">電塔</string>
|
||||
<string name="type.railway.funicular">纜車</string>
|
||||
<string name="type.railway.halt">小站</string>
|
||||
<string name="type.railway.level_crossing">鐵路道口</string>
|
||||
<string name="type.railway.monorail">單軌軌道</string>
|
||||
|
|
@ -1338,6 +1339,7 @@
|
|||
<string name="type.railway.rail.motor_vehicle">鐵路軌道</string>
|
||||
<string name="type.railway.rail.tunnel">鐵路軌道</string>
|
||||
<string name="type.railway.station">火車站</string>
|
||||
<string name="type.railway.station.funicular">纜車</string>
|
||||
<string name="type.railway.station.light_rail">輕軌車站</string>
|
||||
<string name="type.railway.station.monorail">單軌車站</string>
|
||||
<string name="type.railway.station.subway">捷運站</string>
|
||||
|
|
|
|||
|
|
@ -1402,7 +1402,7 @@
|
|||
<string name="type.railway.abandoned.tunnel">铁路遗迹</string>
|
||||
<string name="type.railway.construction">在建铁路</string>
|
||||
<string name="type.railway.disused">废弃铁路</string>
|
||||
<string name="type.railway.funicular">缆索铁路轨道</string>
|
||||
<string name="type.railway.funicular">缆车</string>
|
||||
<string name="type.railway.funicular.bridge">缆索铁路轨道</string>
|
||||
<string name="type.railway.funicular.tunnel">缆索铁路轨道</string>
|
||||
<string name="type.railway.halt">小站</string>
|
||||
|
|
@ -1422,6 +1422,7 @@
|
|||
<string name="type.railway.rail.motor_vehicle">铁路轨道</string>
|
||||
<string name="type.railway.rail.tunnel">铁路轨道</string>
|
||||
<string name="type.railway.station">火车站</string>
|
||||
<string name="type.railway.station.funicular">缆车</string>
|
||||
<string name="type.railway.station.light_rail">轻轨车站</string>
|
||||
<string name="type.railway.station.monorail">单轨车站</string>
|
||||
<string name="type.railway.station.subway">地铁车站</string>
|
||||
|
|
|
|||
|
|
@ -1568,6 +1568,7 @@
|
|||
<string name="type.railway.spur.bridge">Spur Rail Bridge</string>
|
||||
<string name="type.railway.spur.tunnel">Spur Rail Tunnel</string>
|
||||
<string name="type.railway.station">Train Station</string>
|
||||
<string name="type.railway.station.funicular">Funicular</string>
|
||||
<string name="type.railway.station.light_rail">Light Rail Station</string>
|
||||
<string name="type.railway.station.monorail">Monorail Station</string>
|
||||
<string name="type.railway.station.subway">Subway Station</string>
|
||||
|
|
@ -1989,6 +1990,7 @@
|
|||
<string name="type.waterway">Waterway</string>
|
||||
<string name="type.waterway.canal">Canal</string>
|
||||
<string name="type.waterway.canal.tunnel">Canal Tunnel</string>
|
||||
<string name="type.waterway.fish_pass">Fish Pass</string>
|
||||
<string name="type.waterway.dam">Dam</string>
|
||||
<string name="type.waterway.ditch">Ditch</string>
|
||||
<string name="type.waterway.ditch.tunnel">Ditch</string>
|
||||
|
|
|
|||
|
|
@ -2433,6 +2433,45 @@ sk:3Železničná stanica|vlakové nástupište|2vlak
|
|||
sw:Kituo cha treni|treni|usafiri
|
||||
fa:ایستگاه قطار|ایستگاه تراموا
|
||||
|
||||
railway-station-funicular
|
||||
en:Funicular
|
||||
ar:حبلي
|
||||
be:Фунікулёр
|
||||
bg:Фуникуляр
|
||||
ca:Funicular
|
||||
cs:Lanovka
|
||||
da:Funicular
|
||||
de:Standseilbahn
|
||||
el:Μονωτικό τρενάκι
|
||||
es:Funicular
|
||||
et:Funicular
|
||||
eu:Funikularra
|
||||
fa:فونیکولور
|
||||
fi:Köysirata
|
||||
fr:Funiculaire
|
||||
he:רַכֶּבֶל
|
||||
hu:Funicular
|
||||
id:Kereta gantung
|
||||
it:Funicolare
|
||||
ja:フニクラ
|
||||
ko:케이블카
|
||||
mr:फ्युनिक्युलर
|
||||
nb:Kabelbane
|
||||
nl:Tunnel
|
||||
pl:Kolejka linowa
|
||||
pt:Funicular
|
||||
ro:Funicular
|
||||
ru:Фуникулер
|
||||
sk:Lanovka
|
||||
sv:Linbana
|
||||
sw:Funicular
|
||||
th:รถกระเช้าไฟฟ้า
|
||||
tr:Füniküler
|
||||
uk:Фунікулер
|
||||
vi:Đường sắt leo núi
|
||||
zh-Hans:缆车
|
||||
zh-Hant:纜車
|
||||
|
||||
railway-subway_entrance|railway-station-subway|@transport
|
||||
en:3Subway|3tube|3metro|3underground|U+1F687
|
||||
ru:3Метро
|
||||
|
|
|
|||
|
|
@ -542,7 +542,9 @@ world +
|
|||
lit -
|
||||
nobicycle -
|
||||
nocar -
|
||||
nocycleway -
|
||||
nofoot -
|
||||
nosidewalk -
|
||||
onedir_bicycle -
|
||||
oneway -
|
||||
private -
|
||||
|
|
@ -856,6 +858,7 @@ world +
|
|||
tunnel -
|
||||
{}
|
||||
station +
|
||||
funicular -
|
||||
light_rail -
|
||||
monorail -
|
||||
subway +
|
||||
|
|
@ -1319,6 +1322,9 @@ world +
|
|||
drain +
|
||||
tunnel -
|
||||
{}
|
||||
fish_pass +
|
||||
tunnel -
|
||||
{}
|
||||
lock_gate -
|
||||
river +
|
||||
tunnel -
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -59961,6 +59961,209 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-funicular"
|
||||
element {
|
||||
scale: 12
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 9
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 8
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 13
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 9
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 11
|
||||
color: 2236962
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 11
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-light_rail"
|
||||
element {
|
||||
|
|
@ -100964,6 +101167,117 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-fish_pass"
|
||||
element {
|
||||
scale: 13
|
||||
lines {
|
||||
width: 0.7
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.0
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-lock_gate"
|
||||
element {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -59463,6 +59463,209 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-funicular"
|
||||
element {
|
||||
scale: 12
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 9
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 8
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 13
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 9
|
||||
color: 2236962
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 11
|
||||
color: 2236962
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 11
|
||||
color: 2236962
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 2236962
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-light_rail"
|
||||
element {
|
||||
|
|
@ -100369,6 +100572,117 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-fish_pass"
|
||||
element {
|
||||
scale: 13
|
||||
lines {
|
||||
width: 0.7
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.0
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3584191
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 4495803
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-lock_gate"
|
||||
element {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -59548,6 +59548,209 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-funicular"
|
||||
element {
|
||||
scale: 12
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 9
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 8
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 13
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 9
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 11
|
||||
color: 8947848
|
||||
stroke_color: 1292964096
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 1292964096
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 11
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "funicular-m"
|
||||
priority: 16961
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15961
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-light_rail"
|
||||
element {
|
||||
|
|
@ -100454,6 +100657,117 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-fish_pass"
|
||||
element {
|
||||
scale: 13
|
||||
lines {
|
||||
width: 0.7
|
||||
color: 401446
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.0
|
||||
color: 401446
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 401446
|
||||
priority: 1009
|
||||
cap: BUTTCAP
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 401446
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 401446
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 11
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 401446
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 401446
|
||||
priority: 1009
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 19033
|
||||
}
|
||||
priority: 16950
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "waterway-lock_gate"
|
||||
element {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -40479,6 +40479,191 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-funicular"
|
||||
element {
|
||||
scale: 12
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 13
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 11
|
||||
color: 3355443
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 9
|
||||
color: 3355443
|
||||
stroke_color: 1728053247
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 1308622847
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 13
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 11
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 452984831
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-light_rail"
|
||||
element {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -40803,6 +40803,191 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-funicular"
|
||||
element {
|
||||
scale: 12
|
||||
symbol {
|
||||
name: "train-s"
|
||||
priority: 16926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 13
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 11
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 9
|
||||
color: 8947848
|
||||
stroke_color: 1712394496
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 14
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 1292964096
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 1292964096
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 10
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 13
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 11
|
||||
color: 8947848
|
||||
stroke_color: 856756480
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "train-m"
|
||||
priority: 16926
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
height: 14
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
secondary {
|
||||
height: 12
|
||||
color: 8947848
|
||||
stroke_color: 437326080
|
||||
offset_y: 1
|
||||
text: "int_name"
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15926
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "railway-station-light_rail"
|
||||
element {
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ amenity|grave_yard;251;
|
|||
waterway|canal|tunnel;[waterway=canal][tunnel?];;name;int_name;252;
|
||||
piste:type|downhill|easy;[piste:type=downhill][piste:difficulty=easy];;name;int_name;253;
|
||||
waterway|ditch|tunnel;[waterway=ditch][tunnel?];;name;int_name;254;
|
||||
deprecated|deprecated;255;x
|
||||
hwtag|nosidewalk;255;
|
||||
piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256;
|
||||
railway|subway_entrance;257;
|
||||
amenity|charging_station|bicycle;[amenity=charging_station][bicycle?];;name;int_name;258;
|
||||
|
|
@ -316,7 +316,7 @@ aeroway|gate;315;
|
|||
railway|preserved;316;
|
||||
highway|path|horse;[highway=path][horse?];;name;int_name;317;
|
||||
landuse|field;318;
|
||||
deprecated|deprecated;319;x
|
||||
hwtag|nocycleway;319;
|
||||
leisure|water_park;320;
|
||||
natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321;
|
||||
man_made|windmill;322;
|
||||
|
|
@ -574,7 +574,7 @@ deprecated|deprecated;573;x
|
|||
deprecated|deprecated;574;x
|
||||
aerialway|rope_tow;575;
|
||||
natural|pond;576;natural|water|pond
|
||||
deprecated|deprecated;577;x
|
||||
railway|station|funicular;[railway=station][station=funicular];;name;int_name;577;
|
||||
highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;
|
||||
deprecated|deprecated;579;x
|
||||
deprecated|deprecated;580;x
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 11.
|
|
|
@ -18382,19 +18382,43 @@
|
|||
|
||||
[type.railway.funicular]
|
||||
en = Funicular
|
||||
ar = حبلي
|
||||
be = Фунікулёр
|
||||
bg = Фуникуляр
|
||||
ca = Funicular
|
||||
cs = Lanovka
|
||||
da = Funicular
|
||||
de = Standseilbahn
|
||||
el = Μονωτικό τρενάκι
|
||||
es = Funicular
|
||||
et = Funikulöör
|
||||
et = Funicular
|
||||
eu = Funikularra
|
||||
fa = فونیکولور
|
||||
fi = Köysirata
|
||||
fr = Funiculaire
|
||||
ja = ケーブルカー
|
||||
mr = हवाई रज्जुमार्ग
|
||||
nl = Kabelspoorweg
|
||||
he = רַכֶּבֶל
|
||||
hu = Funicular
|
||||
id = Kereta gantung
|
||||
it = Funicolare
|
||||
ja = フニクラ
|
||||
ko = 케이블카
|
||||
lt = Funikulierius
|
||||
mr = फ्युनिक्युलर
|
||||
nb = Kabelbane
|
||||
nl = Tunnel
|
||||
pl = Kolejka linowa
|
||||
pt = Funicular
|
||||
pt-BR = Funicular
|
||||
ro = Funicular
|
||||
ru = Фуникулер
|
||||
sk = Lanovka
|
||||
sv = Linbana
|
||||
sw = Funicular
|
||||
th = รถกระเช้าไฟฟ้า
|
||||
tr = Füniküler
|
||||
uk = Фунікулер
|
||||
zh-Hans = 缆索铁路轨道
|
||||
vi = Đường sắt leo núi
|
||||
zh-Hans = 缆车
|
||||
zh-Hant = 纜車
|
||||
|
||||
[type.railway.funicular.bridge]
|
||||
en = Funicular Bridge
|
||||
|
|
@ -18888,6 +18912,9 @@
|
|||
zh-Hans = 火车站
|
||||
zh-Hant = 火車站
|
||||
|
||||
[type.railway.station.funicular]
|
||||
ref = type.railway.funicular
|
||||
|
||||
[type.railway.station.light_rail]
|
||||
ref = type.railway.station
|
||||
en = Light Rail Station
|
||||
|
|
|
|||
|
|
@ -942,6 +942,11 @@ node|z17-[aerialway=station],
|
|||
node|z17-[railway=level_crossing]
|
||||
{icon-image: railway-crossing-m.svg;}
|
||||
|
||||
node|z15-[railway=station][station=funicular],
|
||||
{icon-image: funicular-m.svg;text-offset: 1;font-size: 10;}
|
||||
node|z17-[aerialway=station],
|
||||
{font-size: 12;}
|
||||
|
||||
/* 4.TOURISM */
|
||||
|
||||
/* 4.1 Main POI */
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ landuse|forest|deciduous
|
|||
*waterway|canal|tunnel
|
||||
*piste:type|downhill|easy
|
||||
*waterway|ditch|tunnel
|
||||
mapswithme
|
||||
*hwtag|nosidewalk
|
||||
*piste:type|downhill|intermediate
|
||||
*railway|subway_entrance
|
||||
*amenity|charging_station|bicycle
|
||||
|
|
@ -316,7 +316,7 @@ man_made|pipeline
|
|||
*railway|preserved
|
||||
*highway|path|horse
|
||||
*landuse|field
|
||||
mapswithme
|
||||
*hwtag|nocycleway
|
||||
*leisure|water_park
|
||||
*natural|wetland|bog
|
||||
*man_made|windmill
|
||||
|
|
@ -493,8 +493,8 @@ mapswithme
|
|||
*highway|tertiary_link|bridge
|
||||
mapswithme
|
||||
*amenity|parking|park_and_ride
|
||||
mapswithme
|
||||
mapswithme
|
||||
*waterway|fish_pass
|
||||
*waterway|fish_pass|tunnel
|
||||
*natural|water|lock
|
||||
waterway|canal
|
||||
mapswithme
|
||||
|
|
@ -574,7 +574,7 @@ mapswithme
|
|||
mapswithme
|
||||
*aerialway|rope_tow
|
||||
natural|water|pond
|
||||
mapswithme
|
||||
*railway|station|funicular
|
||||
*highway|secondary_link|tunnel
|
||||
mapswithme
|
||||
mapswithme
|
||||
|
|
|
|||
|
|
@ -542,7 +542,9 @@ world 00000000000000000000 +
|
|||
lit 00000000000000000000 -
|
||||
nobicycle 00000000000000000000 -
|
||||
nocar 00000000000000000000 -
|
||||
nocycleway 00000000000000000000 -
|
||||
nofoot 00000000000000000000 -
|
||||
nosidewalk 00000000000000000000 -
|
||||
onedir_bicycle 00000000000000000000 -
|
||||
oneway 00000000000000011111 -
|
||||
private 00000000000000000000 -
|
||||
|
|
@ -856,6 +858,7 @@ world 00000000000000000000 +
|
|||
tunnel 00000000000000000000 -
|
||||
{}
|
||||
station 00000000000011111111 +
|
||||
funicular 00000000000011111111 -
|
||||
light_rail 00000000000011111111 -
|
||||
monorail 00000000000011111111 -
|
||||
subway 00000000000001111111 +
|
||||
|
|
@ -1319,6 +1322,9 @@ world 00000000000000000000 +
|
|||
drain 00000000000000000111 +
|
||||
tunnel 00000000000000000000 -
|
||||
{}
|
||||
fish_pass 00000000000000000000 +
|
||||
tunnel 00000000000000000000 -
|
||||
{}
|
||||
lock_gate 00000000000000001111 -
|
||||
river 00000000001111111111 +
|
||||
tunnel 00000000000111111111 -
|
||||
|
|
|
|||
|
|
@ -348,6 +348,10 @@ StraightTextLayout::StraightTextLayout(strings::UniString const & text, float fo
|
|||
bool forceNoWrap)
|
||||
{
|
||||
strings::UniString visibleText = bidi::log2vis(text);
|
||||
// Possible if name has strange symbols only.
|
||||
if (visibleText.empty())
|
||||
return;
|
||||
|
||||
buffer_vector<size_t, 2> delimIndexes;
|
||||
if (visibleText == text && !forceNoWrap)
|
||||
SplitText(visibleText, delimIndexes);
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "حبلي";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "محطة سكك حديدية";
|
||||
|
||||
"type.railway.station.funicular" = "حبلي";
|
||||
|
||||
"type.railway.station.light_rail" = "محطة سكك حديدية";
|
||||
|
||||
"type.railway.station.monorail" = "محطة سكك حديدية";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "قناة";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Фунікулёр";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Фунікулёр";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Фуникуляр";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Фуникуляр";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Lanovka";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Železniční stanice";
|
||||
|
||||
"type.railway.station.funicular" = "Lanovka";
|
||||
|
||||
"type.railway.station.light_rail" = "Železniční stanice";
|
||||
|
||||
"type.railway.station.monorail" = "Železniční stanice";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanál";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Togstation";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Togstation";
|
||||
|
||||
"type.railway.station.monorail" = "Togstation";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Bahnhof";
|
||||
|
||||
"type.railway.station.funicular" = "Standseilbahn";
|
||||
|
||||
"type.railway.station.light_rail" = "Stadtbahnbahnhof";
|
||||
|
||||
"type.railway.station.monorail" = "Bahnhof";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fischtreppe";
|
||||
|
||||
"type.waterway.dam" = "Staudamm";
|
||||
|
||||
"type.waterway.ditch" = "Graben";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Μονωτικό τρενάκι";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Σιδηροδρομικός σταθμός";
|
||||
|
||||
"type.railway.station.funicular" = "Μονωτικό τρενάκι";
|
||||
|
||||
"type.railway.station.light_rail" = "Σιδηροδρομικός σταθμός";
|
||||
|
||||
"type.railway.station.monorail" = "Σιδηροδρομικός σταθμός";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Κανάλι";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Light Rail Station";
|
||||
|
||||
"type.railway.station.monorail" = "Monorail Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Estación de tren";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Estación de tren";
|
||||
|
||||
"type.railway.station.monorail" = "Estación de tren";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Presa";
|
||||
|
||||
"type.waterway.ditch" = "Zanja";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Estación de tren";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Estación de tren";
|
||||
|
||||
"type.railway.station.monorail" = "Estación de tren";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Presa";
|
||||
|
||||
"type.waterway.ditch" = "Zanja";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Kasutamata raudtee";
|
||||
|
||||
"type.railway.funicular" = "Funikulöör";
|
||||
"type.railway.funicular" = "Funicular";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funikulöör";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Raudtee jaam";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Raudtee jaam";
|
||||
|
||||
"type.railway.station.monorail" = "Raudtee jaam";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Tamm";
|
||||
|
||||
"type.waterway.ditch" = "Kraav";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Funikularra";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Tren geltokian";
|
||||
|
||||
"type.railway.station.funicular" = "Funikularra";
|
||||
|
||||
"type.railway.station.light_rail" = "Tren geltokian";
|
||||
|
||||
"type.railway.station.monorail" = "Tren geltokian";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "فونیکولور";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "ایستگاه قطار";
|
||||
|
||||
"type.railway.station.funicular" = "فونیکولور";
|
||||
|
||||
"type.railway.station.light_rail" = "ایستگاه قطار";
|
||||
|
||||
"type.railway.station.monorail" = "ایستگاه قطار";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "کانال اب";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Köysirata";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Rautatieasema";
|
||||
|
||||
"type.railway.station.funicular" = "Köysirata";
|
||||
|
||||
"type.railway.station.light_rail" = "Rautatieasema";
|
||||
|
||||
"type.railway.station.monorail" = "Rautatieasema";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanaali";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Pato";
|
||||
|
||||
"type.waterway.ditch" = "Oja";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Gare";
|
||||
|
||||
"type.railway.station.funicular" = "Funiculaire";
|
||||
|
||||
"type.railway.station.light_rail" = "Gare";
|
||||
|
||||
"type.railway.station.monorail" = "Gare";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Barrage";
|
||||
|
||||
"type.waterway.ditch" = "Fossé";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "רַכֶּבֶל";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "רַכֶּבֶל";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Vonatmegálló";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Vonatmegálló";
|
||||
|
||||
"type.railway.station.monorail" = "Vonatmegálló";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Csatorna";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Kereta gantung";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Rel kereta api";
|
||||
|
||||
"type.railway.station.funicular" = "Kereta gantung";
|
||||
|
||||
"type.railway.station.light_rail" = "Rel kereta api";
|
||||
|
||||
"type.railway.station.monorail" = "Rel kereta api";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Funicolare";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Stazione ferroviaria";
|
||||
|
||||
"type.railway.station.funicular" = "Funicolare";
|
||||
|
||||
"type.railway.station.light_rail" = "Stazione ferroviaria";
|
||||
|
||||
"type.railway.station.monorail" = "Stazione ferroviaria";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canale";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Diga";
|
||||
|
||||
"type.waterway.ditch" = "Fosso";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "休止線";
|
||||
|
||||
"type.railway.funicular" = "ケーブルカー";
|
||||
"type.railway.funicular" = "フニクラ";
|
||||
|
||||
"type.railway.funicular.bridge" = "ケーブルカー(橋)";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "鉄道駅";
|
||||
|
||||
"type.railway.station.funicular" = "フニクラ";
|
||||
|
||||
"type.railway.station.light_rail" = "鉄道駅";
|
||||
|
||||
"type.railway.station.monorail" = "鉄道駅";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "運河";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "ダム";
|
||||
|
||||
"type.waterway.ditch" = "排水路";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "케이블카";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "기차역";
|
||||
|
||||
"type.railway.station.funicular" = "케이블카";
|
||||
|
||||
"type.railway.station.light_rail" = "기차역";
|
||||
|
||||
"type.railway.station.monorail" = "기차역";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "운하";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "हवाई रज्जुमार्ग";
|
||||
"type.railway.funicular" = "फ्युनिक्युलर";
|
||||
|
||||
"type.railway.funicular.bridge" = "हवाई रज्जुमार्ग";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "रेल्वे स्थानक";
|
||||
|
||||
"type.railway.station.funicular" = "फ्युनिक्युलर";
|
||||
|
||||
"type.railway.station.light_rail" = "रेल्वे स्थानक";
|
||||
|
||||
"type.railway.station.monorail" = "रेल्वे स्थानक";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "कालवा";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "धरण";
|
||||
|
||||
"type.waterway.ditch" = "खंदक";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Kabelbane";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Togstasjon";
|
||||
|
||||
"type.railway.station.funicular" = "Kabelbane";
|
||||
|
||||
"type.railway.station.light_rail" = "Togstasjon";
|
||||
|
||||
"type.railway.station.monorail" = "Togstasjon";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Ongebruikt spoor";
|
||||
|
||||
"type.railway.funicular" = "Kabelspoorweg";
|
||||
"type.railway.funicular" = "Tunnel";
|
||||
|
||||
"type.railway.funicular.bridge" = "Kabelspoorbuur";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Station";
|
||||
|
||||
"type.railway.station.funicular" = "Tunnel";
|
||||
|
||||
"type.railway.station.light_rail" = "Station";
|
||||
|
||||
"type.railway.station.monorail" = "Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanaal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Sloot";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Kolejka linowa";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Dworzec kolejowy";
|
||||
|
||||
"type.railway.station.funicular" = "Kolejka linowa";
|
||||
|
||||
"type.railway.station.light_rail" = "Dworzec kolejowy";
|
||||
|
||||
"type.railway.station.monorail" = "Dworzec kolejowy";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanał";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Estação de trem";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Estação de trem";
|
||||
|
||||
"type.railway.station.monorail" = "Estação de trem";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Usina";
|
||||
|
||||
"type.waterway.ditch" = "Vala";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Estação de comboios";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Estação de comboios";
|
||||
|
||||
"type.railway.station.monorail" = "Estação de comboios";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Barragem";
|
||||
|
||||
"type.waterway.ditch" = "Vala";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Feroviar";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Feroviar";
|
||||
|
||||
"type.railway.station.monorail" = "Feroviar";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Ж/д станция";
|
||||
|
||||
"type.railway.station.funicular" = "Фуникулер";
|
||||
|
||||
"type.railway.station.light_rail" = "Ж/д станция";
|
||||
|
||||
"type.railway.station.monorail" = "Ж/д станция";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Канал";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Дамба";
|
||||
|
||||
"type.waterway.ditch" = "Канава";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Lanovka";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Železničná stanica";
|
||||
|
||||
"type.railway.station.funicular" = "Lanovka";
|
||||
|
||||
"type.railway.station.light_rail" = "Železničná stanica";
|
||||
|
||||
"type.railway.station.monorail" = "Železničná stanica";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanál";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Linbana";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Tågstation";
|
||||
|
||||
"type.railway.station.funicular" = "Linbana";
|
||||
|
||||
"type.railway.station.light_rail" = "Tågstation";
|
||||
|
||||
"type.railway.station.monorail" = "Tågstation";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Train Station";
|
||||
|
||||
"type.railway.station.funicular" = "Funicular";
|
||||
|
||||
"type.railway.station.light_rail" = "Train Station";
|
||||
|
||||
"type.railway.station.monorail" = "Train Station";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Canal Tunnel";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "รถกระเช้าไฟฟ้า";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "สถานีรถไฟ";
|
||||
|
||||
"type.railway.station.funicular" = "รถกระเช้าไฟฟ้า";
|
||||
|
||||
"type.railway.station.light_rail" = "สถานีรถไฟ";
|
||||
|
||||
"type.railway.station.monorail" = "สถานีรถไฟ";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "คลอง";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Tren İstasyonu";
|
||||
|
||||
"type.railway.station.funicular" = "Füniküler";
|
||||
|
||||
"type.railway.station.light_rail" = "Tren İstasyonu";
|
||||
|
||||
"type.railway.station.monorail" = "Tren İstasyonu";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kanal";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Baraj";
|
||||
|
||||
"type.waterway.ditch" = "Hendek";
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Залізничний вокзал";
|
||||
|
||||
"type.railway.station.funicular" = "Фунікулер";
|
||||
|
||||
"type.railway.station.light_rail" = "Залізничний вокзал";
|
||||
|
||||
"type.railway.station.monorail" = "Залізничний вокзал";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Канал";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Дамба";
|
||||
|
||||
"type.waterway.ditch" = "Канава";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "Đường sắt leo núi";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "Đường tàu hỏa";
|
||||
|
||||
"type.railway.station.funicular" = "Đường sắt leo núi";
|
||||
|
||||
"type.railway.station.light_rail" = "Đường tàu hỏa";
|
||||
|
||||
"type.railway.station.monorail" = "Đường tàu hỏa";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "Kênh";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "废弃铁路";
|
||||
|
||||
"type.railway.funicular" = "缆索铁路轨道";
|
||||
"type.railway.funicular" = "缆车";
|
||||
|
||||
"type.railway.funicular.bridge" = "缆索铁路轨道";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "火车站";
|
||||
|
||||
"type.railway.station.funicular" = "缆车";
|
||||
|
||||
"type.railway.station.light_rail" = "轻轨车站";
|
||||
|
||||
"type.railway.station.monorail" = "单轨车站";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "运河";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "水坝";
|
||||
|
||||
"type.waterway.ditch" = "水沟";
|
||||
|
|
|
|||
|
|
@ -2735,7 +2735,7 @@
|
|||
|
||||
"type.railway.disused" = "Disused Railway";
|
||||
|
||||
"type.railway.funicular" = "Funicular";
|
||||
"type.railway.funicular" = "纜車";
|
||||
|
||||
"type.railway.funicular.bridge" = "Funicular Bridge";
|
||||
|
||||
|
|
@ -2795,6 +2795,8 @@
|
|||
|
||||
"type.railway.station" = "火車站";
|
||||
|
||||
"type.railway.station.funicular" = "纜車";
|
||||
|
||||
"type.railway.station.light_rail" = "輕軌車站";
|
||||
|
||||
"type.railway.station.monorail" = "單軌車站";
|
||||
|
|
@ -3635,6 +3637,8 @@
|
|||
|
||||
"type.waterway.canal.tunnel" = "運河";
|
||||
|
||||
"type.waterway.fish_pass" = "Fish Pass";
|
||||
|
||||
"type.waterway.dam" = "Dam";
|
||||
|
||||
"type.waterway.ditch" = "Ditch";
|
||||
|
|
|
|||
|
|
@ -166,11 +166,13 @@ VehicleModel::LimitsInitList UkraineOptions()
|
|||
}
|
||||
|
||||
VehicleModel::SurfaceInitList const kBicycleSurface = {
|
||||
// {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
|
||||
// {{surfaceType}, {weightFactor, etaFactor}}
|
||||
{{"psurface", "paved_good"}, {1.0, 1.0}},
|
||||
{{"psurface", "paved_bad"}, {0.8, 0.8}},
|
||||
{{"psurface", "unpaved_good"}, {1.0, 1.0}},
|
||||
{{"psurface", "unpaved_bad"}, {0.3, 0.3}}
|
||||
{{"psurface", "unpaved_bad"}, {0.3, 0.3}},
|
||||
// no dedicated cycleway, doesn't mean that bicycle is not allowed, just lower weight
|
||||
{{"hwtag", "nocycleway"}, {0.8, 0.8}},
|
||||
};
|
||||
} // namespace bicycle_model
|
||||
Yes. Yes. ```highway=secondary AND cycleway=no``` is worth for bicycle than plain ```highway=secondary```
Maybe a bit controversial, but we had claims, and it was the best option-to-fix, AFAIR.
pastk
commented
Yeap it sounds very controversial. Are there any tests or links to users' reports/claims? (I didn't find) I'd understand a very slight preference (like 0.95) but 20% is a lot. Yeap it sounds very controversial. Are there any tests or links to users' reports/claims? (I didn't find)
I'd understand a very slight preference (like 0.95) but 20% is a lot.
pastk
commented
I found this case: https://github.com/orgs/organicmaps/discussions/5158#discussioncomment-11125829 Though it looks more like a coincidence rather than something to warrant this penalty. I found this case: https://github.com/orgs/organicmaps/discussions/5158#discussioncomment-11125829
Though it looks more like a coincidence rather than something to warrant this penalty.
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ HighwayBasedSpeeds const kHighwayBasedSpeeds = {
|
|||
{HighwayType::HighwaySecondary, InOutCitySpeedKMpH(60.00 /* in city */, 70.00 /* out city */)},
|
||||
{HighwayType::HighwaySecondaryLink, InOutCitySpeedKMpH(48.00 /* in city */, 56.00 /* out city */)},
|
||||
{HighwayType::HighwayService, InOutCitySpeedKMpH({15.00, 15.00} /* in city */, {15.00, 15.00} /* out city */)},
|
||||
/// @todo Why tertiary is the only road with inCity speed _bigger_ than outCity?
|
||||
{HighwayType::HighwayTertiary, InOutCitySpeedKMpH(60.00 /* in city */, 50.00 /* out city */)},
|
||||
{HighwayType::HighwayTertiary, InOutCitySpeedKMpH(50.00 /* in city */, 50.00 /* out city */)},
|
||||
{HighwayType::HighwayTertiaryLink, InOutCitySpeedKMpH({40.95, 34.97} /* in city */, {45.45, 39.73} /* out city */)},
|
||||
{HighwayType::HighwayTrack, InOutCitySpeedKMpH({5.00, 5.00} /* in city */, {5.00, 5.00} /* out city */)},
|
||||
{HighwayType::HighwayTrunk, InOutCitySpeedKMpH(90.00 /* in city */, 103.00 /* out city */)},
|
||||
|
|
|
|||
|
|
@ -123,11 +123,13 @@ VehicleModel::LimitsInitList YesBridleway(VehicleModel::LimitsInitList res = kDe
|
|||
}
|
||||
|
||||
VehicleModel::SurfaceInitList const kPedestrianSurface = {
|
||||
// {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
|
||||
// {{surfaceType}, {weightFactor, etaFactor}}
|
||||
{{"psurface", "paved_good"}, {1.0, 1.0}},
|
||||
{{"psurface", "paved_bad"}, {1.0, 1.0}},
|
||||
{{"psurface", "unpaved_good"}, {1.0, 1.0}},
|
||||
{{"psurface", "unpaved_bad"}, {0.8, 0.8}}
|
||||
{{"psurface", "unpaved_bad"}, {0.8, 0.8}},
|
||||
// no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
|
||||
{{"hwtag", "nosidewalk"}, {0.8, 0.8}},
|
||||
};
|
||||
} // namespace pedestrian_model
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
#include "testing/testing.hpp"
|
||||
|
||||
#include "routing_common/bicycle_model.hpp"
|
||||
#include "routing_common/car_model.hpp"
|
||||
#include "routing_common/car_model_coefs.hpp"
|
||||
#include "routing_common/maxspeed_conversion.hpp"
|
||||
#include "routing_common/pedestrian_model.hpp"
|
||||
#include "routing_common/vehicle_model.hpp"
|
||||
#include "routing_common/car_model.hpp"
|
||||
|
||||
#include "indexer/classificator.hpp"
|
||||
#include "indexer/classificator_loader.hpp"
|
||||
|
|
@ -13,6 +15,7 @@
|
|||
|
||||
#include "base/math.hpp"
|
||||
|
||||
|
||||
namespace vehicle_model_test
|
||||
{
|
||||
using namespace routing;
|
||||
|
|
@ -76,6 +79,8 @@ public:
|
|||
|
||||
uint32_t primary, secondary, secondaryTunnel, secondaryBridge, residential;
|
||||
uint32_t oneway, pavedGood, pavedBad, unpavedGood, unpavedBad;
|
||||
|
||||
static SpeedParams DefaultParams() { return {{}, kInvalidSpeed, false /* inCity */}; }
|
||||
};
|
||||
|
||||
class VehicleModelStub : public VehicleModel
|
||||
|
|
@ -241,7 +246,8 @@ namespace
|
|||
bool LessSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
|
||||
{
|
||||
TEST(l.IsValid() && r.IsValid(), (l, r));
|
||||
return l.m_weight < r.m_weight && l.m_eta < r.m_eta;
|
||||
// Weight should be strict less, ETA may be equal.
|
||||
return l.m_weight < r.m_weight && l.m_eta <= r.m_eta;
|
||||
}
|
||||
|
||||
#define TEST_LESS_SPEED(l, r) TEST(LessSpeed(l, r), (l, r))
|
||||
|
|
@ -250,8 +256,9 @@ bool LessSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
|
|||
UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
|
||||
{
|
||||
auto const & model = CarModel::AllLimitsInstance();
|
||||
|
||||
auto const & c = classif();
|
||||
auto const p = DefaultParams();
|
||||
|
||||
feature::TypesHolder h1;
|
||||
h1.Add(c.GetTypeByPath({"highway", "track"}));
|
||||
|
||||
|
|
@ -263,17 +270,86 @@ UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
|
|||
// Obvious that gravel tertiary (moreover with maxspeed=60kmh) should be better than track.
|
||||
|
||||
{
|
||||
SpeedParams p1({}, kInvalidSpeed, false /* inCity */);
|
||||
SpeedParams p2({measurement_utils::Units::Metric, 60, 60}, kInvalidSpeed, false /* inCity */);
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h1, p1), model.GetTypeSpeed(h2, p2));
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p2));
|
||||
}
|
||||
|
||||
{
|
||||
SpeedParams p({}, kInvalidSpeed, false /* inCity */);
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p));
|
||||
}
|
||||
}
|
||||
|
||||
UNIT_CLASS_TEST(VehicleModelTest, CarModel_Smoke)
|
||||
{
|
||||
auto const & model = CarModel::AllLimitsInstance();
|
||||
auto const & c = classif();
|
||||
auto const p = DefaultParams();
|
||||
|
||||
feature::TypesHolder h1;
|
||||
h1.Add(secondary);
|
||||
|
||||
feature::TypesHolder h2;
|
||||
h2.Add(secondary);
|
||||
h2.Add(c.GetTypeByPath({"hwtag", "yescar"}));
|
||||
|
||||
feature::TypesHolder h3;
|
||||
h3.Add(c.GetTypeByPath({"highway", "tertiary"}));
|
||||
|
||||
TEST_EQUAL(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p), ());
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
|
||||
}
|
||||
|
||||
UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Smoke)
|
||||
{
|
||||
auto const & model = BicycleModel::AllLimitsInstance();
|
||||
auto const & c = classif();
|
||||
auto const p = DefaultParams();
|
||||
|
||||
feature::TypesHolder h1;
|
||||
h1.Add(c.GetTypeByPath({"highway", "cycleway"}));
|
||||
h1.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
|
||||
|
||||
feature::TypesHolder h2;
|
||||
h2.Add(c.GetTypeByPath({"highway", "cycleway"}));
|
||||
|
||||
feature::TypesHolder h3;
|
||||
h3.Add(secondary);
|
||||
h3.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
|
||||
|
||||
feature::TypesHolder h4;
|
||||
h4.Add(secondary);
|
||||
|
||||
feature::TypesHolder h5;
|
||||
h5.Add(secondary);
|
||||
h5.Add(c.GetTypeByPath({"hwtag", "nocycleway"}));
|
||||
|
||||
TEST_EQUAL(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p), ());
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h4, p), model.GetTypeSpeed(h3, p));
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h5, p), model.GetTypeSpeed(h4, p));
|
||||
}
|
||||
|
||||
UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Smoke)
|
||||
{
|
||||
auto const & model = PedestrianModel::AllLimitsInstance();
|
||||
auto const & c = classif();
|
||||
auto const p = DefaultParams();
|
||||
|
||||
feature::TypesHolder h1;
|
||||
h1.Add(residential);
|
||||
h1.Add(c.GetTypeByPath({"hwtag", "yesfoot"}));
|
||||
|
||||
feature::TypesHolder h2;
|
||||
h2.Add(residential);
|
||||
|
||||
feature::TypesHolder h3;
|
||||
h3.Add(residential);
|
||||
h3.Add(c.GetTypeByPath({"hwtag", "nosidewalk"}));
|
||||
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h2, p), model.GetTypeSpeed(h1, p));
|
||||
TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
|
||||
}
|
||||
|
||||
#undef TEST_LESS_SPEED
|
||||
|
||||
UNIT_TEST(VehicleModel_MultiplicationOperatorTest)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Reference in a new issue
Does it mean that
highway=secondary cycleway=nois considered worse/slower than "plain"highway=secondary?Why? Because of a chance that the latter might have an untagged cycleway?