Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Viktor Govako
240a45011c [planet] 230408 with addr:interpolation. 2023-04-10 21:45:17 -03:00
Viktor Govako
76460434db [search] Added addr:interpolation matching.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 21:44:51 -03:00
Viktor Govako
0e6507a2a8 [strings] Regenerated.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 21:44:51 -03:00
Viktor Govako
6077d9824d [classifier] Regenerated.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 21:44:51 -03:00
Viktor Govako
a3d54b22c8 [classifier] Added addr:interpolation type.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 21:44:51 -03:00
Viktor Govako
eea26725e6 Use fully qualified std::move at least in header files to avoid warnings.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 17:26:29 -03:00
Viktor Govako
9182d33485 [search] Removed "street" tokens from HN list.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 17:26:29 -03:00
Viktor Govako
a8ef807b8c [search] Minor fixes and TODOs.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 17:26:29 -03:00
Viktor Govako
230dbd2474 [search] Fixed MatchLatLon.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-04-10 17:26:29 -03:00
118 changed files with 3108 additions and 2483 deletions

View file

@ -730,6 +730,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ar:About_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">العنوان / البلوك</string>
<string name="type.addr_interpolation.even">العنوان / البلوك</string>
<string name="type.addr_interpolation.odd">العنوان / البلوك</string>
<string name="type.aerialway.cable_car">تلفريك</string>
<string name="type.aerialway.station">محطة تلفريك</string>
<string name="type.aeroway.aerodrome">مطار</string>

View file

@ -724,6 +724,9 @@
<string name="translated_om_site_url">https://organicmaps.app/ru/</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Адрас/Блок</string>
<string name="type.addr_interpolation.even">Адрас/Блок</string>
<string name="type.addr_interpolation.odd">Адрас/Блок</string>
<string name="type.amenity.bicycle_parking">Велапаркоўка</string>
<string name="type.amenity.charging_station.bicycle">Станцыя для зарадкі ровараў</string>
<string name="type.amenity.charging_station.motorcar">Аўтамабільная зарадная станцыя</string>

View file

@ -656,6 +656,9 @@
<string name="splash_subtitle">Картографски данни от OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Адрес/Блок</string>
<string name="type.addr_interpolation.even">Адрес/Блок</string>
<string name="type.addr_interpolation.odd">Адрес/Блок</string>
<string name="type.amenity.charging_station.bicycle">Станция за зареждане на велосипеди</string>
<string name="type.amenity.charging_station.motorcar">Станция за зареждане на автомобили</string>
<string name="type.leisure.bowling_alley">Боулинг писта</string>

View file

@ -722,6 +722,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ca:About</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adreça/Bloc</string>
<string name="type.addr_interpolation.even">Adreça/Bloc</string>
<string name="type.addr_interpolation.odd">Adreça/Bloc</string>
<string name="type.amenity.charging_station.bicycle">Estació de recàrrega de bicicletes</string>
<string name="type.amenity.charging_station.motorcar">Estació de recàrrega de cotxes</string>
<string name="type.leisure.bowling_alley">Bolera</string>

View file

@ -695,6 +695,9 @@
<string name="translated_om_site_url">https://organicmaps.app/cs/</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresa/blok</string>
<string name="type.addr_interpolation.even">Adresa/blok</string>
<string name="type.addr_interpolation.odd">Adresa/blok</string>
<string name="type.aerialway.station">Stanice lanové dráhy</string>
<string name="type.aeroway.aerodrome">Letiště</string>
<string name="type.aeroway.aerodrome.international">Letiště</string>

View file

@ -684,6 +684,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresse/blok</string>
<string name="type.addr_interpolation.even">Adresse/blok</string>
<string name="type.addr_interpolation.odd">Adresse/blok</string>
<string name="type.aerialway.station">Kabelbanestation</string>
<string name="type.aeroway.aerodrome">Lufthavn</string>
<string name="type.aeroway.aerodrome.international">Lufthavn</string>

View file

@ -729,6 +729,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/DE:Über_OSM</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresse/Block</string>
<string name="type.addr_interpolation.even">Adresse/Block</string>
<string name="type.addr_interpolation.odd">Adresse/Block</string>
<string name="type.aerialway">Seilbahn</string>
<string name="type.aerialway.cable_car">Pendelbahn</string>
<string name="type.aerialway.chair_lift">Sessellift</string>

View file

@ -676,6 +676,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/El:About_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Διεύθυνση/Μπλοκ</string>
<string name="type.addr_interpolation.even">Διεύθυνση/Μπλοκ</string>
<string name="type.addr_interpolation.odd">Διεύθυνση/Μπλοκ</string>
<string name="type.aerialway">Τελεφερίκ</string>
<string name="type.aerialway.cable_car">Τελεφερίκ</string>
<string name="type.aerialway.chair_lift">Τελεφερίκ</string>

View file

@ -733,6 +733,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Dirección/Bloque</string>
<string name="type.addr_interpolation.even">Dirección/Bloque</string>
<string name="type.addr_interpolation.odd">Dirección/Bloque</string>
<string name="type.aerialway">Transporte aéreo</string>
<string name="type.aerialway.cable_car">Teleférico</string>
<string name="type.aerialway.chair_lift">Telesilla</string>

View file

@ -718,6 +718,9 @@
<string name="splash_subtitle">OpenStreetMap kaardiandmed</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Aadress/plokk</string>
<string name="type.addr_interpolation.even">Aadress/plokk</string>
<string name="type.addr_interpolation.odd">Aadress/plokk</string>
<string name="type.aerialway">Õhutee</string>
<string name="type.aerialway.cable_car">Tramm</string>
<string name="type.aerialway.chair_lift">Tooltõstuk</string>

View file

@ -675,6 +675,9 @@
<string name="splash_subtitle">Maparen datuak OpenStreetMap-en</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Helbidea/Blokea</string>
<string name="type.addr_interpolation.even">Helbidea/Blokea</string>
<string name="type.addr_interpolation.odd">Helbidea/Blokea</string>
<string name="type.aerialway">Aire Garraioa</string>
<string name="type.aerialway.cable_car">Teleferikoa</string>
<string name="type.aerialway.chair_lift">Teleaulkia</string>

View file

@ -684,6 +684,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Fa:About_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">آدرس/بلاک</string>
<string name="type.addr_interpolation.even">آدرس/بلاک</string>
<string name="type.addr_interpolation.odd">آدرس/بلاک</string>
<string name="type.aeroway.aerodrome">فرودگاه</string>
<string name="type.aeroway.aerodrome.international">فرودگاه</string>
<string name="type.aeroway.helipad">پد فرود بالگرد</string>

View file

@ -693,6 +693,9 @@
<string name="splash_subtitle">OpenStreetMapin karttatiedot</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Osoite/lohko</string>
<string name="type.addr_interpolation.even">Osoite/lohko</string>
<string name="type.addr_interpolation.odd">Osoite/lohko</string>
<string name="type.aerialway">Köysirata</string>
<string name="type.aerialway.cable_car">Kabiinihissi</string>
<string name="type.aerialway.chair_lift">Tuolihissi</string>

View file

@ -734,6 +734,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/FR:À_propos_dOpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresse/Bloc</string>
<string name="type.addr_interpolation.even">Adresse/Bloc</string>
<string name="type.addr_interpolation.odd">Adresse/Bloc</string>
<string name="type.aerialway">Transport par câble aérien</string>
<string name="type.aerialway.cable_car">Téléphérique</string>
<string name="type.aerialway.chair_lift">Télésiège</string>

View file

@ -686,6 +686,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Hu:Névjegy</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Cím/blokk</string>
<string name="type.addr_interpolation.even">Cím/blokk</string>
<string name="type.addr_interpolation.odd">Cím/blokk</string>
<string name="type.aerialway.station">Felvonóállomás</string>
<string name="type.aeroway.aerodrome">Repülőtér</string>
<string name="type.aeroway.aerodrome.international">Repülőtér</string>

View file

@ -682,6 +682,9 @@
<string name="splash_subtitle">Data peta dari OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Alamat/Blokir</string>
<string name="type.addr_interpolation.even">Alamat/Blokir</string>
<string name="type.addr_interpolation.odd">Alamat/Blokir</string>
<string name="type.aerialway.station">Stasiun kereta gantung</string>
<string name="type.aeroway.aerodrome">Bandar udara</string>
<string name="type.aeroway.aerodrome.international">Bandar udara</string>

View file

@ -712,6 +712,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/IT:About</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Indirizzo/Blocco</string>
<string name="type.addr_interpolation.even">Indirizzo/Blocco</string>
<string name="type.addr_interpolation.odd">Indirizzo/Blocco</string>
<string name="type.aerialway">Impianto a fune</string>
<string name="type.aerialway.cable_car">Teleferica</string>
<string name="type.aerialway.chair_lift">Seggiovia</string>

View file

@ -247,6 +247,9 @@
<string name="splash_subtitle">OpenStreetMap-מ הפמ ינותנ</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">כתובת/חסימה</string>
<string name="type.addr_interpolation.even">כתובת/חסימה</string>
<string name="type.addr_interpolation.odd">כתובת/חסימה</string>
<string name="type.amenity.charging_station.bicycle">תחנת טעינה לאופניים</string>
<string name="type.amenity.charging_station.motorcar">תחנת טעינה למכוניות</string>
<string name="type.leisure.bowling_alley">גנילואב םלוא</string>

View file

@ -679,6 +679,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/JA:参加する</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">アドレス/ブロック</string>
<string name="type.addr_interpolation.even">アドレス/ブロック</string>
<string name="type.addr_interpolation.odd">アドレス/ブロック</string>
<string name="type.aerialway">索道</string>
<string name="type.aerialway.cable_car">ロープウェイ</string>
<string name="type.aerialway.chair_lift">チェアリフト</string>

View file

@ -681,6 +681,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ko:OpenStreetMap_소개</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">주소/블록</string>
<string name="type.addr_interpolation.even">주소/블록</string>
<string name="type.addr_interpolation.odd">주소/블록</string>
<string name="type.aerialway.station">케이블카 역</string>
<string name="type.aeroway.aerodrome">공항</string>
<string name="type.aeroway.aerodrome.international">공항</string>

View file

@ -691,6 +691,9 @@
<string name="enable_show_on_lock_screen_description">चालू असल्यास, ऍप चालू असताना प्रत्येक वेळी तुम्हाला तुमचे उपकरण अनलॉक करण्याची आवश्यकता नाही.</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">पत्ता/ब्लॉक</string>
<string name="type.addr_interpolation.even">पत्ता/ब्लॉक</string>
<string name="type.addr_interpolation.odd">पत्ता/ब्लॉक</string>
<string name="type.aerialway">हवाई मार्ग</string>
<string name="type.aerialway.cable_car">हवाई मार्ग</string>
<string name="type.aerialway.chair_lift">हवाई मार्ग</string>

View file

@ -728,6 +728,9 @@
<string name="splash_subtitle">Kartdata fra OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresse/blokk</string>
<string name="type.addr_interpolation.even">Adresse/blokk</string>
<string name="type.addr_interpolation.odd">Adresse/blokk</string>
<string name="type.aerialway">Taubane</string>
<string name="type.aerialway.cable_car">Pendeltaubane</string>
<string name="type.aerialway.chair_lift">Stolheis</string>

View file

@ -726,6 +726,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adres/blok</string>
<string name="type.addr_interpolation.even">Adres/blok</string>
<string name="type.addr_interpolation.odd">Adres/blok</string>
<string name="type.aerialway">Kabelbaan</string>
<string name="type.aerialway.cable_car">Cabinelift</string>
<string name="type.aerialway.chair_lift">Stoeltjeslift</string>

View file

@ -731,6 +731,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Pl:Wstęp</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adres/Blok</string>
<string name="type.addr_interpolation.even">Adres/Blok</string>
<string name="type.addr_interpolation.odd">Adres/Blok</string>
<string name="type.aerialway">Transport linowy</string>
<string name="type.aerialway.cable_car">Kolej linowa</string>
<string name="type.aerialway.chair_lift">Wyciąg krzesełkowy</string>

View file

@ -714,6 +714,9 @@
<string name="splash_subtitle">Dados do mapa do OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Endereço/Bloco</string>
<string name="type.addr_interpolation.even">Endereço/Bloco</string>
<string name="type.addr_interpolation.odd">Endereço/Bloco</string>
<string name="type.aerialway">Transporte aéreo</string>
<string name="type.aerialway.cable_car">Teleférico</string>
<string name="type.aerialway.chair_lift">Telecadeira</string>

View file

@ -697,6 +697,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Endereço/Bloco</string>
<string name="type.addr_interpolation.even">Endereço/Bloco</string>
<string name="type.addr_interpolation.odd">Endereço/Bloco</string>
<string name="type.aerialway">Transporte aéreo</string>
<string name="type.aerialway.cable_car">Teleférico</string>
<string name="type.aerialway.chair_lift">Telecadeira</string>

View file

@ -708,6 +708,9 @@
<string name="splash_subtitle">Date cartografice din OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresă/Bloc</string>
<string name="type.addr_interpolation.even">Adresă/Bloc</string>
<string name="type.addr_interpolation.odd">Adresă/Bloc</string>
<string name="type.aerialway.station">Stație de teleferic</string>
<string name="type.aeroway.aerodrome">Aeroport</string>
<string name="type.aeroway.aerodrome.international">Aeroport</string>

View file

@ -744,6 +744,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/RU:О_проекте</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Адрес/Блок</string>
<string name="type.addr_interpolation.even">Адрес/Блок</string>
<string name="type.addr_interpolation.odd">Адрес/Блок</string>
<string name="type.aerialway">Канатная дорога</string>
<string name="type.aerialway.cable_car">Канатная дорога</string>
<string name="type.aerialway.chair_lift">Кресельная канатная дорога</string>

View file

@ -679,6 +679,9 @@
<string name="splash_subtitle">Mapové údaje z OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adresa/blok</string>
<string name="type.addr_interpolation.even">Adresa/blok</string>
<string name="type.addr_interpolation.odd">Adresa/blok</string>
<string name="type.aerialway.station">Lanovka</string>
<string name="type.aeroway.aerodrome">Letisko</string>
<string name="type.aeroway.aerodrome.international">Letisko</string>

View file

@ -678,6 +678,9 @@
<string name="splash_subtitle">Kartdata från OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adress/Block</string>
<string name="type.addr_interpolation.even">Adress/Block</string>
<string name="type.addr_interpolation.odd">Adress/Block</string>
<string name="type.aerialway.station">Linbanestation</string>
<string name="type.aeroway.aerodrome">Flygplats</string>
<string name="type.aeroway.aerodrome.international">Flygplats</string>

View file

@ -242,6 +242,9 @@
<string name="splash_subtitle">Data ya ramani kutoka OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Anwani/Zuia</string>
<string name="type.addr_interpolation.even">Anwani/Zuia</string>
<string name="type.addr_interpolation.odd">Anwani/Zuia</string>
<string name="type.amenity">Kistawishi</string>
<string name="type.amenity.arts_centre">Kituo cha sanaa</string>
<string name="type.amenity.bicycle_repair_station">Cykelreparationsstation</string>

View file

@ -681,6 +681,9 @@
<string name="splash_subtitle">ข้อมูลแผนที่จาก OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">ที่อยู่/บล็อค</string>
<string name="type.addr_interpolation.even">ที่อยู่/บล็อค</string>
<string name="type.addr_interpolation.odd">ที่อยู่/บล็อค</string>
<string name="type.aerialway.station">สถานีกระเช้าลอยฟ้า</string>
<string name="type.aeroway.aerodrome">สนามบิน</string>
<string name="type.aeroway.aerodrome.international">สนามบิน</string>

View file

@ -735,6 +735,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Tr:About</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Adres/Blok</string>
<string name="type.addr_interpolation.even">Adres/Blok</string>
<string name="type.addr_interpolation.odd">Adres/Blok</string>
<string name="type.aerialway">Teleferik</string>
<string name="type.aerialway.cable_car">Teleferik</string>
<string name="type.aerialway.chair_lift">Telesiyej</string>

View file

@ -715,6 +715,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Uk:Про_проект</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Адреса/блок</string>
<string name="type.addr_interpolation.even">Адреса/блок</string>
<string name="type.addr_interpolation.odd">Адреса/блок</string>
<string name="type.aerialway">Канатна дорога</string>
<string name="type.aerialway.cable_car">Канатна дорога</string>
<string name="type.aerialway.chair_lift">Канатна дорога</string>

View file

@ -680,6 +680,9 @@
<string name="splash_subtitle">Dữ liệu bản đồ từ OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Địa chỉ/Khối</string>
<string name="type.addr_interpolation.even">Địa chỉ/Khối</string>
<string name="type.addr_interpolation.odd">Địa chỉ/Khối</string>
<string name="type.aerialway.station">Trạm Cáp Treo</string>
<string name="type.aeroway.aerodrome">Sân bay</string>
<string name="type.aeroway.aerodrome.international">Sân bay</string>

View file

@ -701,6 +701,9 @@
<string name="splash_subtitle">來自 OpenStreetMap 的地圖數據</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">地址/區塊</string>
<string name="type.addr_interpolation.even">地址/區塊</string>
<string name="type.addr_interpolation.odd">地址/區塊</string>
<string name="type.aerialway">纜車要素</string>
<string name="type.aerialway.cable_car">纜車</string>
<string name="type.aerialway.drag_lift">纜車要素</string>

View file

@ -689,6 +689,9 @@
<string name="splash_subtitle">地图数据来自OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">地址/区块</string>
<string name="type.addr_interpolation.even">地址/区块</string>
<string name="type.addr_interpolation.odd">地址/区块</string>
<string name="type.aerialway">缆车要素</string>
<string name="type.aerialway.cable_car">缆车</string>
<string name="type.aerialway.chair_lift">登山吊椅</string>

View file

@ -764,6 +764,9 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
<!-- SECTION: Types -->
<string name="type.addr_interpolation">Address/Block</string>
<string name="type.addr_interpolation.even">Address/Block</string>
<string name="type.addr_interpolation.odd">Address/Block</string>
<string name="type.aerialway">Aerialway</string>
<string name="type.aerialway.cable_car">Cable Car</string>
<string name="type.aerialway.chair_lift">Chair Lift</string>

View file

@ -2,6 +2,8 @@
#include "base/logging.hpp"
#include "std/target_os.hpp"
#include <chrono>
#include <exception>
@ -62,7 +64,7 @@ bool Thread::Create(std::unique_ptr<IRoutine> && routine)
m_routine.reset();
return false;
}
m_thread = move(routineThread);
m_thread = std::move(routineThread);
return true;
}

View file

@ -4,13 +4,9 @@
#include "base/cancellable.hpp"
#include "base/macros.hpp"
#include "std/target_os.hpp"
#include <cstdint>
#include <functional>
#include <memory>
#include <thread>
#include <utility>
namespace threads
{
@ -88,7 +84,7 @@ public:
SimpleThread() noexcept {}
SimpleThread(SimpleThread && x) noexcept
: m_thread(move(x.m_thread))
: m_thread(std::move(x.m_thread))
{}
template <class Fn, class... Args>
@ -98,7 +94,7 @@ public:
SimpleThread & operator= (SimpleThread && x) noexcept
{
m_thread = move(x.m_thread);
m_thread = std::move(x.m_thread);
return *this;
}

View file

@ -2,9 +2,9 @@
#include "coding/map_uint32_to_val.hpp"
#include "coding/reader.hpp"
#include "coding/varint.hpp"
#include "coding/writer.hpp"
#include <cstdint>
#include <utility>
#include <vector>

View file

@ -1,11 +1,9 @@
#pragma once
#include "coding/endianness.hpp"
#include "coding/files_container.hpp"
#include "coding/memory_region.hpp"
#include "coding/reader.hpp"
#include "coding/succinct_mapper.hpp"
#include "coding/varint.hpp"
#include "coding/write_to_sink.hpp"
#include "coding/writer.hpp"
@ -199,7 +197,7 @@ private:
uint32_t const idsSize = m_header.m_positionsOffset - sizeof(m_header);
std::vector<uint8_t> data(idsSize);
m_reader.Read(sizeof(m_header), data.data(), data.size());
m_idsRegion = std::make_unique<CopiedMemoryRegion>(move(data));
m_idsRegion = std::make_unique<CopiedMemoryRegion>(std::move(data));
coding::MapVisitor visitor(m_idsRegion->ImmutableData());
m_ids.map(visitor);
@ -209,7 +207,7 @@ private:
uint32_t const offsetsSize = m_header.m_variablesOffset - m_header.m_positionsOffset;
std::vector<uint8_t> data(offsetsSize);
m_reader.Read(m_header.m_positionsOffset, data.data(), data.size());
m_offsetsRegion = std::make_unique<CopiedMemoryRegion>(move(data));
m_offsetsRegion = std::make_unique<CopiedMemoryRegion>(std::move(data));
coding::MapVisitor visitor(m_offsetsRegion->ImmutableData());
m_offsets.map(visitor);

Binary file not shown.

Binary file not shown.

View file

@ -1,4 +1,8 @@
world +
addr:interpolation +
even -
odd -
{}
aerialway +
cable_car -
chair_lift -

File diff suppressed because it is too large Load diff

View file

@ -38,9 +38,9 @@ highway|cycleway;37;
landuse|farm;38;
amenity|place_of_worship;39;
highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;
deprecated|deprecated;41;x
addr:interpolation|odd;41;
highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
deprecated|deprecated;43;x
addr:interpolation|even;43;
highway|motorway_link;44;
waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;
@ -538,7 +538,7 @@ deprecated|deprecated;537;x
deprecated|deprecated;538;x
railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
barrier|cycle_barrier;540;
deprecated|deprecated;541;x
addr:interpolation;[addr:interpolation];;addr:housenumber;name;541;
amenity|speed_trap;542;highway|speed_camera
area:highway|track;543;
area:highway|primary;544;

Can't render this file because it has a wrong number of fields in line 11.

View file

@ -1,5 +1,51 @@
[[Types]]
[type.addr_interpolation]
en = Address/Block
ar = العنوان / البلوك
be = Адрас/Блок
bg = Адрес/Блок
ca = Adreça/Bloc
cs = Adresa/blok
da = Adresse/blok
de = Adresse/Block
el = Διεύθυνση/Μπλοκ
es = Dirección/Bloque
et = Aadress/plokk
eu = Helbidea/Blokea
fa = آدرس/بلاک
fi = Osoite/lohko
fr = Adresse/Bloc
he = כתובת/חסימה
hu = Cím/blokk
id = Alamat/Blokir
it = Indirizzo/Blocco
ja = アドレス/ブロック
ko = 주소/블록
mr = पत्ता/ब्लॉक
nb = Adresse/blokk
nl = Adres/blok
pl = Adres/Blok
pt = Endereço/Bloco
pt-BR = Endereço/Bloco
ro = Adresă/Bloc
ru = Адрес/Блок
sk = Adresa/blok
sv = Adress/Block
sw = Anwani/Zuia
th = ที่อยู่/บล็อค
tr = Adres/Blok
uk = Адреса/блок
vi = Địa chỉ/Khối
zh-Hans = 地址/区块
zh-Hant = 地址/區塊
[type.addr_interpolation.even]
ref = type.addr_interpolation
[type.addr_interpolation.odd]
ref = type.addr_interpolation
[type.aerialway]
en = Aerialway
de = Seilbahn

View file

@ -38,9 +38,9 @@ mapswithme
*landuse|farm
*amenity|place_of_worship
*highway|track|grade1
mapswithme
*addr:interpolation|odd
*highway|service|driveway
mapswithme
*addr:interpolation|even
*highway|motorway_link
*waterway|stream|intermittent
*highway|track|grade4
@ -538,7 +538,7 @@ mapswithme
mapswithme
*railway|funicular|tunnel
*barrier|cycle_barrier
mapswithme
*addr:interpolation
highway|speed_camera
*area:highway|track
*area:highway|primary

View file

@ -1,4 +1,8 @@
world 00000000000000000000 +
addr:interpolation 00000000000000000000 +
even 00000000000000000000 -
odd 00000000000000000000 -
{}
aerialway 00000000000000000000 +
cable_car 00000000000000000000 -
chair_lift 00000000000000000000 -

View file

@ -82,7 +82,7 @@ class MapShapeReadedMessage : public MapShapeMessage
{
public:
MapShapeReadedMessage(TileKey const & key, TMapShapes && shapes)
: MapShapeMessage(key), m_shapes(move(shapes))
: MapShapeMessage(key), m_shapes(std::move(shapes))
{}
Type GetType() const override { return Type::MapShapeReaded; }
@ -97,7 +97,7 @@ class OverlayMapShapeReadedMessage : public MapShapeReadedMessage
{
public:
OverlayMapShapeReadedMessage(TileKey const & key, TMapShapes && shapes)
: MapShapeReadedMessage(key, move(shapes))
: MapShapeReadedMessage(key, std::move(shapes))
{}
Type GetType() const override { return Message::Type::OverlayMapShapeReaded; }

View file

@ -239,8 +239,8 @@ bool FeatureBuilder::PreSerialize()
case GeomType::Line:
{
// We need refs for road's numbers.
if (!routing::IsRoad(GetTypes()))
// Ref is used for road's number or house number's range.
if (!routing::IsRoad(GetTypes()) && !ftypes::IsAddressInterpolChecker::Instance()(GetTypes()))
m_params.ref.clear();
m_params.rank = 0;
@ -387,7 +387,7 @@ void FeatureBuilder::SerializeForIntermediate(Buffer & data) const
Buffer tmp(data);
FeatureBuilder fb;
fb.DeserializeFromIntermediate(tmp);
ASSERT ( fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb) );
ASSERT(fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb));
#endif
}

View file

@ -185,6 +185,20 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Combined)
UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
{
{
// Single house number tag is transformed into address type.
Tags const tags = { {"addr:housenumber", "42"} };
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 1, (params));
TEST(params.IsTypeExist(GetType({"building", "address"})), ());
TEST_EQUAL(params.house.Get(), "42", ());
}
using AddrType = feature::AddressData::Type;
{
Tags const tags = {
{ "addr:conscriptionnumber", "223" },
@ -202,6 +216,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
TEST(params.IsTypeExist(GetType({"building", "address"})), ());
TEST_EQUAL(params.house.Get(), "223/5", ());
TEST_EQUAL(params.GetAddressData().Get(AddrType::Street), "Řetězová", ());
TEST_EQUAL(params.GetAddressData().Get(AddrType::Postcode), "11000", ());
}
{
@ -223,6 +239,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
TEST(!params.IsTypeExist(GetType({"entrance"})), ());
TEST_EQUAL(params.house.Get(), "41", ());
TEST_EQUAL(params.GetAddressData().Get(AddrType::Street), "Leutschenbachstrasse", ());
TEST_EQUAL(params.GetAddressData().Get(AddrType::Postcode), "8050", ());
}
}
@ -1638,6 +1656,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
// {"railway", "subway"},
// {"traffic_calming", "bump"},
// {"traffic_calming", "hump"},
{"addr:interpolation", "even"},
{"addr:interpolation", "odd"},
{"aerialway", "cable_car"},
{"aerialway", "chair_lift"},
{"aerialway", "drag_lift"},
@ -2236,6 +2256,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
//
// Manually constructed type, not parsed from osm.
// {{"building", "address"}, {{"addr:housenumber", "any_value"}, {"addr:street", "any_value"}}},
{{"addr:interpolation"}, {{"addr:interpolation", "all"}}},
{{"aeroway", "aerodrome", "international"}, {{"aeroway", "aerodrome"}, {"aerodrome", "international"}}},
{{"amenity", "grave_yard", "christian"}, {{"amenity", "grave_yard"}, {"religion", "christian"}}},
{{"amenity", "parking", "fee"}, {{"amenity", "parking"}, {"fee", "any_value"}}},

View file

@ -59,6 +59,7 @@ TestFeature::TestFeature(string const & name, string const & lang)
TestFeature::TestFeature(StringUtf8Multilang const & name)
: m_id(GenUniqueId()), m_center(0, 0), m_type(Type::Unknown), m_names(name)
{
Init();
}
TestFeature::TestFeature(m2::PointD const & center, string const & name, string const & lang)
@ -78,6 +79,7 @@ TestFeature::TestFeature(m2::PointD const & center, StringUtf8Multilang const &
TestFeature::TestFeature(m2::RectD const & boundary, string const & name, string const & lang)
: TestFeature(MakePoly(boundary), name, lang)
{
Init();
}
TestFeature::TestFeature(vector<m2::PointD> const & boundary, string const & name, string const & lang)

View file

@ -49,7 +49,7 @@ public:
std::vector<m2::PointD> points(numPoints);
file.Read(points.data(), sizeof(m2::PointD) * numPoints);
m_tree.Add(m2::RegionD(move(points)));
m_tree.Add(m2::RegionD(std::move(points)));
}
}
LOG_SHORT(LINFO, ("Load", total, "water geometries"));

View file

@ -30,7 +30,7 @@ public:
ParametrizedSegment(Point const & p0, Point const & p1) : m_p0(p0), m_p1(p1)
{
m_d = m_p1 - m_p0;
m_length = std::sqrt(m_d.SquaredLength());
m_length = m_d.Length();
if (m_d.IsAlmostZero())
m_d = Point::Zero();
else

View file

@ -182,7 +182,7 @@ public:
void Add(Type type, std::string const & s)
{
/// @todo Probably, we need to add separator here and store multiple values.
// Store single value only.
MetadataBase::Set(base::Underlying(type), s);
}

View file

@ -1,9 +1,5 @@
#pragma once
#include "geometry/rect2d.hpp"
#include "base/base.hpp"
#include <string>
#include <vector>
@ -12,6 +8,9 @@ class StringUtf8Multilang;
namespace feature
{
// Address house numbers interpolation.
enum class InterpolType { None, Odd, Even, Any };
class TypesHolder;
class RegionData;

View file

@ -113,6 +113,11 @@ namespace
if ((geomType == GeomType::Point || geomType == GeomType::Undefined) && type == region)
return scales::GetUpperWorldScale();
ftype::TruncValue(type, 1);
static uint32_t const addr = cl.GetTypeByPath({"addr:interpolation"});
if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == addr)
return scales::GetUpperScale();
return -1;
}

View file

@ -873,6 +873,32 @@ IsRailwaySubwayEntranceChecker::IsRailwaySubwayEntranceChecker()
m_types.push_back(c.GetTypeByPath({"railway", "subway_entrance"}));
}
IsAddressInterpolChecker::IsAddressInterpolChecker() : BaseChecker(1 /* level */)
{
Classificator const & c = classif();
m_types.push_back(c.GetTypeByPath({"addr:interpolation"}));
m_odd = c.GetTypeByPath({"addr:interpolation", "odd"});
m_even = c.GetTypeByPath({"addr:interpolation", "even"});
}
feature::InterpolType IsAddressInterpolChecker::GetInterpolType(FeatureType & ft) const
{
for (uint32_t t : feature::TypesHolder(ft))
{
if (t == m_odd)
return feature::InterpolType::Odd;
if (t == m_even)
return feature::InterpolType::Even;
ftype::TruncValue(t, 1);
if (t == m_types[0])
return feature::InterpolType::Any;
}
return feature::InterpolType::None;
}
uint64_t GetPopulation(FeatureType & ft)
{
uint64_t population = ft.GetPopulation();

View file

@ -1,6 +1,7 @@
#pragma once
#include "indexer/feature_data.hpp"
#include "indexer/feature_utils.hpp"
#include "base/small_map.hpp"
#include "base/stl_helpers.hpp"
@ -588,6 +589,18 @@ public:
DECLARE_CHECKER_INSTANCE(IsRailwaySubwayEntranceChecker);
};
class IsAddressInterpolChecker : public BaseChecker
{
IsAddressInterpolChecker();
uint32_t m_odd, m_even;
public:
DECLARE_CHECKER_INSTANCE(IsAddressInterpolChecker);
feature::InterpolType GetInterpolType(FeatureType & ft) const;
};
/// @name Get city radius and population.
/// @param r Radius in meters.

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "العنوان / البلوك";
"type.addr_interpolation.even" = "العنوان / البلوك";
"type.addr_interpolation.odd" = "العنوان / البلوك";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "تلفريك";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Адрас/Блок";
"type.addr_interpolation.even" = "Адрас/Блок";
"type.addr_interpolation.odd" = "Адрас/Блок";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Адрес/Блок";
"type.addr_interpolation.even" = "Адрес/Блок";
"type.addr_interpolation.odd" = "Адрес/Блок";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adreça/Bloc";
"type.addr_interpolation.even" = "Adreça/Bloc";
"type.addr_interpolation.odd" = "Adreça/Bloc";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresa/blok";
"type.addr_interpolation.even" = "Adresa/blok";
"type.addr_interpolation.odd" = "Adresa/blok";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresse/blok";
"type.addr_interpolation.even" = "Adresse/blok";
"type.addr_interpolation.odd" = "Adresse/blok";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresse/Block";
"type.addr_interpolation.even" = "Adresse/Block";
"type.addr_interpolation.odd" = "Adresse/Block";
"type.aerialway" = "Seilbahn";
"type.aerialway.cable_car" = "Pendelbahn";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Διεύθυνση/Μπλοκ";
"type.addr_interpolation.even" = "Διεύθυνση/Μπλοκ";
"type.addr_interpolation.odd" = "Διεύθυνση/Μπλοκ";
"type.aerialway" = "Τελεφερίκ";
"type.aerialway.cable_car" = "Τελεφερίκ";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Address/Block";
"type.addr_interpolation.even" = "Address/Block";
"type.addr_interpolation.odd" = "Address/Block";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Address/Block";
"type.addr_interpolation.even" = "Address/Block";
"type.addr_interpolation.odd" = "Address/Block";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Dirección/Bloque";
"type.addr_interpolation.even" = "Dirección/Bloque";
"type.addr_interpolation.odd" = "Dirección/Bloque";
"type.aerialway" = "Transporte aéreo";
"type.aerialway.cable_car" = "Teleférico";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Dirección/Bloque";
"type.addr_interpolation.even" = "Dirección/Bloque";
"type.addr_interpolation.odd" = "Dirección/Bloque";
"type.aerialway" = "Transporte aéreo";
"type.aerialway.cable_car" = "Teleférico";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Aadress/plokk";
"type.addr_interpolation.even" = "Aadress/plokk";
"type.addr_interpolation.odd" = "Aadress/plokk";
"type.aerialway" = "Õhutee";
"type.aerialway.cable_car" = "Tramm";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Helbidea/Blokea";
"type.addr_interpolation.even" = "Helbidea/Blokea";
"type.addr_interpolation.odd" = "Helbidea/Blokea";
"type.aerialway" = "Aire Garraioa";
"type.aerialway.cable_car" = "Teleferikoa";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "آدرس/بلاک";
"type.addr_interpolation.even" = "آدرس/بلاک";
"type.addr_interpolation.odd" = "آدرس/بلاک";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Osoite/lohko";
"type.addr_interpolation.even" = "Osoite/lohko";
"type.addr_interpolation.odd" = "Osoite/lohko";
"type.aerialway" = "Köysirata";
"type.aerialway.cable_car" = "Kabiinihissi";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresse/Bloc";
"type.addr_interpolation.even" = "Adresse/Bloc";
"type.addr_interpolation.odd" = "Adresse/Bloc";
"type.aerialway" = "Transport par câble aérien";
"type.aerialway.cable_car" = "Téléphérique";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "כתובת/חסימה";
"type.addr_interpolation.even" = "כתובת/חסימה";
"type.addr_interpolation.odd" = "כתובת/חסימה";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Cím/blokk";
"type.addr_interpolation.even" = "Cím/blokk";
"type.addr_interpolation.odd" = "Cím/blokk";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Alamat/Blokir";
"type.addr_interpolation.even" = "Alamat/Blokir";
"type.addr_interpolation.odd" = "Alamat/Blokir";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Indirizzo/Blocco";
"type.addr_interpolation.even" = "Indirizzo/Blocco";
"type.addr_interpolation.odd" = "Indirizzo/Blocco";
"type.aerialway" = "Impianto a fune";
"type.aerialway.cable_car" = "Teleferica";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "アドレス/ブロック";
"type.addr_interpolation.even" = "アドレス/ブロック";
"type.addr_interpolation.odd" = "アドレス/ブロック";
"type.aerialway" = "索道";
"type.aerialway.cable_car" = "ロープウェイ";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "주소/블록";
"type.addr_interpolation.even" = "주소/블록";
"type.addr_interpolation.odd" = "주소/블록";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "पत्ता/ब्लॉक";
"type.addr_interpolation.even" = "पत्ता/ब्लॉक";
"type.addr_interpolation.odd" = "पत्ता/ब्लॉक";
"type.aerialway" = "हवाई मार्ग";
"type.aerialway.cable_car" = "हवाई मार्ग";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresse/blokk";
"type.addr_interpolation.even" = "Adresse/blokk";
"type.addr_interpolation.odd" = "Adresse/blokk";
"type.aerialway" = "Taubane";
"type.aerialway.cable_car" = "Pendeltaubane";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adres/blok";
"type.addr_interpolation.even" = "Adres/blok";
"type.addr_interpolation.odd" = "Adres/blok";
"type.aerialway" = "Kabelbaan";
"type.aerialway.cable_car" = "Cabinelift";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adres/Blok";
"type.addr_interpolation.even" = "Adres/Blok";
"type.addr_interpolation.odd" = "Adres/Blok";
"type.aerialway" = "Transport linowy";
"type.aerialway.cable_car" = "Kolej linowa";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Endereço/Bloco";
"type.addr_interpolation.even" = "Endereço/Bloco";
"type.addr_interpolation.odd" = "Endereço/Bloco";
"type.aerialway" = "Transporte aéreo";
"type.aerialway.cable_car" = "Teleférico";
@ -1558,7 +1564,7 @@
"type.barrier.chain" = "Chain";
"type.barrier.city_wall" = "Muralha";
"type.barrier.city_wall" = "City Wall";
"type.barrier.cycle_barrier" = "Barreira de bicicletas";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Endereço/Bloco";
"type.addr_interpolation.even" = "Endereço/Bloco";
"type.addr_interpolation.odd" = "Endereço/Bloco";
"type.aerialway" = "Transporte aéreo";
"type.aerialway.cable_car" = "Teleférico";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresă/Bloc";
"type.addr_interpolation.even" = "Adresă/Bloc";
"type.addr_interpolation.odd" = "Adresă/Bloc";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Адрес/Блок";
"type.addr_interpolation.even" = "Адрес/Блок";
"type.addr_interpolation.odd" = "Адрес/Блок";
"type.aerialway" = "Канатная дорога";
"type.aerialway.cable_car" = "Канатная дорога";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adresa/blok";
"type.addr_interpolation.even" = "Adresa/blok";
"type.addr_interpolation.odd" = "Adresa/blok";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adress/Block";
"type.addr_interpolation.even" = "Adress/Block";
"type.addr_interpolation.odd" = "Adress/Block";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Anwani/Zuia";
"type.addr_interpolation.even" = "Anwani/Zuia";
"type.addr_interpolation.odd" = "Anwani/Zuia";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "ที่อยู่/บล็อค";
"type.addr_interpolation.even" = "ที่อยู่/บล็อค";
"type.addr_interpolation.odd" = "ที่อยู่/บล็อค";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Adres/Blok";
"type.addr_interpolation.even" = "Adres/Blok";
"type.addr_interpolation.odd" = "Adres/Blok";
"type.aerialway" = "Teleferik";
"type.aerialway.cable_car" = "Teleferik";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Адреса/блок";
"type.addr_interpolation.even" = "Адреса/блок";
"type.addr_interpolation.odd" = "Адреса/блок";
"type.aerialway" = "Канатна дорога";
"type.aerialway.cable_car" = "Канатна дорога";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "Địa chỉ/Khối";
"type.addr_interpolation.even" = "Địa chỉ/Khối";
"type.addr_interpolation.odd" = "Địa chỉ/Khối";
"type.aerialway" = "Aerialway";
"type.aerialway.cable_car" = "Cable Car";

View file

@ -1245,6 +1245,12 @@
/********** Types **********/
"type.addr_interpolation" = "地址/区块";
"type.addr_interpolation.even" = "地址/区块";
"type.addr_interpolation.odd" = "地址/区块";
"type.aerialway" = "缆车要素";
"type.aerialway.cable_car" = "缆车";

Some files were not shown because too many files have changed in this diff Show more