From 1433b0e8668d7743269cdeb2cea04544c7c9d661 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 23 Jul 2025 16:31:02 +0700 Subject: [PATCH 001/222] [android] Fix Panoramax links not working Signed-off-by: Konstantin Pastbin --- .../widget/placepage/sections/PlacePageLinksFragment.java | 8 +++++--- indexer/validate_and_format_contacts.cpp | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java index bc7eb5b1d..796e0f3ee 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java @@ -85,7 +85,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU); case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER, - FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE -> + FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE, FMD_PANORAMAX -> { if (TextUtils.isEmpty(mMapObject.getMetadata(type))) yield ""; @@ -171,7 +171,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer openUrl(Metadata.MetadataType.FMD_PANORAMAX)); - mTvPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX)); + mPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX)); } private void openUrl(Metadata.MetadataType type) @@ -192,6 +192,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE); case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU); + case FMD_PANORAMAX -> null; // Don't add raw ID to list, as it's useless for users. default -> mMapObject.getMetadata(type); }; // Add user names for social media if available @@ -237,7 +238,8 @@ public class PlacePageLinksFragment extends Fragment implements Observer Date: Sun, 20 Jul 2025 12:13:04 +0200 Subject: [PATCH 002/222] [classif] Add leisure=escape_game Signed-off-by: Filip Czaplicki --- android/app/src/main/res/values/types_strings.xml | 1 + data/categories.txt | 3 +++ data/editor.config | 3 +++ data/mapcss-mapping.csv | 2 +- data/styles/default/dark/symbols/escape_game.svg | 1 + data/styles/default/include/Icons.mapcss | 2 ++ data/styles/default/include/priorities_4_overlays.prio.txt | 2 ++ data/styles/default/light/symbols/escape_game.svg | 1 + data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++ data/types.txt | 2 +- iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 1 + 11 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 data/styles/default/dark/symbols/escape_game.svg create mode 100644 data/styles/default/light/symbols/escape_game.svg diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 3ae6e621e..96474e4cd 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -647,6 +647,7 @@ Leisure Public Land Dog Park + Escape Room Fitness Centre Fitness Station Dance Hall diff --git a/data/categories.txt b/data/categories.txt index ff1b6d516..da31eda62 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -8954,6 +8954,9 @@ tr:Minigolf uk:Мінігольф zh-Hans:迷你高尔夫 +leisure-escape_game +en:4Escape Room|Escape Game + leisure-hackerspace en:4Hackerspace ar:هاكرزبيس diff --git a/data/editor.config b/data/editor.config index 77d127d39..e5dd2a35b 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1355,6 +1355,9 @@ + + + Pour garantir une navigation précise, activez l\'option Position Exacte dans les paramètres. - Voir sur la carte + Afficher la carte Échec lors du téléchargement @@ -905,15 +905,15 @@ Couleur du marque-page Image Panoramax Sauvegarder maintenant - Chaque jour + Quotidien Actuellement ouvert Fermé actuellement Sauvegarde en cours… La sauvegarde a échoué - Chaque semaine + Hebdomadaire Emplacement de sauvegarde - Veuillez d\'abord sélectionner répertoire et accorder l\'autorisation - Aucun signet ni de trace à sauvegarder + Veuillez d\'abord sélectionner un dossier puis accorder l\'autorisation + Ni signet ni trace à sauvegarder Sauvegarde automatique Dernière sauvegarde réussie La sauvegarde s\'est déroulée avec succès diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml index 46e58f2c7..18216d4cc 100644 --- a/android/app/src/main/res/values-iw/strings.xml +++ b/android/app/src/main/res/values-iw/strings.xml @@ -862,4 +862,5 @@ תמונת Panoramax https://comaps.app נשמר + בלוסקיי diff --git a/android/app/src/main/res/values-kab/strings.xml b/android/app/src/main/res/values-kab/strings.xml index 9cd87fce6..8ed0f8128 100644 --- a/android/app/src/main/res/values-kab/strings.xml +++ b/android/app/src/main/res/values-kab/strings.xml @@ -28,4 +28,5 @@ ⴽⵉⵍⵓⵎⵉⵜⵔⴻⵏ Yettwasekles • Yezmer ad yaweḍ berra i usmel, s tɣawla yerna d ameẓyan + Bluesky diff --git a/android/app/src/main/res/values-ml/strings.xml b/android/app/src/main/res/values-ml/strings.xml index 890894841..06c1a3097 100644 --- a/android/app/src/main/res/values-ml/strings.xml +++ b/android/app/src/main/res/values-ml/strings.xml @@ -12,4 +12,5 @@ മാസ്റ്റഡോൺ സംരക്ഷിച്ചു • ഓഫ്‌ലൈൻ, വേഗതയേറിയതും ഒതുക്കമുള്ളതും + Bluesky diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml index 8a461199a..86481c647 100644 --- a/android/app/src/main/res/values-pt-rBR/types_strings.xml +++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml @@ -1397,4 +1397,5 @@ Manguezal Planície de maré Sapal + Escape Room diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index 28889af87..8ea416b53 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -906,4 +906,7 @@ Backup dos marcadores e trajetos A localização de backup selecionada não está disponível ou não permite escrita. Selecione outra localização, por favor. Por favor, envie-nos um reporte de erro:\n - \"Ativar o histórico\" nas definições\n - reproduza o problema\n - no ecrã de \"Acerca & Ajuda\" pressione o botão para \"Reportar um problema\" e envie via email ou chat\n - desative o histórico + Aberto agora + Fechado agora + às %s diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml index 684fc3754..e307ba68a 100644 --- a/android/app/src/main/res/values-pt/types_strings.xml +++ b/android/app/src/main/res/values-pt/types_strings.xml @@ -1401,4 +1401,12 @@ psurface-unpaved_good Instalação Educativa Estação de metro + Escape Room + Local Religioso + Sapal + Marisma + Fen + Caniçal + Pântano + Mangal diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index d29c1d8c2..3f53872c5 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -854,4 +854,23 @@ Veckovis https://comaps.app/sv/ Sparad + Inställning för vänster knapp + Säkerhetskopiering av bokmärken och spår + Inga bokmärken eller spår att säkerhetskopiera + Den valda platsen för säkerhetskopiering är inte tillgänglig eller skrivbar. Vänligen välj en annan plats. + Säkerhetskopiera nu + Inaktivera + Säkerhetskopiera automatiskt till en mapp på din enhet + Skapa en säkerhetskopia omedelbart + Säkerhetskopiering pågår… + Säkerhetskopiering slutförd + Säkerhetskopiering misslyckades + Mappen för säkerhetskopiering är inte tillgänglig + Vänligen välj en mapp först och ge åtkomst + Automatisk säkerhetskopiering + Av (endast manuellt) + Plats för säkerhetskopiering + Öppet nu + Stängt nu + kl. %s diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml index f5240d2ce..5b153c8b8 100644 --- a/android/app/src/main/res/values-sv/types_strings.xml +++ b/android/app/src/main/res/values-sv/types_strings.xml @@ -72,7 +72,7 @@ Vårdhem Parkering Parkering - Flervånings parkering + Flervåningsparkering Flervånings parkering Privat parkering Privat parkering diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml index 9c006c6bb..42d1ff048 100644 --- a/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/android/app/src/main/res/values-zh-rTW/strings.xml @@ -908,4 +908,20 @@ 請先選擇資料夾並授予權限 關於和幫助 自動備份至您裝置上的資料夾 + 需要備份的數目 + 選擇的備份位置無法使用或是無法寫入,請選擇另外的位置。 + 請寄送錯誤報告:\n\n - 設定中\"啟動記錄\"\n\n - 重現問題\n\n - 在\"關於&說明\"畫面按\"回報臭蟲\"按鈕以及透過電子郵件傳送或聊天\n\n - 關閉記錄 + 立刻備份 + 立即建立備份 + 備份中… + 成功建立備份 + 沒有書籤與軌跡需要備份 + 備份失敗 + 備份資料夾並不能用 + 最後成功的備份 + 自動備份 + 每日 + 每週 + 關閉 (只有手動) + 在 %s diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/app/src/main/res/values-zh-rTW/types_strings.xml index 469c3bcec..aa33fc517 100644 --- a/android/app/src/main/res/values-zh-rTW/types_strings.xml +++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml @@ -177,4 +177,290 @@ 遮斷機 入口 窄門 + 共享汽車 + 汽車充電站 + 纜車 + 混合纜車 + 纜車站 + 拖曳纜車 + 機場 + 機場設施 + 國際機場 + 機棚 + 登機門 + 停機坪 + 跑道 + 滑行道 + 長椅 + 單車停車場 + 單車租借 + 單車修理站 + 啤酒花園 + 妓院 + 外匯兌換店 + 客運站 + 咖啡店 + 租車 + 機車租借 + 洗車店 + 賭場 + 賭間 + 成人娛樂中心 + 充電站 + 單車充電站 + 托兒所 + 電影院 + 學院 + 社區中心 + 私人地下停車場 + 耶和華見證人 + 儲槽傾倒站 + 停車場出入口 + 私停車場出入口 + 停車場出入口 + 停車格 + 停車格 + 停車格 + 停車格 + 無障礙停車格 + 繳費機 + 藥局 + 宗教崇拜場所 + 佛寺 + 教堂 + 耶穌基督後期聖徒教會 + 紙張 + 塑膠 + 塑膠瓶 + 廢金屬 + 電子廢棄物 + 餐廳 + 壓縮空氣 + 會議中心 + 法院 + 牙醫 + 醫生 + 飲水 + 飲水 + 駕訓班 + 展覽中心 + 匯款 + 音樂學校 + 語言學校 + 大使館 + 速食餐廳 + 渡輪 + 消防隊 + 美食街 + 噴泉 + 加油站 + 教會墓園 + 宗教墓園 + 醫院 + 狩獵小屋 + 冰淇淋 + 網咖 + 幼兒園 + 圖書館 + 卸貨碼頭 + 市場 + 機車停車場 + 俱樂部 + 療養院 + 停車場 + 停車費用 + 立體停車場 + 立體停車場費用 + 私人停車場 + 私人停車場 + 私人停車場 + 停車轉乘 + 地下停車場 + 地下停車場 + 路邊停車格 + 路邊停車格 + 私人路邊停車格 + 車道停車 + 車道停車 + 印度教寺廟 + 猶太會堂 + 清真寺 + 神道教 + 道觀 + 警察局 + 郵筒 + 郵局 + 監獄 + 酒吧 + 漂書站 + 回收中心 + 回收箱 + 回收箱 + 電池 + 衣服 + 玻璃瓶 + 學校 + 獸醫 + 喬治亞菜 + 菲律賓菜 + 三明治 + 澳洲菜 + 地區邊界 + 熟食店 + 救生員 + 另類醫療 + 土耳其菜 + 大垃圾桶 + 電子產品維修 + 物理治療師 + 密室脫逃 + 障礙物 + 主要入口 + 出口 + 涼亭 + 渟亭 + 露營小屋 + 公共浴場 + 淋浴設施 + 計程車招呼站 + 公共電話 + 戲院 + 廁所 + 廁所 + 市政廳 + 大學 + 自動販賣機 + 香菸販賣機 + 咖啡販賣機 + 保險套販賣機 + 飲料販賣機 + 食品販賣機 + 報紙販賣機 + 停車錶 + 票券販賣機 + 甜點販賣機 + 監理站 + 燃油幫浦 + 垃圾筒 + 水箱加水點 + 水箱加水點 + 邊界 + 行政邊界 + 國家邊界 + 地區邊界 + 國家公園 + 原住民土地 + 保護區 + 保護區 + 保護區 + 保護區 + 保護區 + 保護區 + 保護區 + 建築 + 地址 + 建築 + 建築 + 車站建築 + 倉庫 + 墓穴 + 工藝 + 養蜂 + 鐵匠 + 釀酒師 + 餐飲服務商 + 木匠 + 糖果師 + 電工 + 園丁 + 磨粉 + 手工匠 + 暖氣空調 + 鑰匙切割 + 精緻餐飲 + 魚類 + 法式 + 煎炸 + 德國菜 + 希臘菜 + 燒烤 + 鎖匠 + 鐵工 + 房屋油漆工 + 相機店 + 水管工 + 鋸木 + 修鞋匠 + 酒廠 + 裁縫 + 非洲菜 + 美洲菜 + 阿拉伯菜 + 阿根庭菜 + 亞洲菜 + 巴西菜 + 早餐 + 珍珠奶茶 + 漢堡 + 小酒館 + 蛋糕 + 加勒比菜 + 雞肉 + 中式 + 咖啡 + 可麗餅 + 克羅埃西亞菜 + 咖哩 + 晚餐 + 甜甜圈 + 伊索匹亞菜 + 韓式 + 寮國菜 + 黎巴嫰菜 + 地方菜 + 馬達加斯加菜 + 馬來西亞菜 + 地中海菜 + 墨西哥菜 + 摩洛哥菜 + 麵食 + 東亞菜 + 鬆餅 + 義大利麵 + 波斯菜 + 秘魯菜 + 批薩 + 波蘭菜 + 葡萄牙語 + 拉麵 + 地區菜 + 俄羅斯菜 + 香腸 + 美味煎餅 + 海鮮 + 蕎麥麵 + 西班牙菜 + 牛排館 + 生魚片 + 西班牙小吃 + + 泰式 + 維根 + 素食 + 越南菜 + 緊急 + 緊急集合點 + 除顫器 + 消防栓 + 緊急電話 + 山區救難站 + 入口 + 聽力師 + 捐血中心 + 驗光師 + 足病醫生 + 心理治療師 + 鹽沼 + 潮間鹽沼 + 鹼沼 diff --git a/data/countries-strings/pt.json/localize.json b/data/countries-strings/pt.json/localize.json index 2770ac83a..6eacd5b1c 100644 --- a/data/countries-strings/pt.json/localize.json +++ b/data/countries-strings/pt.json/localize.json @@ -568,8 +568,8 @@ "Italy_Sardinia":"Sardenha", "Italy_Sicily":"Sicília", "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Ádige", -"Italy_Tuscany_Grosseto":"Toscana — Grosseto", -"Italy_Tuscany_Massa e Carrara":"Toscana — Massa-Carrara", +"Italy_Tuscany_Grosseto":"Toscana — Sudeste", +"Italy_Tuscany_Massa e Carrara":"Toscana — Noroeste", "Italy_Umbria":"Úmbria", "Italy_Veneto":"Véneto", "Italy_Veneto_Belluno":"Belluno", @@ -1376,7 +1376,7 @@ "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel", -"Austria_Lower Austria_Wien Description":"Viena", +"Austria_Lower Austria_Wien Description":"Viena, Industrieviertel, Weinviertel", "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau", "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", @@ -1864,7 +1864,7 @@ "Italy_Sicily Description":"Palermo, Catânia", "Italy_Trentino-Alto Adige Sudtirol Description":"Bolzano", "Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena", -"Italy_Tuscany_Massa e Carrara Description":"Florença", +"Italy_Tuscany_Massa e Carrara Description":"Florença, Livorno, Luca, Pisa, Prato, Pistoia, Carrara, Massa", "Italy_Umbria Description":"Perúgia", "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", "Italy_Veneto_Padova Description":"Pádua", diff --git a/data/countries-strings/zh-Hant.json/localize.json b/data/countries-strings/zh-Hant.json/localize.json index cbadfce57..2ed804f2f 100644 --- a/data/countries-strings/zh-Hant.json/localize.json +++ b/data/countries-strings/zh-Hant.json/localize.json @@ -43,7 +43,7 @@ "Azerbaijan":"阿塞拜疆", "Azerbaijan Region":"阿塞拜疆", "Bahrain":"巴林", -"Bangladesh":"孟加拉國", +"Bangladesh":"孟加拉", "Barbados":"巴巴多斯", "Belarus":"白俄羅斯", "Belarus_Brest Region":"布列斯特州", @@ -140,7 +140,7 @@ "Canada_Northwest Territories_Yellowknife":"黃刀鎮", "Canada_Nova Scotia":"新斯科舍", "Canada_Nova Scotia_Halifax":"哈利法克斯", -"Canada_Nova Scotia_Sydney":"Sydney,NS", +"Canada_Nova Scotia_Sydney":"雪梨", "Canada_Nunavut":"努納武特", "Canada_Nunavut_North":"努納武特 - 北部", "Canada_Nunavut_South":"努納武特 - 南部", @@ -256,11 +256,11 @@ "Egypt":"埃及", "El Salvador":"薩爾瓦多", "Equatorial Guinea":"赤道幾內亞", -"Eritrea":"厄立特里亞", +"Eritrea":"厄利垂亞", "Estonia":"愛沙尼亞", "Estonia_East":"愛沙尼亞 - 東部", "Estonia_West":"愛沙尼亞 - 西部", -"Ethiopia":"埃塞俄比亞", +"Ethiopia":"伊索匹亞", "Falkland Islands":"福克蘭群島", "Faroe Islands":"法羅群島", "Federated States of Micronesia":"密克羅尼西亞聯邦", @@ -446,9 +446,9 @@ "Greece_Decentralized Administration of Thessaly - Central Greece":"薩利和希臘中部地方管理部門", "Greece_Decentralized Administration of West Greece":"伯羅奔尼撒半島地方管理部門", "Greenland":"格陵蘭", -"Grenada":"格林納達", +"Grenada":"格拉納達", "Guadeloupe":"瓜德羅普", -"Guatemala":"危地馬拉", +"Guatemala":"瓜地馬拉", "Guernsey":"根西島", "Guinea":"幾內亞", "Guinea-Bissau":"幾內亞比索", @@ -504,7 +504,7 @@ "Indonesia_Jawa Timur":"東爪哇省", "Indonesia_Nusa Tenggara":"小巽他群島", "Indonesia_West":"蘇門答臘", -"Iowa":"艾奧瓦州", +"Iowa":"愛荷華州", "Iran":"伊朗", "Iran_North":"伊朗 - 北部", "Iran_South":"伊朗 - 南部", @@ -517,7 +517,7 @@ "Isle of Man":"馬恩島", "Israel":"以色列", "Israel Region":"以色列", -"Italy":"意大利", +"Italy":"義大利", "Italy_Abruzzo":"阿布魯佐", "Italy_Aosta Valley":"瓦萊達奧斯塔", "Italy_Apulia":"普利亞", @@ -568,8 +568,8 @@ "Italy_Sardinia":"撒丁島", "Italy_Sicily":"西西里島", "Italy_Trentino-Alto Adige Sudtirol":"特倫蒂諾-上阿迪傑", -"Italy_Tuscany_Grosseto":"托斯卡納 — 格羅塞托省", -"Italy_Tuscany_Massa e Carrara":"托斯卡納 — 馬薩-卡拉拉省", +"Italy_Tuscany_Grosseto":"托斯卡納 — 東南", +"Italy_Tuscany_Massa e Carrara":"托斯卡納 —西北", "Italy_Umbria":"翁布里亞", "Italy_Veneto":"威尼托", "Italy_Veneto_Belluno":"貝盧諾省", @@ -640,14 +640,14 @@ "Jerusalem":"耶路撒冷", "Jordan":"約旦", "Kansas":"堪薩斯州", -"Kazakhstan":"哈薩克斯坦", +"Kazakhstan":"哈薩克", "Kentucky":"肯塔基州", -"Kenya":"肯尼亞", -"Kingdom of Lesotho":"萊索托", +"Kenya":"肯亞", +"Kingdom of Lesotho":"賴索托", "Kiribati":"吉里巴斯", "Kuwait":"科威特", "Kyrgyzstan":"吉爾吉斯斯坦", -"Laos":"老撾", +"Laos":"寮國", "Latvia":"拉脫維亞", "Lebanon":"黎巴嫩", "Liberia":"利比里亞", @@ -660,7 +660,7 @@ "Madagascar":"馬達加斯加", "Malawi":"馬拉維", "Malaysia":"馬來西亞", -"Maldives":"馬爾代夫", +"Maldives":"馬爾地夫", "Mali":"馬里共和國", "Malta":"馬耳他", "Marshall Islands":"馬紹爾群島", @@ -677,7 +677,7 @@ "Mexico_Mexico":"墨西哥城", "Mexico_North":"墨西部哥 - 北部", "Mexico_South":"墨西部哥 - 南部", -"Michigan":"密歇根州", +"Michigan":"密西根州", "Minnesota":"明尼蘇達州", "Missouri":"密蘇里州", "Moldova":"摩爾多瓦", @@ -731,12 +731,12 @@ "New Zealand South_Canterbury":"南部 - 坎特伯雷地區", "New Zealand South_Southland":"南部 - 南部地區", "Nicaragua":"尼加拉瓜", -"Niger":"尼日爾", +"Niger":"尼日", "Nigeria":"奈及利亞", "Niue":"紐埃", "North Carolina":"北卡羅來納州", "North Dakota":"北達科他州", -"North Korea":"朝鮮民主主義人民共和國", +"North Korea":"北韓", "Norway":"挪威", "Norway_Bouvet Island":"布韋島", "Norway_Central":"奧斯陸", @@ -760,7 +760,7 @@ "Papua New Guinea":"巴布亞新幾內亞", "Paraguay":"巴拉圭", "Pennsylvania":"賓夕法尼亞州", -"People's Republic of China":"中華人民共和國", +"People's Republic of China":"中國", "Peru":"秘魯", "Peru_North":"秘魯 - 北部", "Peru_South":"秘魯 - 南部", @@ -928,9 +928,9 @@ "South Africa_Western Cape":"西開普省", "South Carolina":"南卡羅來納州", "South Georgia and the South Sandwich Islands":"南喬治亞島與南桑威奇群島", -"South Korea":"大韓民國", -"South Korea_North":"韓國 - 北部", -"South Korea_South":"韓國 - 南部", +"South Korea":"南韓", +"South Korea_North":"南韓 - 北部", +"South Korea_South":"南韓 - 南部", "South Ossetia":"南奧塞梯", "South Sudan":"南蘇丹", "Spain":"西班牙", @@ -959,11 +959,11 @@ "Sri Lanka":"斯里蘭卡", "Sudan":"蘇丹共和國", "Suriname":"蘇利南", -"Swaziland":"埃斯瓦蒂尼", +"Swaziland":"史瓦蒂尼", "Sweden":"瑞典", -"Sweden_Bergslagen":"Bergslagen", +"Sweden_Bergslagen":"伯格斯拉根", "Sweden_Malardalen":"梅拉達倫", -"Sweden_Mellannorrland":"Mellannorrland", +"Sweden_Mellannorrland":"中北部", "Sweden_Norra Sverige":"瑞典北部", "Sweden_Ostra Gotaland":"東約特蘭", "Sweden_Sodra Gotaland":"南約特蘭", @@ -977,11 +977,11 @@ "Switzerland_Ticino":"提契諾州", "Switzerland_Zurich":"蘇黎世都會區", "Syria":"敘利亞", -"Taiwan":"中華民國", -"Tajikistan":"塔吉克斯坦", +"Taiwan":"臺灣", +"Tajikistan":"塔吉克", "Tanzania":"坦桑尼亞", "Tennessee":"田納西州", -"Texas":"得克薩斯州", +"Texas":"德克薩斯州", "Thailand":"泰國", "Thailand_North":"泰國 - 北部", "Thailand_South":"泰國 - 南部", @@ -1086,14 +1086,14 @@ "US_Minnesota_Rochester":"羅徹斯特", "US_Minnesota_Saint Cloud":"聖克勞德", "US_Mississippi":"密西西比州", -"US_Missouri_East":"密蘇裏州 - 東部", -"US_Missouri_West":"密蘇裏州 - 西部", +"US_Missouri_East":"密蘇里州 - 東部", +"US_Missouri_West":"密蘇里州 - 西部", "US_Montana":"蒙大拿州", "US_Nebraska":"內布拉斯加州", "US_Nevada":"內華達州", "US_New Hampshire":"新罕布什爾州", -"US_New Jersey_North":"新澤西部州 - 北部", -"US_New Jersey_South":"新澤西部州 - 南部", +"US_New Jersey_North":"紐澤西州 - 北部", +"US_New Jersey_South":"紐澤西州 - 南部", "US_New Mexico":"新墨西哥州", "US_New York_East":"紐約州 — 長島", "US_New York_New York":"紐約州 — 紐約", @@ -1175,22 +1175,22 @@ "Ukraine_Zakarpattia Oblast":"外喀爾巴阡州", "Ukraine_Zaporizhia Oblast":"扎波羅熱州", "Ukraine_Zhytomyr Oblast":"日托米爾州", -"United Arab Emirates":"阿拉伯聯合酋長國", +"United Arab Emirates":"阿拉伯聯合大公國", "United Kingdom":"英國", "United States Virgin Islands":"美屬維爾京群島", "United States of America":"美國", "Uruguay":"烏拉圭", -"Uzbekistan":"烏茲別克斯坦", +"Uzbekistan":"烏茲別克", "Vanuatu":"萬那杜", "Venezuela":"委內瑞拉", "Vietnam":"越南", -"Virginia":"弗吉尼亞州", +"Virginia":"維吉尼亞州", "Wallis and Futuna":"瓦利斯和富圖納群島", "Washington":"華盛頓州", "Willis Island":"威利斯島", "Wisconsin":"威斯康辛州", -"Yemen":"也門", -"Zambia":"贊比亞", +"Yemen":"葉門", +"Zambia":"尚比亞", "Zimbabwe":"辛巴威", "Argentina_Santa Fe":"聖大非省", "Australia_Brisbane":"布里斯班", @@ -1215,8 +1215,8 @@ "Chile_Central":"智利 - 中心", "Congo-Kinshasa_Kivu":"基伍", "Congo-Kinshasa_West":"剛果 - 西", -"Croatia_Central":"克羅地亞 - 中", -"Croatia_West":"克羅地亞 - 西", +"Croatia_Central":"克羅埃西亞 - 中部", +"Croatia_West":"克羅埃西亞 - 西", "Ecuador_East":"厄瓜多爾 - 東", "Ecuador_West":"厄瓜多爾 - 西", "Finland_Eastern Finland_North":"東芬蘭 - 北", @@ -1247,8 +1247,8 @@ "Nepal_Kathmandu":"加德滿都", "Nepal_Madhyamanchal":"中部地區", "Nepal_Purwanchal":"東部地區", -"Nigeria_North":"尼日利亞 - 北", -"Nigeria_South":"尼日利亞 - 南", +"Nigeria_North":"尼日 - 北", +"Nigeria_South":"尼日 - 南", "Norway_Hordaland":"霍達蘭郡", "Norway_Nordland":"諾爾蘭郡", "Norway_North Trondelag":"北特倫德拉格郡", @@ -1271,8 +1271,8 @@ "Russia_Yugra_Surgut":"漢特-曼西自治區 — 蘇爾古特", "Saudi Arabia_North":"沙烏地阿拉伯 - 北", "Saudi Arabia_South":"沙烏地阿拉伯 - 南", -"Slovenia_East":"斯洛文尼亞 - 東", -"Slovenia_West":"斯洛文尼亞 - 西", +"Slovenia_East":"斯洛維尼亞 - 東", +"Slovenia_West":"斯洛維尼亞 - 西", "Spain_Andalusia_Granada":"安達魯西亞 — 格拉納達", "Spain_Andalusia_Sevilla":"安達魯西亞 — 塞維利亞", "Spain_Castile and Leon_East":"卡斯蒂利亞和萊昂 - 東", @@ -1345,7 +1345,7 @@ "US_Virginia_Norfolk":"諾福克", "Abkhazia Description":"Pitsunda, Gudauta, Sukhum", "Afghanistan Description":"Kabul, Kandahar, Tokzar", -"Albania Description":"斯库台", +"Albania Description":"斯庫台卡瓦耶地拉那", "Algeria_Central Description":"Batna, Djelfa, Biskra", "Algeria_Coast Description":"Algiers, Oran, Constantine", "Andorra Description":"Andorra la Vella, La Massana, Ordino", @@ -1376,7 +1376,7 @@ "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", "Austria_Lower Austria_West Description":"莫斯特地區,瓦爾德地區", -"Austria_Lower Austria_Wien Description":"維也納新城", +"Austria_Lower Austria_Wien Description":"維也納工業區", "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau", "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", @@ -1417,7 +1417,7 @@ "Brazil_Bahia Description":"维多利亚-达孔基斯塔", "Brazil_Goias_Brasilia Description":"阿帕雷西達迪戈亞尼亞", "Brazil_Goias_North Description":"Goianésia, Jaraguá, Porangatu", -"Brazil_Mato Grosso Description":"龙多诺波利斯", +"Brazil_Mato Grosso Description":"隆多諾波利斯大瓦爾澤亞庫亞巴", "Brazil_Mato Grosso Do Sul Description":"Campo Grande, Dourados, Três Lagoas", "Brazil_North Region_East Description":"馬卡帕", "Brazil_North Region_West Description":"里約布蘭科", @@ -1754,7 +1754,7 @@ "Greenland Description":"Kangaatsiaq, Qaqortoq, Paamiut", "Grenada Description":"St. George's, Gouyave, Calivigny", "Guadeloupe Description":"Les Abymes, Baie-Mahault, Le Gosier", -"Guatemala Description":"Guatemala City, Quetzaltenango (Xela), Santo Tomas De Castilla", +"Guatemala Description":"瓜地馬拉市, Quetzaltenango (Xela), Santo Tomas De Castilla", "Guernsey Description":"Saint Peter Port, St Anne, The Bridge", "Guinea Description":"Conakry, Coyah, Nzérékoré", "Guinea-Bissau Description":"Bissau, Mansôa, Bubaque", @@ -1863,8 +1863,8 @@ "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena", "Italy_Sicily Description":"墨西拿", "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto", -"Italy_Tuscany_Grosseto Description":"格罗塞托", -"Italy_Tuscany_Massa e Carrara Description":"普拉托", +"Italy_Tuscany_Grosseto Description":"錫耶納格羅塞托阿雷佐", +"Italy_Tuscany_Massa e Carrara Description":"佛羅倫斯、利沃諾、盧卡、披薩、普拉托、皮斯托亞、卡拉拉、馬薩", "Italy_Umbria Description":"Perugia, Terni, Foligno", "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", "Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro", diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings index 1d69f689c..66dfa12e4 100644 --- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 783c19c81..db35932b7 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -289,7 +289,7 @@ "line" = "Line"; /* Text in the editor */ -"bluesky" = "Bluesky"; +"bluesky" = "بلوسكاي"; /* Text in menu */ "panoramax" = "Panoramax"; @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings index 88af52a5b..f57d31779 100644 --- a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings @@ -586,3 +586,6 @@ "traffic_update_maps_text" = "To display traffic data, maps must be updated."; "routing_requires_all_map" = "In order to create a route, we need to download and update all the maps from your location to your destination."; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings index 815c79078..15b0d38f2 100644 --- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings @@ -1080,3 +1080,6 @@ "app_tip_02" = "Do you like our app? Please donate to support the development! Don't like it yet? Please let us know why, and we will fix it!"; "app_tip_01" = "With your donations and support, we can create the best maps in the World!"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index 7e3a92789..5750846da 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 66aa0d234..b80d95ae4 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings index 33c0a3de8..b7091f026 100644 --- a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings @@ -586,3 +586,6 @@ "yes_available" = "Yes"; "pref_mapappearance_title" = "Map Appearance"; "pref_tts_enable_title" = "Enable Voice Instructions"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings index b328f84c1..16050613a 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings @@ -322,7 +322,7 @@ "volunteer" = "Fer-se voluntari"; /* "Social media" section header in the About screen */ -"follow_us" = "Segueix i contacta amb nosaltres"; +"follow_us" = "Connecta amb nosaltres"; /* Alert text */ "email_error_body" = "No s'ha configurat cap client de correu electrònic. Configureu-lo o useu un altra via per contactar amb nosaltres a %@"; @@ -1094,3 +1094,6 @@ "about_headline" = "Projecte obert, desenvolupat per la comunitat"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 31494f0e8..774dd859c 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "osm_profile_view_notes" = "Zobrazit poznámky"; "osm_profile_view_edit_history" = "Zobrazit historii úprav"; "pref_mapappearance_title" = "Vzhled mapy"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index c610ea7bb..5a1805499 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1096,3 +1096,6 @@ "osm_profile_view_notes" = "Se bemærkninger"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index f3044e060..c940b9322 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "track_recording_toast_nothing_to_save" = "Route ist leer - nichts zu speichern"; "edit_track" = "Track bearbeiten"; "pref_mapappearance_title" = "Kartendarstellung"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 56678dc34..2e9ed8a2f 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index eae2744d6..9e23ee69e 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Ver historial de ediciones"; "osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index e279ab30f..a189536ad 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "Voluntariado"; /* "Social media" section header in the About screen */ -"follow_us" = "Síganos y póngase en contacto con nosotros"; +"follow_us" = "Conecta con nosotros"; /* Alert text */ "email_error_body" = "No se ha configurado el cliente de correo electrónico. Configúrelo o contáctenos en %@"; @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Ver historial de ediciones"; "osm_profile_view_notes" = "Ver notas"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings index cb9a512d6..644d73d6e 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings @@ -325,7 +325,7 @@ "volunteer" = "Vabatahtlik kaastöö"; /* "Social media" section header in the About screen */ -"follow_us" = "Võta meiega ühendust"; +"follow_us" = "Suhtle meiega"; /* Alert text */ "email_error_body" = "E-posti klienti ei ole seadistatud. Palun seadista see või kasuta mõnda muud võimalust meiega ühenduse võtmiseks aadressil %@"; @@ -1096,3 +1096,6 @@ "osm_profile_view_notes" = "Vaata märkused"; "about_proposition_3" = "Läbipaistev ja kasumit mittetaotlev"; "pref_mapappearance_title" = "Kaardi välimus"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index f5363225f..2439d348a 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -1096,3 +1096,6 @@ "osm_profile_view_edit_history" = "Aldaketen historia ikusi"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict index d9e7259e5..9d014d36e 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict @@ -31,9 +31,9 @@ NSStringFormatValueTypeKey d one - fitxategi %d aurkitu da. Elkarrizketaren ondoren ikusiko duzu. + Fitxategi %d aurkitu da. Bihurketaren ondoren ikusiko duzu. other - %d fitxategi aurkitu dira. Elkarrizketaren ondoren ikusiko dituzu. + %d fitxategi aurkitu dira. Bihurketaren ondoren ikusiko dituzu. tracks @@ -47,9 +47,9 @@ NSStringFormatValueTypeKey d one - %d arrasto + arrasto %d other - %d arrastos + %d arrasto diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings index 99287bee8..6a758dee1 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings @@ -672,7 +672,7 @@ /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ "type.landuse.cemetery.christian" = "Hilerria"; -"type.landuse.religious" = "Religious Land"; +"type.landuse.religious" = "Eremu erlijiosoa"; "type.landuse.commercial" = "Komertzial-gunea"; "type.landuse.construction" = "Eraikitze-gunea"; "type.landuse.education" = "Hezkuntza-azpiegitura"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 1b33cbbe9..3f853379d 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -289,7 +289,7 @@ "line" = "Line"; /* Text in the editor */ -"bluesky" = "Bluesky"; +"bluesky" = "بلواسکای"; /* Text in menu */ "panoramax" = "Panoramax"; @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 9c8e685cb..d41811620 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Näytä muokkaushistoria"; "osm_profile_view_notes" = "Näytä ilmoitukset"; "pref_mapappearance_title" = "Kartan ulkoasu"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings index dd0c8eeae..c8b2f60f7 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings @@ -1499,4 +1499,4 @@ "type.natural.wetland.swamp" = "Suo"; "type.natural.wetland.mangrove" = "Mangrove"; "type.natural.wetland.tidalflat" = "Vuorovesitasanko"; -"type.leisure.escape_game" = "Escape Room"; +"type.leisure.escape_game" = "Pakohuonepeli"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 7341dc077..78a6b5a8b 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -34,7 +34,7 @@ "use_cellular_data" = "Oui"; /* View and button titles for accessibility */ -"zoom_to_country" = "Voir sur la carte"; +"zoom_to_country" = "Afficher la carte"; /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */ "country_status_download_without_size" = "Téléchargez la carte"; @@ -328,7 +328,7 @@ "volunteer" = "Se porter volontaire"; /* "Social media" section header in the About screen */ -"follow_us" = "Échange avec nous"; +"follow_us" = "Rentrez en contact avec nous"; /* Alert text */ "email_error_body" = "Le client de courriel n'a pas été configuré. Veuillez le configurer ou nous contacter à %@"; @@ -1098,3 +1098,6 @@ "osm_profile_view_notes" = "Afficher les notes"; "osm_profile_view_edit_history" = "Afficher l'historique des modifications"; "pref_mapappearance_title" = "Apparence de la carte"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings index fcca687e8..120215c59 100644 --- a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings @@ -128,7 +128,7 @@ "report_a_bug" = "Informar dun fallo"; "report_incorrect_map_bug" = "Informar ou corrixir datos de mapa incorrectos"; "volunteer" = "Voluntariado"; -"follow_us" = "Síganos e póñase en contacto connosco"; +"follow_us" = "Contacta con nós"; "email_error_body" = "Non se configurou o cliente de correo electrónico. Configúreo ou @contáctar en %@"; "email_error_title" = "Erro de envío de correo"; "pref_calibration_title" = "Calibración do compás"; @@ -586,3 +586,6 @@ "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org)."; "social_pixelfed" = "Pixelfed"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings index 5eb807300..e90877a42 100644 --- a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings @@ -586,3 +586,6 @@ "social_mastodon" = "Mastodon"; "social_pixelfed" = "Pixelfed"; "pref_mapappearance_title" = "Chartedarstellig"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 30e6af2c8..416176651 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -289,7 +289,7 @@ "line" = "Line"; /* Text in the editor */ -"bluesky" = "Bluesky"; +"bluesky" = "בלוסקיי"; /* Text in menu */ "panoramax" = "Panoramax"; @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings index 90c8027ee..d97e63bc0 100644 --- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings index b1d9ee476..ffe003382 100644 --- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings @@ -586,3 +586,6 @@ "dialog_routing_intermediate_not_determined" = "Please adjust your intermediate point."; "open_in_app" = "Open in Another App"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index eb4f9cd7c..ca49e2a3b 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings index 9c0b2bc00..5e05d3159 100644 --- a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings @@ -586,3 +586,6 @@ "thank_you" = "Thank You"; "yes_available" = "Yes"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 2e459bd58..ebb192d5f 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings index 15eb3f0da..7e78c7d17 100644 --- a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings @@ -586,3 +586,6 @@ "pref_zoom_title" = "Zoom buttons"; "car_continue_in_the_car" = "To the car screen"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 159ff2ba3..bb1d15572 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "Per fare il volontario"; /* "Social media" section header in the About screen */ -"follow_us" = "Seguici e contattaci"; +"follow_us" = "Contattaci"; /* Alert text */ "email_error_body" = "Il client di posta elettronica non è stato configurato. Per favore, configuralo o contattaci all'indirizzo %@"; @@ -1097,4 +1097,7 @@ "osm_profile_delete" = "Elimina account OpenStreetMap"; "osm_profile_reauthorize" = "Riconnettiti a OpenStreetMap"; "osm_profile_view_notes" = "Visualizza note"; -"pref_mapappearance_title" = "Map Appearance"; +"pref_mapappearance_title" = "Aspetto della mappa"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index ee26b6b47..08ed5972f 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1097,4 +1097,7 @@ "edit_track" = "ルートを編集"; "osm_profile_view_notes" = "メモを表示"; "osm_profile_view_edit_history" = "編集履歴を表示"; -"pref_mapappearance_title" = "Map Appearance"; +"pref_mapappearance_title" = "マップの外観"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings index 1547a298f..27e1b0482 100644 --- a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings @@ -16,13 +16,13 @@ "social_codeberg" = "Codeberg"; "osm_profile_delete" = "Kkes amiḍan n OpenStreetMap"; "osm_profile_logout" = "Tuffɣa seg umiḍan n OpenStreetMap"; -"osm_profile_view_notes" = "Wali tamawt"; +"osm_profile_view_notes" = "Wali tizmilin"; "social_lemmy" = "Lemmy"; "social_bluesky" = "Bluesky"; "osm_profile_login" = "Akeccum ɣer amiḍan n OpenStreetMap"; "osm_profile_reauthorize" = "Aɛiwed n tuqqna s OpenStreetMap"; "osm_profile_remove" = "Kkes tasmekta n umiḍan n OpenStreetMap seg useɣzan-a"; -"osm_profile_view_edit_history" = "Wali amezruy n ubeddel"; +"osm_profile_view_edit_history" = "Wali amezruy n tiẓrigin"; "osm_profile_reauthorize_promt" = "Imiḍan n OpenStreetMap yettwaqleɛ seg useɣzan-a"; "osm_profile_remove_promt" = "Ma ur tezmireḍ ara neɣ ur tebɣiḍ ara ad ternuḍ amidan-ik, tzemreḍ kan ad t-tekkseḍ seg usmel-a"; "downloader_search_field_hint" = "Find map"; @@ -586,3 +586,6 @@ "length" = "Length"; "done" = "Done"; "pref_mapappearance_title" = "Map Appearance"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_title" = "Map Language"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 3166b19c3..3464bd0ad 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings index 9ddcd7200..fe426386f 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings @@ -202,7 +202,7 @@ "share_my_location" = "Bendrinti mano vietą"; "prefs_group_route" = "Navigacija"; "pref_zoom_title" = "Mastelio mygtukai"; -"pref_left_button_type" = "Left Main Button"; +"pref_left_button_type" = "Kairysis pagrindinis mygtukas"; /* Settings «Map» category: «Appearance» title */ "pref_appearance_title" = "Išvaizda"; @@ -1094,5 +1094,8 @@ "edit_track" = "Redaguoti trasą"; "osm_profile_view_notes" = "Peržiūrėti pastabas"; "osm_profile_view_edit_history" = "Peržiūrėti keitimų istoriją"; -"about_proposition_3" = "Transparent and not for profit"; -"pref_mapappearance_title" = "Map Appearance"; +"about_proposition_3" = "Skaidrus ir nesiekiantis pelno"; +"pref_mapappearance_title" = "Žemėlapio išvaizda"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict index a0b50aef1..ab55ab95f 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict @@ -12,6 +12,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d + zero + %d žymių one %d žymė few @@ -30,6 +32,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d + zero + Aptikta %d failų. Juos galėsite pamatyti, atlikus konvertavimą. one Aptiktas %d failas. Jį (juos) galėsite pamatyti, atlikus konvertavimą. few @@ -48,6 +52,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d + zero + %d trasų one %d trasa few diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings index bb77428aa..e436d2fd3 100644 --- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings index 7a86dc75f..f93e4e321 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings @@ -586,3 +586,6 @@ "hide" = "Hide"; "navigation_stop_button" = "Stop"; "pref_mapappearance_title" = "Map Appearance"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_title" = "Map Language"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 7890da415..0591568b7 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -1092,3 +1092,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings index 41671b466..b01aa404c 100644 --- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org)."; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index d50f58463..df65f768a 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1096,3 +1096,6 @@ "osm_profile_view_notes" = "Vis merknader"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 03ede5fa4..5667fc4c2 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Bewerkingsgeschiedenis bekijken"; "osm_profile_view_notes" = "Opmerkingen bekijken"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 6ef720caa..625d2d3cb 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -325,7 +325,7 @@ "volunteer" = "Wolontariusz"; /* "Social media" section header in the About screen */ -"follow_us" = "Śledź nas i skontaktuj się z nami"; +"follow_us" = "Skontaktuj się z nami"; /* Alert text */ "email_error_body" = "Klient pocztowy nie został skonfigurowany. Proszę skonfigurować go, bądź skorzystać z innych opcji, aby się z nami skontaktować na %@"; @@ -1096,3 +1096,6 @@ "osm_profile_view_notes" = "Wyświetl uwagi"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index bef67cbf1..28c8db259 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Ver histórico de edições"; "osm_profile_view_notes" = "Ver notas"; "pref_mapappearance_title" = "Aparência do mapa"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index aa20388f6..03f4a1841 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -325,7 +325,7 @@ "volunteer" = "Voluntaria-te"; /* "Social media" section header in the About screen */ -"follow_us" = "Segue-nos e contacta-nos"; +"follow_us" = "Entra em contacto connosco"; /* Alert text */ "email_error_body" = "O programa de email não está configurado. Por favor, configure-o ou utilize qualquer outra forma de nos contactar através de %@"; @@ -1094,5 +1094,8 @@ "edit_track" = "Editar trajeto"; "osm_profile_view_notes" = "Ver notas"; "osm_profile_view_edit_history" = "Ver histórico de edições"; -"about_proposition_3" = "Transparent and not for profit"; -"pref_mapappearance_title" = "Map Appearance"; +"about_proposition_3" = "Transparente e sem fins lucrativos"; +"pref_mapappearance_title" = "Aparência do Mapa"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings index ef2788e79..9045a9432 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings @@ -672,7 +672,7 @@ /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ "type.landuse.cemetery.christian" = "Cemitério cristão"; -"type.landuse.religious" = "Religious Land"; +"type.landuse.religious" = "Local Religioso"; "type.landuse.commercial" = "Área comercial"; "type.landuse.construction" = "Construção"; "type.landuse.education" = "Instalação Educativa"; @@ -1493,10 +1493,10 @@ "type.sport.diving" = "Mergulho alto"; "type.railway.station.subway.qingdao" = "Estação de metro"; "type.natural.wetland.tidalflat" = "Tidal Flat"; -"type.natural.wetland.swamp" = "Swamp"; -"type.natural.wetland.saltmarsh" = "Salt Marsh"; -"type.natural.wetland.mangrove" = "Mangrove"; +"type.natural.wetland.swamp" = "Pântano"; +"type.natural.wetland.saltmarsh" = "Sapal"; +"type.natural.wetland.mangrove" = "Mangal"; "type.natural.wetland.fen" = "Fen"; -"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; -"type.natural.wetland.reedbed" = "Reed Bed"; +"type.natural.wetland.saltmarsh.tidal" = "Marisma"; +"type.natural.wetland.reedbed" = "Caniçal"; "type.leisure.escape_game" = "Escape Room"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index da0399ade..13ec86a68 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 1e7ef6b34..13fb53d08 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "Cтать волонтёром"; /* "Social media" section header in the About screen */ -"follow_us" = "Подписывайтесь и пишите нам"; +"follow_us" = "Свяжитесь с нами"; /* Alert text */ "email_error_body" = "Почтовый клиент не настроен. Настройте его или используйте другие способы для связи. Наш адрес - %@"; @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "История правок"; "osm_profile_view_notes" = "Заметки"; "pref_mapappearance_title" = "Map Appearance"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_title" = "Map Language"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index e4a0f10c0..4527ac5ae 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_title" = "Map Language"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings index 9f4c40f97..5f95cc83b 100644 --- a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings @@ -586,3 +586,6 @@ "drive_through" = "Drive-through"; "enable_icloud_synchronization_title" = "Enable iCloud Syncronization"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings index a057c2e12..75fa28aa0 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings @@ -1096,3 +1096,6 @@ "osm_profile_view_edit_history" = "Погледајте историју измена"; "about_headline" = "Отворени пројекат који покреће заједница"; "pref_mapappearance_title" = "Изглед мапе"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 87af3a49a..9867a9075 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -518,7 +518,7 @@ "autodownload" = "Automatisk nedladdning"; /* Place Page opening hours text */ -"closed_now" = "Stängt just nu"; +"closed_now" = "Stängt nu"; /* Place Page opening hours text */ "daily" = "Dagligen"; @@ -1094,3 +1094,6 @@ "about_proposition_3" = "Transparent and not for profit"; "about_headline" = "Open project powered by the community"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings index 1894562b8..fa5fb14fa 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings @@ -87,7 +87,7 @@ "type.amenity.nursing_home" = "Vårdhem"; "type.amenity.parking" = "Parkering"; "type.amenity.parking.fee" = "Parkering"; -"type.amenity.parking.multi.storey" = "Flervånings parkering"; +"type.amenity.parking.multi.storey" = "Flervåningsparkering"; "type.amenity.parking.multi.storey.fee" = "Flervånings parkering"; "type.amenity.parking.no.access" = "Privat parkering"; "type.amenity.parking.permissive" = "Privat parkering"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 406b5db3d..7064b9a42 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1088,3 +1088,6 @@ "about_proposition_3" = "Transparent and not for profit"; "downloading" = "Downloading…"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 746ba5865..2dcb8670d 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index a91a0f35a..430f100ca 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "Gönüllü ol"; /* "Social media" section header in the About screen */ -"follow_us" = "Bizi izle ve iletişime geç"; +"follow_us" = "Bize Bağlanın"; /* Alert text */ "email_error_body" = "E-posta istemcisi henüz kurulmamış. Lütfen e-posta istemcisini yapılandırın veya bize %@ adresinden ulaşmak için başka bir yöntem deneyin"; @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "Düzenleme geçmişini görüntüle"; "osm_profile_view_notes" = "Notları görüntüle"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 55601aa34..f5ffdfc7f 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1096,3 +1096,6 @@ "osm_profile_view_edit_history" = "Переглянути історію редагувань"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 297fb79cb..f49759c13 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1094,3 +1094,6 @@ "about_headline" = "Open project powered by the community"; "about_proposition_3" = "Transparent and not for profit"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index f05f4c867..0dad7aec3 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "志愿者"; /* "Social media" section header in the About screen */ -"follow_us" = "关注并联系我们"; +"follow_us" = "联系我们"; /* Alert text */ "email_error_body" = "尚未设置电子邮件客户端。请进行配置或通过 %@ 联系我们"; @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "查看编辑历史"; "osm_profile_view_notes" = "查看注记"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 94abceb9c..636b217d1 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -328,7 +328,7 @@ "volunteer" = "志願者"; /* "Social media" section header in the About screen */ -"follow_us" = "追蹤並聯絡我們"; +"follow_us" = "聯絡我們"; /* Alert text */ "email_error_body" = "電子郵件客戶端未設定。請配置電子郵件客戶端或通過 %@ 聯絡我們"; @@ -1098,3 +1098,6 @@ "osm_profile_view_edit_history" = "查看編輯歷史記錄"; "osm_profile_view_notes" = "查看註記"; "pref_mapappearance_title" = "Map Appearance"; +"pref_maplanguage_title" = "Map Language"; +"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"pref_maplanguage_local" = "Local Language"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings index 6db1e6f22..2f556bb34 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings @@ -4,17 +4,17 @@ "type.aerialway" = "架空索道"; "type.aerialway.cable_car" = "纜車"; "type.aerialway.chair_lift" = "吊椅索道"; -"type.aerialway.drag_lift" = "纜車要素"; -"type.aerialway.gondola" = "循環式索道"; -"type.aerialway.mixed_lift" = "纜車"; +"type.aerialway.drag_lift" = "拖曳纜車"; +"type.aerialway.gondola" = "纜車"; +"type.aerialway.mixed_lift" = "混合纜車"; "type.aerialway.station" = "纜車站"; -"type.aeroway" = "機場要素"; +"type.aeroway" = "機場設施"; "type.aeroway.aerodrome" = "機場"; -"type.aeroway.aerodrome.international" = "機場"; -"type.aeroway.apron" = "機場停機坪"; -"type.aeroway.gate" = "登機口"; -"type.aeroway.helipad" = "直升機場"; -"type.aeroway.runway" = "機場跑道"; +"type.aeroway.aerodrome.international" = "國際機場"; +"type.aeroway.apron" = "機棚"; +"type.aeroway.gate" = "登機門"; +"type.aeroway.helipad" = "停機坪"; +"type.aeroway.runway" = "跑道"; "type.aeroway.taxiway" = "滑行道"; "type.aeroway.terminal" = "航廈"; "type.amenity" = "設施"; @@ -23,136 +23,136 @@ "type.amenity.bank" = "銀行"; "type.amenity.bar" = "酒吧"; "type.amenity.bbq" = "烤肉架"; -"type.amenity.bench" = "長板凳"; -"type.amenity.bicycle_parking" = "腳踏車停放區"; -"type.amenity.bicycle_rental" = "自行車出租"; -"type.amenity.bicycle_repair_station" = "自行車維修站"; +"type.amenity.bench" = "長椅"; +"type.amenity.bicycle_parking" = "單車停車場"; +"type.amenity.bicycle_rental" = "單車租借"; +"type.amenity.bicycle_repair_station" = "單車修理站"; "type.amenity.biergarten" = "啤酒花園"; "type.amenity.brothel" = "妓院"; -"type.amenity.bureau_de_change" = "匯率"; -"type.amenity.bus_station" = "公車站"; -"type.amenity.cafe" = "咖啡廳"; +"type.amenity.bureau_de_change" = "外匯兌換店"; +"type.amenity.bus_station" = "客運站"; +"type.amenity.cafe" = "咖啡店"; "type.amenity.car_rental" = "租車"; -"type.amenity.motorcycle_rental" = "摩托車租賃"; -"type.amenity.car_sharing" = "汽車共用"; -"type.amenity.car_wash" = "洗車"; +"type.amenity.motorcycle_rental" = "機車租借"; +"type.amenity.car_sharing" = "共享汽車"; +"type.amenity.car_wash" = "洗車店"; "type.amenity.casino" = "賭場"; -"type.amenity.gambling" = "賭博"; -"type.leisure.adult_gaming_centre" = "成人遊戲中心"; +"type.amenity.gambling" = "賭間"; +"type.leisure.adult_gaming_centre" = "成人娛樂中心"; "type.leisure.amusement_arcade" = "電子遊樂場"; "type.amenity.charging_station" = "充電站"; -"type.amenity.charging_station.bicycle" = "自行車充電站"; +"type.amenity.charging_station.bicycle" = "單車充電站"; "type.amenity.charging_station.motorcar" = "汽車充電站"; -"type.amenity.childcare" = "保育"; +"type.amenity.childcare" = "托兒所"; "type.amenity.cinema" = "電影院"; "type.leisure.bowling_alley" = "保齡球館"; "type.amenity.clinic" = "診所"; "type.amenity.college" = "學院"; -"type.amenity.community_centre" = "社區活動中心"; -"type.amenity.compressed_air" = "壓縮的空氣"; +"type.amenity.community_centre" = "社區中心"; +"type.amenity.compressed_air" = "壓縮空氣"; "type.amenity.conference_centre" = "會議中心"; "type.amenity.courthouse" = "法院"; "type.amenity.dentist" = "牙醫"; -"type.amenity.doctors" = "醫師診間"; -"type.amenity.drinking_water" = "飲用水"; -"type.drinking_water.yes" = "飲用水"; +"type.amenity.doctors" = "醫生"; +"type.amenity.drinking_water" = "飲水"; +"type.drinking_water.yes" = "飲水"; "type.amenity.driving_school" = "駕訓班"; "type.amenity.exhibition_centre" = "展覽中心"; "type.amenity.money_transfer" = "匯款"; "type.amenity.music_school" = "音樂學校"; "type.amenity.language_school" = "語言學校"; "type.office.diplomatic" = "大使館"; -"type.amenity.fast_food" = "速食店"; -"type.amenity.ferry_terminal" = "渡船"; -"type.amenity.fire_station" = "消防局"; -"type.amenity.food_court" = "美食廣場"; +"type.amenity.fast_food" = "速食餐廳"; +"type.amenity.ferry_terminal" = "渡輪"; +"type.amenity.fire_station" = "消防隊"; +"type.amenity.food_court" = "美食街"; "type.amenity.fountain" = "噴泉"; -"type.amenity.fuel" = "加氣站"; +"type.amenity.fuel" = "加油站"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.amenity.grave_yard" = "墓地"; +"type.amenity.grave_yard" = "宗教墓園"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.amenity.grave_yard.christian" = "基督教墓地"; +"type.amenity.grave_yard.christian" = "教會墓園"; "type.amenity.hospital" = "醫院"; -"type.amenity.hunting_stand" = "狩獵場"; -"type.amenity.ice_cream" = "冰淇淋攤"; -"type.amenity.internet_cafe" = "網路咖啡店"; +"type.amenity.hunting_stand" = "狩獵小屋"; +"type.amenity.ice_cream" = "冰淇淋"; +"type.amenity.internet_cafe" = "網咖"; "type.amenity.kindergarten" = "幼兒園"; "type.amenity.library" = "圖書館"; -"type.amenity.loading_dock" = "裝卸碼頭"; +"type.amenity.loading_dock" = "卸貨碼頭"; "type.amenity.marketplace" = "市場"; -"type.amenity.motorcycle_parking" = "機車停車格"; -"type.amenity.nightclub" = "夜店"; -"type.amenity.nursing_home" = "養老院"; +"type.amenity.motorcycle_parking" = "機車停車場"; +"type.amenity.nightclub" = "俱樂部"; +"type.amenity.nursing_home" = "療養院"; "type.amenity.parking" = "停車場"; -"type.amenity.parking.fee" = "停車場"; -"type.amenity.parking.multi.storey" = "多層停車場"; -"type.amenity.parking.multi.storey.fee" = "多層停車場"; +"type.amenity.parking.fee" = "停車費用"; +"type.amenity.parking.multi.storey" = "立體停車場"; +"type.amenity.parking.multi.storey.fee" = "立體停車場費用"; "type.amenity.parking.no.access" = "私人停車場"; "type.amenity.parking.permissive" = "私人停車場"; "type.amenity.parking.private" = "私人停車場"; -"type.amenity.parking.park_and_ride" = "停車場"; +"type.amenity.parking.park_and_ride" = "停車轉乘"; "type.amenity.parking.underground" = "地下停車場"; "type.amenity.parking.underground.fee" = "地下停車場"; "type.amenity.parking.underground.private" = "私人地下停車場"; -"type.amenity.parking.street_side" = "街邊停車"; -"type.amenity.parking.street_side.fee" = "街邊停車"; -"type.amenity.parking.street_side.private" = "私人街邊停車場"; +"type.amenity.parking.street_side" = "路邊停車格"; +"type.amenity.parking.street_side.fee" = "路邊停車格"; +"type.amenity.parking.street_side.private" = "私人路邊停車格"; "type.amenity.parking.lane" = "車道停車"; "type.amenity.parking.lane.fee" = "車道停車"; "type.amenity.parking.lane.private" = "私人車道停車場"; -"type.amenity.parking_entrance" = "停車場入口"; -"type.amenity.parking_entrance.private" = "私人停車場入口"; -"type.amenity.parking_entrance.permissive" = "停車場入口"; -"type.amenity.parking_space" = "停車地點"; -"type.amenity.parking_space.permissive" = "停車地點"; -"type.amenity.parking_space.private" = "停車地點"; -"type.amenity.parking_space.underground" = "停車地點"; -"type.amenity.parking_space.disabled" = "殘疾人停車位"; -"type.amenity.payment_terminal" = "付款終端"; +"type.amenity.parking_entrance" = "停車場出入口"; +"type.amenity.parking_entrance.private" = "私停車場出入口"; +"type.amenity.parking_entrance.permissive" = "停車場出入口"; +"type.amenity.parking_space" = "停車格"; +"type.amenity.parking_space.permissive" = "停車格"; +"type.amenity.parking_space.private" = "停車格"; +"type.amenity.parking_space.underground" = "停車格"; +"type.amenity.parking_space.disabled" = "無障礙停車格"; +"type.amenity.payment_terminal" = "繳費機"; "type.amenity.pharmacy" = "藥局"; -"type.amenity.place_of_worship" = "寺廟"; -"type.amenity.place_of_worship.buddhist" = "佛教寺廟"; -"type.amenity.place_of_worship.christian" = "基督教堂"; +"type.amenity.place_of_worship" = "宗教崇拜場所"; +"type.amenity.place_of_worship.buddhist" = "佛寺"; +"type.amenity.place_of_worship.christian" = "教堂"; "type.amenity.place_of_worship.christian.mormon" = "耶穌基督後期聖徒教會"; -"type.amenity.place_of_worship.christian.jehovahs_witness" = "耶和華見證人王國大廳"; +"type.amenity.place_of_worship.christian.jehovahs_witness" = "耶和華見證人"; "type.amenity.place_of_worship.hindu" = "印度教寺廟"; -"type.amenity.place_of_worship.jewish" = "猶太教堂"; +"type.amenity.place_of_worship.jewish" = "猶太會堂"; "type.amenity.place_of_worship.muslim" = "清真寺"; -"type.amenity.place_of_worship.shinto" = "聖殿"; -"type.amenity.place_of_worship.taoist" = "道教宮觀"; +"type.amenity.place_of_worship.shinto" = "神道教"; +"type.amenity.place_of_worship.taoist" = "道觀"; "type.amenity.police" = "警察局"; "type.amenity.post_box" = "郵筒"; "type.amenity.post_office" = "郵局"; "type.amenity.prison" = "監獄"; -"type.amenity.pub" = "酒館"; -"type.amenity.public_bookcase" = "書架"; +"type.amenity.pub" = "酒吧"; +"type.amenity.public_bookcase" = "漂書站"; "type.amenity.recycling.centre" = "回收中心"; "type.amenity.recycling" = "回收箱"; "type.amenity.recycling.container" = "回收箱"; "type.recycling.batteries" = "電池"; -"type.recycling.clothes" = "舊衣物"; +"type.recycling.clothes" = "衣服"; "type.recycling.glass_bottles" = "玻璃瓶"; -"type.recycling.paper" = "廢紙"; -"type.recycling.plastic" = "廢塑料"; -"type.recycling.plastic_bottles" = "塑料瓶"; +"type.recycling.paper" = "紙張"; +"type.recycling.plastic" = "塑膠"; +"type.recycling.plastic_bottles" = "塑膠瓶"; "type.recycling.scrap_metal" = "廢金屬"; -"type.recycling.small_appliances" = "電子垃圾"; +"type.recycling.small_appliances" = "電子廢棄物"; "type.recycling.cardboard" = "硬紙板"; "type.recycling.cans" = "金屬罐"; "type.recycling.shoes" = "鞋子"; "type.recycling.green_waste" = "綠色垃圾/有機廢棄物"; "type.recycling.cartons" = "紙盒"; "type.amenity.restaurant" = "餐廳"; -"type.amenity.sanitary_dump_station" = "儲液池排泄站"; +"type.amenity.sanitary_dump_station" = "儲槽傾倒站"; "type.amenity.school" = "學校"; /* Weather shelter (including sun shelters and natural rock shelters). */ -"type.amenity.shelter" = "隱藏處"; +"type.amenity.shelter" = "涼亭"; /* A weather shelter by the public transport stop. */ -"type.amenity.shelter.public_transport" = "隱藏處"; +"type.amenity.shelter.public_transport" = "渟亭"; /* Compared to wilderness_hut its smaller and simpler, without a fireplace. */ "type.amenity.shelter.basic_hut" = "露營小屋"; @@ -160,35 +160,35 @@ /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */ "type.amenity.shelter.lean_to" = "三面避難所"; "type.amenity.public_bath" = "公共浴場"; -"type.amenity.shower" = "淋浴間"; +"type.amenity.shower" = "淋浴設施"; "type.amenity.stripclub" = "脫衣舞俱樂部"; -"type.amenity.taxi" = "計程車"; -"type.amenity.telephone" = "電話"; -"type.amenity.theatre" = "劇場"; +"type.amenity.taxi" = "計程車招呼站"; +"type.amenity.telephone" = "公共電話"; +"type.amenity.theatre" = "戲院"; "type.amenity.toilets" = "廁所"; "type.toilets.yes" = "廁所"; "type.amenity.townhall" = "市政廳"; "type.amenity.university" = "大學"; -"type.amenity.vending_machine" = "自動售貨機"; -"type.amenity.vending_machine.cigarettes" = "香菸自動販賣機"; -"type.amenity.vending_machine.coffee" = "咖啡售賣機"; -"type.amenity.vending_machine.condoms" = "避孕套售賣機"; -"type.amenity.vending_machine.drinks" = "飲料自動販賣機"; -"type.amenity.vending_machine.food" = "食品售賣機"; -"type.amenity.vending_machine.newspapers" = "報紙售賣機"; -"type.amenity.vending_machine.parking_tickets" = "違規停車罰單繳費機"; -"type.amenity.vending_machine.public_transport_tickets" = "公共交通售票機"; -"type.amenity.vending_machine.sweets" = "糖果售賣機"; +"type.amenity.vending_machine" = "自動販賣機"; +"type.amenity.vending_machine.cigarettes" = "香菸販賣機"; +"type.amenity.vending_machine.coffee" = "咖啡販賣機"; +"type.amenity.vending_machine.condoms" = "保險套販賣機"; +"type.amenity.vending_machine.drinks" = "飲料販賣機"; +"type.amenity.vending_machine.food" = "食品販賣機"; +"type.amenity.vending_machine.newspapers" = "報紙販賣機"; +"type.amenity.vending_machine.parking_tickets" = "停車錶"; +"type.amenity.vending_machine.public_transport_tickets" = "票券販賣機"; +"type.amenity.vending_machine.sweets" = "甜點販賣機"; "type.amenity.vending_machine.excrement_bags" = "撿便袋販賣機"; "type.amenity.parcel_locker" = "智取櫃"; -"type.amenity.vehicle_inspection" = "車輛檢驗"; -"type.amenity.vending_machine.fuel" = "燃油泵"; +"type.amenity.vehicle_inspection" = "監理站"; +"type.amenity.vending_machine.fuel" = "燃油幫浦"; "type.amenity.veterinary" = "獸醫"; -"type.amenity.waste_basket" = "垃圾箱"; -"type.amenity.waste_disposal" = "垃圾"; +"type.amenity.waste_basket" = "垃圾筒"; +"type.amenity.waste_disposal" = "大垃圾桶"; "type.amenity.waste_transfer_station" = "垃圾轉運站"; -"type.amenity.water_point" = "飲水站"; -"type.amenity.water_point.drinking_water_no" = "飲水站"; +"type.amenity.water_point" = "水箱加水點"; +"type.amenity.water_point.drinking_water_no" = "水箱加水點"; "type.barrier" = "障礙物"; "type.barrier.block" = "街區"; "type.barrier.bollard" = "柱"; @@ -212,16 +212,16 @@ "type.barrier.toll_booth" = "收費站"; "type.barrier.wall" = "墻"; "type.boundary" = "邊界"; -"type.boundary.administrative" = "行政區域界線"; +"type.boundary.administrative" = "行政邊界"; /* Borders between countries. */ -"type.boundary.administrative.2" = "國家行政區域界線"; +"type.boundary.administrative.2" = "國家邊界"; /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */ -"type.boundary.administrative.3" = "行政區域邊界"; +"type.boundary.administrative.3" = "地區邊界"; /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */ -"type.boundary.administrative.4" = "行政區域邊界"; +"type.boundary.administrative.4" = "地區邊界"; "type.boundary.national_park" = "國家公園"; "type.boundary.aboriginal_lands" = "原住民土地"; "type.boundary.protected_area" = "保護區"; @@ -231,80 +231,80 @@ "type.boundary.protected_area.4" = "保護區"; "type.boundary.protected_area.5" = "保護區"; "type.boundary.protected_area.6" = "保護區"; -"type.building" = "建築物"; +"type.building" = "建築"; /* Duplicates [address] in strings.txt */ "type.building.address" = "地址"; -"type.building.has_parts" = "建築物"; -"type.building_part" = "建築物"; +"type.building.has_parts" = "建築"; +"type.building_part" = "建築"; "type.building.garage" = "私人車庫"; -"type.building.train_station" = "車站大樓"; +"type.building.train_station" = "車站建築"; "type.building.warehouse" = "倉庫"; "type.cemetery.grave" = "墓穴"; -"type.craft" = "工藝作坊"; -"type.craft.beekeeper" = "蜂農"; +"type.craft" = "工藝"; +"type.craft.beekeeper" = "養蜂"; "type.craft.blacksmith" = "鐵匠"; -"type.craft.brewery" = "釀酒廠"; +"type.craft.brewery" = "釀酒師"; "type.craft.caterer" = "餐飲服務商"; -"type.craft.carpenter" = "木工"; -"type.craft.confectionery" = "糖果商"; +"type.craft.carpenter" = "木匠"; +"type.craft.confectionery" = "糖果師"; "type.craft.electrician" = "電工"; "type.craft.electronics_repair" = "電子產品維修"; -"type.craft.gardener" = "園藝師"; -"type.craft.grinding_mill" = "磨粉機"; -"type.craft.handicraft" = "手工藝"; +"type.craft.gardener" = "園丁"; +"type.craft.grinding_mill" = "磨粉"; +"type.craft.handicraft" = "手工匠"; /* Heating, Ventilation, and Air Conditioning */ -"type.craft.hvac" = "空調設備"; -"type.craft.key_cutter" = "鍵切割"; +"type.craft.hvac" = "暖氣空調"; +"type.craft.key_cutter" = "鑰匙切割"; "type.craft.locksmith" = "鎖匠"; "type.craft.metal_construction" = "鐵工"; -"type.craft.painter" = "油漆工"; +"type.craft.painter" = "房屋油漆工"; "type.craft.photographer" = "攝影棚"; "type.shop.camera" = "相機店"; -"type.craft.plumber" = "水管工人"; -"type.craft.sawmill" = "鋸木廠"; -"type.craft.shoemaker" = "修鞋工"; -"type.craft.winery" = "酒莊"; -"type.craft.tailor" = "裁縫師"; -"type.cuisine.african" = "非洲料理"; -"type.cuisine.american" = "美國料理"; -"type.cuisine.arab" = "阿拉伯料理"; -"type.cuisine.argentinian" = "阿根廷料理"; -"type.cuisine.asian" = "亞洲料理"; -"type.cuisine.austrian" = "奧地利料理"; +"type.craft.plumber" = "水管工"; +"type.craft.sawmill" = "鋸木"; +"type.craft.shoemaker" = "修鞋匠"; +"type.craft.winery" = "酒廠"; +"type.craft.tailor" = "裁縫"; +"type.cuisine.african" = "非洲菜"; +"type.cuisine.american" = "美洲菜"; +"type.cuisine.arab" = "阿拉伯菜"; +"type.cuisine.argentinian" = "阿根庭菜"; +"type.cuisine.asian" = "亞洲菜"; +"type.cuisine.austrian" = "澳洲菜"; "type.cuisine.bagel" = "貝果"; "type.cuisine.balkan" = "巴爾幹料理"; "type.cuisine.barbecue" = "燒烤"; "type.cuisine.bavarian" = "巴伐利亞料理"; "type.cuisine.beef_bowl" = "牛丼"; -"type.cuisine.brazilian" = "巴西料理"; +"type.cuisine.brazilian" = "巴西菜"; "type.cuisine.breakfast" = "早餐"; "type.cuisine.bubble_tea" = "珍珠奶茶"; "type.cuisine.burger" = "漢堡"; -"type.cuisine.buschenschank" = "酒莊"; +"type.cuisine.buschenschank" = "小酒館"; "type.cuisine.cake" = "蛋糕"; -"type.cuisine.caribbean" = "加勒比料理"; +"type.cuisine.caribbean" = "加勒比菜"; "type.cuisine.chicken" = "雞肉"; -"type.cuisine.chinese" = "中華料理"; +"type.cuisine.chinese" = "中式"; "type.cuisine.coffee_shop" = "咖啡"; "type.cuisine.crepe" = "可麗餅"; -"type.cuisine.croatian" = "克羅埃西亞料理"; +"type.cuisine.croatian" = "克羅埃西亞菜"; "type.cuisine.curry" = "咖哩"; "type.cuisine.deli" = "熟食店"; -"type.cuisine.diner" = "美式餐廳"; +"type.cuisine.diner" = "晚餐"; "type.cuisine.donut" = "甜甜圈"; -"type.cuisine.ethiopian" = "衣索比亞料理"; -"type.cuisine.filipino" = "菲律賓料理"; -"type.cuisine.fine_dining" = "高級餐飲"; -"type.cuisine.fish" = "魚"; +"type.cuisine.ethiopian" = "伊索匹亞菜"; +"type.cuisine.filipino" = "菲律賓菜"; +"type.cuisine.fine_dining" = "精緻餐飲"; +"type.cuisine.fish" = "魚類"; "type.cuisine.fish_and_chips" = "炸魚薯條"; -"type.cuisine.french" = "法國料理"; -"type.cuisine.friture" = "油炸"; -"type.cuisine.georgian" = "喬治亞料理"; -"type.cuisine.german" = "德國料理"; -"type.cuisine.greek" = "希臘料理"; -"type.cuisine.grill" = "烤"; +"type.cuisine.french" = "法式"; +"type.cuisine.friture" = "煎炸"; +"type.cuisine.georgian" = "喬治亞菜"; +"type.cuisine.german" = "德國菜"; +"type.cuisine.greek" = "希臘菜"; +"type.cuisine.grill" = "燒烤"; "type.cuisine.heuriger" = "霍里格"; "type.cuisine.hotdog" = "熱狗"; "type.cuisine.hungarian" = "匈牙利料理"; @@ -317,45 +317,45 @@ "type.cuisine.italian_pizza" = "義大利料理,披薩"; "type.cuisine.japanese" = "日本料理"; "type.cuisine.kebab" = "烤肉"; -"type.cuisine.korean" = "韓國料理"; -"type.cuisine.lao" = "寮國料理"; -"type.cuisine.lebanese" = "黎巴嫩料理"; -"type.cuisine.local" = "本地料理"; -"type.cuisine.malagasy" = "馬達加斯加料理"; -"type.cuisine.malaysian" = "馬來西亞料理"; -"type.cuisine.mediterranean" = "地中海料理"; -"type.cuisine.mexican" = "墨西哥料理"; -"type.cuisine.moroccan" = "摩洛哥料理"; +"type.cuisine.korean" = "韓式"; +"type.cuisine.lao" = "寮國菜"; +"type.cuisine.lebanese" = "黎巴嫰菜"; +"type.cuisine.local" = "地方菜"; +"type.cuisine.malagasy" = "馬達加斯加菜"; +"type.cuisine.malaysian" = "馬來西亞菜"; +"type.cuisine.mediterranean" = "地中海菜"; +"type.cuisine.mexican" = "墨西哥菜"; +"type.cuisine.moroccan" = "摩洛哥菜"; "type.cuisine.noodles" = "麵食"; -"type.cuisine.oriental" = "東方料理"; -"type.cuisine.pancake" = "煎餅"; +"type.cuisine.oriental" = "東亞菜"; +"type.cuisine.pancake" = "鬆餅"; "type.cuisine.pasta" = "義大利麵"; -"type.cuisine.persian" = "波斯料理"; -"type.cuisine.peruvian" = "秘魯料理"; -"type.cuisine.pizza" = "披薩"; -"type.cuisine.polish" = "波蘭料理"; -"type.cuisine.portuguese" = "葡萄牙料理"; +"type.cuisine.persian" = "波斯菜"; +"type.cuisine.peruvian" = "秘魯菜"; +"type.cuisine.pizza" = "批薩"; +"type.cuisine.polish" = "波蘭菜"; +"type.cuisine.portuguese" = "葡萄牙語"; "type.cuisine.ramen" = "拉麵"; -"type.cuisine.regional" = "地方料理"; -"type.cuisine.russian" = "俄羅斯料理"; +"type.cuisine.regional" = "地區菜"; +"type.cuisine.russian" = "俄羅斯菜"; "type.cuisine.sandwich" = "三明治"; -"type.cuisine.sausage" = "火腿"; -"type.cuisine.savory_pancakes" = "鹹味煎餅"; +"type.cuisine.sausage" = "香腸"; +"type.cuisine.savory_pancakes" = "美味煎餅"; "type.cuisine.seafood" = "海鮮"; -"type.cuisine.soba" = "蕎麥面"; -"type.cuisine.spanish" = "西班牙料理"; +"type.cuisine.soba" = "蕎麥麵"; +"type.cuisine.spanish" = "西班牙菜"; "type.cuisine.steak_house" = "牛排館"; -"type.cuisine.sushi" = "壽司"; -"type.cuisine.tapas" = "塔帕斯"; +"type.cuisine.sushi" = "生魚片"; +"type.cuisine.tapas" = "西班牙小吃"; "type.cuisine.tea" = "茶"; -"type.cuisine.thai" = "泰國料理"; -"type.cuisine.turkish" = "土耳其料理"; -"type.cuisine.vegan" = "全素料理"; +"type.cuisine.thai" = "泰式"; +"type.cuisine.turkish" = "土耳其菜"; +"type.cuisine.vegan" = "維根"; "type.cuisine.vegetarian" = "素食"; -"type.cuisine.vietnamese" = "越南料理"; -"type.emergency" = "緊急服務"; +"type.cuisine.vietnamese" = "越南菜"; +"type.emergency" = "緊急"; "type.emergency.assembly_point" = "緊急集合點"; -"type.emergency.defibrillator" = "心臟電擊器"; +"type.emergency.defibrillator" = "除顫器"; "type.emergency.fire_hydrant" = "消防栓"; "type.emergency.phone" = "緊急電話"; @@ -363,7 +363,7 @@ "type.emergency.lifeguard" = "救生員"; /* A mountain rescue base for search and rescue activities. */ -"type.emergency.mountain_rescue" = "山地救援站"; +"type.emergency.mountain_rescue" = "山區救難站"; /* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "入口"; @@ -375,12 +375,12 @@ "type.fee.no" = "免費"; "type.healthcare.laboratory" = "醫學實驗室"; "type.healthcare.physiotherapist" = "物理治療師"; -"type.healthcare.alternative" = "替代藥物"; -"type.healthcare.audiologist" = "聽力學"; +"type.healthcare.alternative" = "另類醫療"; +"type.healthcare.audiologist" = "聽力師"; "type.healthcare.blood_donation" = "捐血中心"; -"type.healthcare.optometrist" = "驗光"; -"type.healthcare.podiatrist" = "足病學"; -"type.healthcare.psychotherapist" = "心理治療"; +"type.healthcare.optometrist" = "驗光師"; +"type.healthcare.podiatrist" = "足病醫生"; +"type.healthcare.psychotherapist" = "心理治療師"; "type.healthcare.sample_collection" = "採樣"; "type.healthcare.speech_therapist" = "言語治療"; "type.highway" = "道路"; @@ -1494,9 +1494,9 @@ "type.railway.station.subway.qingdao" = "青島地鐵站"; "type.natural.wetland.tidalflat" = "Tidal Flat"; "type.natural.wetland.swamp" = "Swamp"; -"type.natural.wetland.saltmarsh" = "Salt Marsh"; +"type.natural.wetland.saltmarsh" = "鹽沼"; "type.natural.wetland.mangrove" = "Mangrove"; -"type.natural.wetland.fen" = "Fen"; -"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; +"type.natural.wetland.fen" = "鹼沼"; +"type.natural.wetland.saltmarsh.tidal" = "潮間鹽沼"; "type.natural.wetland.reedbed" = "Reed Bed"; -"type.leisure.escape_game" = "Escape Room"; +"type.leisure.escape_game" = "密室脫逃"; From cee3f24cd94d2d419bf1086747a257b5ac225572 Mon Sep 17 00:00:00 2001 From: Filip Czaplicki Date: Tue, 22 Jul 2025 10:01:56 +0200 Subject: [PATCH 052/222] [styles] Deduplicate rules in Icons.mapcss node and area rules with the same selector are redundant. Only one of them is needed. Discussed at https://codeberg.org/comaps/comaps/pulls/969#issuecomment-5922451 Change done automatically using rg --passthru -UN --pcre2 '^node\|([^,]+),?\narea\|\1,?' --replace 'node|$1,' data/styles/default/include/Icons.mapcss | sponge data/styles/default/include/Icons.mapcss rg --passthru -UN --pcre2 '^area\|([^,]+),?\nnode\|\1,?' --replace 'node|$1,' data/styles/default/include/Icons.mapcss | sponge data/styles/default/include/Icons.mapcss Signed-off-by: Filip Czaplicki --- data/styles/default/include/Icons.mapcss | 764 +---------------------- 1 file changed, 3 insertions(+), 761 deletions(-) diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index af7842aec..51ac3d969 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -31,32 +31,23 @@ Declare _before_ all concrete POIs to avoid styles overrides. */ node|z18-[tourism], -area|z18-[tourism], node|z18-[office], -area|z18-[office], node|z18-[craft], -area|z18-[craft], node|z19-[amenity], -area|z19-[amenity], {text: name; text-color: @poi_label; text-offset: 1;} node|z19-[amenity], -area|z19-[amenity], {font-size: 10;} node|z18-[office], -area|z18-[office], {icon-image: office-m.svg;} node|z18-[craft], -area|z18-[craft], {icon-image: craft-m.svg;} node|z16-[shop], -area|z16-[shop], {icon-min-distance: 10;} node|z18-[shop], -area|z18-[shop], {icon-image: shop-m.svg;} /* 2. NATURAL */ @@ -71,7 +62,6 @@ node|z15-[natural=spring], node|z15-[natural=hot_spring], node|z14-[natural=geyser], node|z16-[natural=beach], -area|z16-[natural=beach], area|z14-[natural=bare_rock], node|z17-[natural=rock], {text: name;text-color: @poi_label;text-position: center;text-offset: 1;} @@ -81,11 +71,8 @@ node|z13-[natural=peak][!name], node|z12-17[boundary=national_park], -area|z12-17[boundary=national_park], node|z12-17[boundary=protected_area], -area|z12-17[boundary=protected_area], node|z12-17[leisure=nature_reserve], -area|z12-17[leisure=nature_reserve], {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;} area|z10-16[boundary=aboriginal_lands], @@ -140,25 +127,16 @@ node|z17-[leisure=beach_resort], {icon-image: beach-m.svg;font-size: 11;} node|z11[boundary=national_park], -area|z11[boundary=national_park], node|z11[boundary=protected_area], -area|z11[boundary=protected_area], node|z11[leisure=nature_reserve], -area|z11[leisure=nature_reserve] {icon-image: nparkf-outline-s.svg; icon-min-distance: 20;} node|z12-14[boundary=national_park], -area|z12-14[boundary=national_park], node|z12-14[boundary=protected_area], -area|z12-14[boundary=protected_area], node|z12-14[leisure=nature_reserve], -area|z12-14[leisure=nature_reserve], {icon-image: nparkf-outline-s.svg; font-size: 10; icon-min-distance: 12;} node|z15-17[boundary=national_park], -area|z15-17[boundary=national_park], node|z15-17[boundary=protected_area], -area|z15-17[boundary=protected_area], node|z15-17[leisure=nature_reserve], -area|z15-17[leisure=nature_reserve], {icon-image: nparkf-outline-m.svg; font-size: 11; text-halo-opacity: 0.9;} area|z13[landuse=forest][name], @@ -232,32 +210,22 @@ node|z13-[railway=halt]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} node|z17-[railway=tram_stop], -area|z17-[railway=tram_stop] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} node|z17-[railway=tram_stop]::int_name, -area|z17-[railway=tram_stop]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} node|z17-[highway=bus_stop], -area|z17-[highway=bus_stop], node|z14-[amenity=bus_station], -area|z14-[amenity=bus_station] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;} node|z17-[highway=bus_stop]::int_name, -area|z17-[highway=bus_stop]::int_name, node|z14-[amenity=bus_station]::int_name, -area|z14-[amenity=bus_station]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;} -area|z10-[aeroway=aerodrome][aerodrome=international], node|z10-[aeroway=aerodrome][aerodrome=international], -area|z14-[aeroway=aerodrome], node|z14-[aeroway=aerodrome], node|z15-[aerialway=station], node|z16-[amenity=ferry_terminal] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} -area|z12-[aeroway=aerodrome][aerodrome=international]::int_name, node|z12-[aeroway=aerodrome][aerodrome=international]::int_name, -area|z14-[aeroway=aerodrome]::int_name, node|z14-[aeroway=aerodrome]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} @@ -306,7 +274,6 @@ node|z19-[highway=traffic_signals], {icon-image: traffic_signals.svg} node|z17-[highway=elevator], -area|z17-[highway=elevator], {icon-image: elevator-s.svg;} /* 3.3 Tram Station */ @@ -314,59 +281,42 @@ area|z17-[highway=elevator], node|z14[railway=tram_stop] {icon-image: tram-s.svg;} node|z15-16[railway=tram_stop], -area|z15-16[railway=tram_stop] {icon-image: tram-m.svg;} node|z17[railway=tram_stop], -area|z17[railway=tram_stop] {icon-image: tram-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.9;} node|z17-[railway=tram_stop]::int_name, -area|z17-[railway=tram_stop]::int_name {text-offset: 1;font-size: 10;text-halo-opacity: 0.9;} /*check*/ node|z18-[railway=tram_stop], -area|z18-[railway=tram_stop] {icon-image: tram-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;} /* 3.4 Bus Station */ node|z13[amenity=bus_station], -area|z13[amenity=bus_station] {icon-image: bus-s.svg;icon-min-distance: 1;} node|z14[amenity=bus_station], -area|z14[amenity=bus_station] {icon-image: bus-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.8;} node|z15-16[amenity=bus_station], -area|z15-16[amenity=bus_station] {icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;} node|z15-16[amenity=bus_station]::int_name, -area|z15-16[amenity=bus_station]::int_name {text-offset: 1;font-size: 9;text-halo-opacity: 0.8;} node|z17[amenity=bus_station], -area|z17[amenity=bus_station] {icon-image: bus-m.svg;text-offset: 1;font-size: 11;} node|z17[amenity=bus_station]::int_name, -area|z17[amenity=bus_station]::int_name {text-offset: 1;font-size: 9;} node|z18[amenity=bus_station], -area|z18[amenity=bus_station] {icon-image: bus-m.svg;text-offset: 1;font-size: 12;} node|z18[amenity=bus_station]::int_name, -area|z18[amenity=bus_station]::int_name {text-offset: 1;font-size: 10;} node|z19-[amenity=bus_station], -area|z19-[amenity=bus_station] {icon-image: bus-m.svg;text-offset: 1;font-size: 12;} node|z19-[amenity=bus_station]::int_name, -area|z19-[amenity=bus_station]::int_name {text-offset: 1;font-size: 10;} node|z16[highway=bus_stop], -area|z16[highway=bus_stop] {icon-image: bus-m.svg;} node|z17-[highway=bus_stop], -area|z17-[highway=bus_stop], {icon-image: bus-m.svg;text-offset: 1;font-size: 11;} node|z18-19[highway=bus_stop]::int_name, -area|z18-19[highway=bus_stop]::int_name, {icon-image: bus-m.svg;text-offset: 1;font-size: 9;} /* 3.5 Ferry terminal */ @@ -384,25 +334,19 @@ node|z17-[amenity=ferry_terminal] /* 3.6 Airport */ -area|z7-9[aeroway=aerodrome][aerodrome=international], node|z7-9[aeroway=aerodrome][aerodrome=international], {icon-image: airport-s.svg;} -area|z10[aeroway=aerodrome][aerodrome=international], node|z10[aeroway=aerodrome][aerodrome=international], {icon-image: airport-s.svg;text-offset: 1;font-size: 10;} -area|z11-13[aeroway=aerodrome][aerodrome=international], node|z11-13[aeroway=aerodrome][aerodrome=international], {icon-image: airport-m.svg; text-offset: 1; font-size: 11;} -area|z14-[aeroway=aerodrome], -node|z14-[aeroway=aerodrome] +node|z14-[aeroway=aerodrome], {icon-image: airport-m.svg;text-offset: 1;font-size: 12;} -area|z14-[aeroway=aerodrome]::int_name, node|z14-[aeroway=aerodrome]::int_name, {font-size: 11;} -area|z16-[aeroway=helipad], -node|z16-[aeroway=helipad] +node|z16-[aeroway=helipad], {icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;} /* 3.7 Aerialway */ @@ -431,35 +375,21 @@ node|z17-[aerialway=station], /* 4.1 Main POI */ node|z12-[historic=fort], -area|z12-[historic=fort], node|z12-[historic=castle], -area|z12-[historic=castle], node|z13-[historic=city_gate], -area|z13-[historic=city_gate], node|z13-[historic=monument], -area|z13-[historic=monument], node|z13-[tourism=museum], -area|z13-[tourism=museum], node|z13-[tourism=zoo], -area|z13-[tourism=zoo], node|z14-[amenity=theatre], -area|z14-[amenity=theatre], node|z14-[tourism=attraction], -area|z14-[tourism=attraction], node|z14-[tourism=theme_park], -area|z14-[tourism=theme_park], node|z14-[tourism=viewpoint], node|z15-[tourism=zoo][zoo=petting_zoo], -area|z15-[tourism=zoo][zoo=petting_zoo], node|z15-[amenity=community_centre], -area|z15-[amenity=community_centre], node|z15-[historic=memorial], -area|z15-[historic=memorial], node|z15-[historic=mine], node|z15-[historic=battlefield], -area|z15-[historic=battlefield], node|z15-[tourism=gallery], -area|z15-[tourism=gallery], node|z15-[tourism=artwork], node|z15-[historic=ship], node|z16-[tourism=information], @@ -470,14 +400,11 @@ node|z16-[historic=tank], node|z16-[historic=wreck], node|z16-[historic=locomotive], node|z16-[historic=boundary_stone], -area|z16-[historic=boundary_stone], node|z16-[historic=wayside_cross], node|z16-[historic=cross], node|z16-[man_made=cross], node|z16-[historic=tomb], -area|z16-[historic=tomb], node|z16-[tourism=aquarium], -area|z16-[tourism=aquarium], node|z17-[attraction=animal], node|z17-[attraction=amusement_ride], node|z17-[attraction=carousel], @@ -487,51 +414,34 @@ node|z17-[attraction=historic], node|z17-[attraction=big_wheel], node|z17-[attraction=bumper_car], node|z17-[historic=ruins], -area|z17-[historic=ruins], node|z17-[historic=wayside_shrine], -area|z17-[historic=wayside_shrine], node|z17-[historic=archaeological_site], -area|z17-[historic=archaeological_site], node|z17-[historic=gallows], -area|z17-[historic=gallows], node|z17-[historic=pillory], -area|z17-[historic=pillory], node|z17-[amenity=arts_centre], -area|z17-[amenity=arts_centre], node|z18-[historic=anchor], node|z18-[historic=cannon], node|z18-[historic=stone], {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} node|z12-14[historic=fort], -area|z12-14[historic=fort], node|z12-14[historic=castle], -area|z12-14[historic=castle] {icon-image: remains-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15[historic=fort], -area|z15[historic=fort], node|z15[historic=castle], -area|z15[historic=castle] {icon-image: remains-m.svg;icon-min-distance: 5;} node|z16[historic=fort], -area|z16[historic=fort], node|z16[historic=castle], -area|z16[historic=castle] {icon-image: remains-m.svg;text-offset: 1;} node|z17-[historic=ruins][name], -area|z17-[historic=ruins][name], node|z17-[historic=fort], -area|z17-[historic=fort], node|z17-[historic=castle], -area|z17-[historic=castle] {icon-image: remains-m.svg;} node|z17-[historic=archaeological_site], -area|z17-[historic=archaeological_site] {icon-image: archaeological-site-m.svg;} node|z19-[historic=ruins][!name], -area|z19-[historic=ruins][!name], {icon-image: remains-m.svg;} node|z15-[historic=mine], @@ -559,96 +469,67 @@ node|z18-[historic=stone], {icon-image: stone-m.svg;} node|z13-14[historic=monument], -area|z13-14[historic=monument] {icon-image: monument-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15[historic=monument], -area|z15[historic=monument], node|z15[historic=memorial], -area|z15[historic=memorial], node|z15[historic=battlefield], -area|z15[historic=battlefield], {icon-image: monument-m.svg;icon-min-distance: 24;} node|z16-[historic=monument], -area|z16-[historic=monument], node|z16-[historic=memorial], -area|z16-[historic=memorial], node|z16-[historic=battlefield], -area|z16-[historic=battlefield], {icon-image: monument-m.svg;icon-min-distance: 12;} /* Do not display following features on lower zoom levels */ node|z15-17[historic=memorial][memorial=plaque], -area|z15-17[historic=memorial][memorial=plaque], node|z15-18[historic=memorial][memorial=stolperstein], -area|z15-18[historic=memorial][memorial=stolperstein], node|z15-16[historic=memorial][memorial=cross], -area|z15-16[historic=memorial][memorial=cross], {icon-image: none; text: none;} node|z18-[historic=memorial][memorial=plaque], -area|z18-[historic=memorial][memorial=plaque], node|z19-[historic=memorial][memorial=stolperstein], -area|z19-[historic=memorial][memorial=stolperstein], {icon-image: plaque.svg;} node|z17-[historic=memorial][memorial=cross], -area|z17-[historic=memorial][memorial=cross], {icon-image: cross-m.svg;icon-min-distance: 12;} node|z13-14[historic=city_gate], -area|z13-14[historic=city_gate] {icon-image: remains-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15[historic=city_gate], -area|z15[historic=city_gate], {icon-image: remains-m.svg;icon-min-distance: 24;} node|z16-[historic=city_gate], -area|z16-[historic=city_gate], {icon-image: remains-m.svg;icon-min-distance: 12;} node|z13-14[tourism=museum], -area|z13-14[tourism=museum] {icon-image: museum-s.svg;icon-min-distance: 16;} node|z15[tourism=museum], -area|z15[tourism=museum] {icon-image: museum-m.svg;icon-min-distance: 24;} node|z16-[tourism=museum], -area|z16-[tourism=museum], {icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;} node|z15[tourism=gallery] {icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */ node|z16-[tourism=gallery], -area|z16-[tourism=gallery], node|z17-[amenity=arts_centre], -area|z17-[amenity=arts_centre] {icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=theatre], -area|z14[amenity=theatre] {icon-image: theatre-s.svg;text-offset: 1;icon-min-distance: 8;} node|z15-[amenity=theatre], -area|z15-[amenity=theatre] {icon-image: theatre-m.svg;icon-min-distance: 10;} node|z13-14[tourism=zoo], -area|z13-14[tourism=zoo] {icon-image: zoo-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15[tourism=zoo], -area|z15[tourism=zoo] {icon-image: zoo-m.svg;icon-min-distance: 8;} node|z16-[tourism=zoo], -area|z16-[tourism=zoo] {icon-image: zoo-m.svg;text-offset: 1;icon-min-distance: 8;} node|z16-[tourism=aquarium], -area|z16-[tourism=aquarium] {icon-image: aquarium-m.svg;text-offset: 1;icon-min-distance: 8;} node|z13-[tourism=zoo][zoo=petting_zoo], -area|z13-[tourism=zoo][zoo=petting_zoo], {icon-image: none;text: none;} /*needed to override base type styles*/ node|z15-[tourism=zoo][zoo=petting_zoo], -area|z15-[tourism=zoo][zoo=petting_zoo], {icon-image: petting_zoo-m.svg;text: name;text-offset: 1;icon-min-distance: 8;} node|z14[tourism=viewpoint] @@ -669,11 +550,8 @@ node|z16-[tourism=information][information=map] {icon-image: map.svg;text-offset: 1;icon-min-distance: 10;} node|z16-[historic=boundary_stone], -area|z16-[historic=boundary_stone], node|z16-[historic=gallows], -area|z16-[historic=gallows], node|z16-[historic=pillory], -area|z16-[historic=pillory], {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} node|z16-[historic=wayside_cross], {icon-image: wayside_cross-m.svg; font-size: 11;} @@ -682,44 +560,32 @@ node|z16-[man_made=cross], node|z15-[historic=ship], {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} node|z16-[historic=tomb], -area|z16-[historic=tomb], {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} node|z16-[historic=wayside_shrine], -area|z16-[historic=wayside_shrine], {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} node|z15[tourism=artwork], -area|z15[tourism=artwork], {icon-image: artwork-m.svg;icon-min-distance: 8;} node|z16-[tourism=artwork], -area|z16-[tourism=artwork], {icon-image: artwork-m.svg;icon-min-distance: 24;} node|z15[tourism=artwork][artwork_type=statue], -area|z15[tourism=artwork][artwork_type=statue], {icon-image: statue-m.svg;icon-min-distance: 8;} node|z16-[tourism=artwork][artwork_type=statue], -area|z16-[tourism=artwork][artwork_type=statue], {icon-image: statue-m.svg;icon-min-distance: 24;} node|z14[tourism=attraction], -area|z14[tourism=attraction], {icon-image: tourism-s.svg;icon-min-distance: 12;} node|z15[tourism=attraction], -area|z15[tourism=attraction], {icon-image: tourism-m.svg;icon-min-distance: 36;} node|z16-[tourism=attraction], -area|z16-[tourism=attraction], {icon-image: tourism-m.svg;icon-min-distance: 24;} node|z14[tourism=theme_park], -area|z14[tourism=theme_park] {icon-image: theme_park-s.svg;icon-min-distance: 12;} node|z15[tourism=theme_park], -area|z15[tourism=theme_park] {icon-image: theme_park-m.svg;icon-min-distance: 36;} node|z16-[tourism=theme_park], -area|z16-[tourism=theme_park] {icon-image: theme_park-m.svg;icon-min-distance: 24;} node|z17-[attraction=animal], @@ -735,13 +601,9 @@ node|z17-[attraction=bumper_car], {icon-image: playground-m.svg;icon-min-distance: 24;} node|z15-[amenity=community_centre], -area|z15-[amenity=community_centre], node|z16-[amenity=conference_centre], -area|z16-[amenity=conference_centre], node|z16-[amenity=events_venue], -area|z16-[amenity=events_venue], node|z16-[amenity=exhibition_centre], -area|z16-[amenity=exhibition_centre], {icon-image: community-m.svg;icon-min-distance: 24;} /* 4.2 Apartment */ @@ -749,16 +611,12 @@ area|z16-[amenity=exhibition_centre], node|z16-[tourism=hotel], node|z16-[tourism=hostel], node|z16-[tourism=guest_house], -area|z16-[tourism=guest_house], node|z13-[tourism=alpine_hut], node|z16-[tourism=wilderness_hut], node|z16-[tourism=chalet], node|z16-[leisure=resort], -area|z16-[leisure=resort], node|z16-[tourism=motel], -area|z16-[tourism=motel], node|z16-[tourism=apartment], -area|z16-[tourism=apartment] {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} node|z16-[tourism=camp_site], node|z16-[tourism=picnic_site], @@ -772,16 +630,12 @@ node|z16-[tourism=caravan_site], node|z16[tourism=hotel], node|z16[leisure=resort], -area|z16[leisure=resort], node|z16[tourism=motel], -area|z16[tourism=motel] {icon-image: hotel-m.svg;icon-min-distance: 24;} node|z16[tourism=hostel] {icon-image: hostel-m.svg;icon-min-distance: 24;} node|z16[tourism=guest_house], -area|z16[tourism=guest_house], node|z16[tourism=apartment], -area|z16[tourism=apartment] {icon-image: apartment-m.svg;icon-min-distance: 24;text-halo-radius: 0;} node|z13-14[tourism=alpine_hut], {icon-image: alpine_hut-s.svg;} @@ -792,16 +646,12 @@ node|z16[tourism=chalet], node|z17-[tourism=hotel], node|z17-[tourism=motel], -area|z17-[tourism=motel], node|z17-[leisure=resort], -area|z17-[leisure=resort] {icon-image: hotel-m.svg;icon-min-distance: 16;} node|z17-[tourism=hostel] {icon-image: hostel-m.svg;icon-min-distance: 16;} node|z17[tourism=guest_house], -area|z17[tourism=guest_house], node|z17[tourism=apartment], -area|z17[tourism=apartment] {icon-image: apartment-m.svg;text-halo-radius: 0;} node|z17-[tourism=alpine_hut], node|z17-[tourism=wilderness_hut], @@ -809,9 +659,7 @@ node|z17-[tourism=chalet], {icon-image: alpine_hut-m.svg;} node|z18-[tourism=guest_house], -area|z18-[tourism=guest_house], node|z18-[tourism=apartment], -area|z18-[tourism=apartment] {icon-image: apartment-m.svg;icon-min-distance: 16;} node|z16-[tourism=camp_site], @@ -839,91 +687,58 @@ node|z16-[tourism=caravan_site], /* 4.3 Food */ node|z15-[amenity=cafe], -area|z15-[amenity=cafe], node|z15-[amenity=restaurant], -area|z15-[amenity=restaurant], node|z15-[amenity=fast_food], -area|z15-[amenity=fast_food], node|z15-[amenity=food_court], -area|z15-[amenity=food_court], node|z15-[amenity=bar], -area|z15-[amenity=bar], node|z15-[amenity=pub], -area|z15-[amenity=pub], node|z15-[amenity=biergarten], -area|z15-[amenity=biergarten] {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} node|z15[amenity=cafe], -area|z15[amenity=cafe] {icon-image: cafe-m.svg;icon-min-distance: 12;} node|z15[amenity=restaurant], -area|z15[amenity=restaurant] {icon-image: restaurant-m.svg;icon-min-distance: 28;} node|z15[amenity=fast_food], -area|z15[amenity=fast_food], node|z15[amenity=food_court], -area|z15[amenity=food_court] {icon-image: fastfood-m.svg;icon-min-distance: 28;} node|z15[amenity=bar], -area|z15[amenity=bar] {icon-image: bar-m.svg;icon-min-distance: 28;} node|z15[amenity=pub], -area|z15[amenity=pub], node|z15[amenity=biergarten], -area|z15[amenity=biergarten] {icon-image: pub-m.svg;icon-min-distance: 28;} node|z16-[amenity=cafe], -area|z16-[amenity=cafe] {icon-image: cafe-m.svg;icon-min-distance: 12;} node|z16-[amenity=restaurant], -area|z16-[amenity=restaurant] {icon-image: restaurant-m.svg;icon-min-distance: 12;} node|z16-[amenity=fast_food], -area|z16-[amenity=fast_food], node|z16-[amenity=food_court], -area|z16-[amenity=food_court] {icon-image: fastfood-m.svg;icon-min-distance: 12;} node|z16-[amenity=bar], -area|z16-[amenity=bar] {icon-image: bar-m.svg;icon-min-distance: 12;} node|z16-[amenity=pub], -area|z16-[amenity=pub], node|z16-[amenity=biergarten], -area|z16-[amenity=biergarten] {icon-image: pub-m.svg;icon-min-distance: 12;} /* 5.AMENITY (infrastructure) */ node|z13-[leisure=stadium], -area|z13-[leisure=stadium], node|z14-[barrier=toll_booth], -area|z14-[barrier=toll_booth], node|z14-[amenity=university], -area|z14-[amenity=university], node|z14-[amenity=place_of_worship], -area|z14-[amenity=place_of_worship], node|z14-[man_made=lighthouse], -area|z14-[man_made=lighthouse], node|z15-[man_made=communications_tower], node|z15-[amenity=hospital], node|z15-[landuse=landfill], -area|z15-[landuse=landfill], node|z15-[landuse=quarry], -area|z15-[landuse=quarry], node|z15-[landuse=industrial][industrial=mine], -area|z15-[landuse=industrial][industrial=mine], node|z14-[barrier=border_control], node|z16-[amenity=veterinary], -area|z16-[amenity=veterinary], node|z16-[amenity=fountain], -area|z16-[amenity=fountain], node|z16-[leisure=marina], -area|z16-[leisure=marina], node|z16-[leisure=water_park], -area|z16-[leisure=water_park], node|z16-[barrier=block], node|z16-[barrier=bollard], node|z16-[barrier=chain], @@ -936,164 +751,90 @@ node|z16-[barrier=stile], node|z16-[barrier=turnstile], node|z16-[barrier=cycle_barrier], node|z16-[amenity=nightclub], -area|z16-[amenity=nightclub], node|z16-[amenity=townhall], node|z16-[amenity=bank], -area|z16-[amenity=bank], node|z16-[amenity=taxi], -area|z16-[amenity=taxi], node|z16-[leisure=dog_park], -area|z16-[leisure=dog_park], node|z16-[man_made=windmill], -area|z16-[man_made=windmill], node|z16-[amenity=college], -area|z16-[amenity=college], node|z16-[amenity=conference_centre], -area|z16-[amenity=conference_centre], node|z16-[amenity=events_venue], -area|z16-[amenity=events_venue], node|z16-[amenity=exhibition_centre], -area|z16-[amenity=exhibition_centre], node|z16-[emergency=mountain_rescue], node|z17-[amenity=pharmacy], -area|z17-[amenity=pharmacy], node|z17-[amenity=clinic], -area|z17-[amenity=clinic], node|z17-[amenity=doctors], -area|z17-[amenity=doctors], node|z17-[healthcare=laboratory], -area|z17-[healthcare=laboratory], node|z17-[healthcare=physiotherapist], -area|z17-[healthcare=physiotherapist], node|z17-[healthcare=alternative], -area|z17-[healthcare=alternative], node|z17-[healthcare=audiologist], -area|z17-[healthcare=audiologist], node|z17-[healthcare=blood_donation], -area|z17-[healthcare=blood_donation], node|z17-[healthcare=optometrist], -area|z17-[healthcare=optometrist], node|z17-[healthcare=podiatrist], -area|z17-[healthcare=podiatrist], node|z17-[healthcare=psychotherapist], -area|z17-[healthcare=psychotherapist], node|z17-[healthcare=sample_collection], -area|z17-[healthcare=sample_collection], node|z17-[healthcare=speech_therapist], -area|z17-[healthcare=speech_therapist], node|z17-[amenity=dentist], -area|z17-[amenity=dentist], node|z17-[amenity=casino], -area|z17-[amenity=casino], node|z17-[amenity=gambling], -area|z17-[amenity=gambling], node|z17-[leisure=adult_gaming_centre], -area|z17-[leisure=adult_gaming_centre], node|z17-[leisure=amusement_arcade], -area|z17-[leisure=amusement_arcade], node|z17-[amenity=courthouse], -area|z17-[amenity=courthouse], node|z17-[amenity=nursing_home], -area|z17-[amenity=nursing_home], node|z17-[amenity=social_facility], -area|z17-[amenity=social_facility], node|z17-[amenity=kindergarten], -area|z17-[amenity=kindergarten], node|z17-[amenity=childcare], -area|z17-[amenity=childcare], node|z17-[amenity=school], -area|z17-[amenity=school], node|z17-[amenity=cinema], -area|z17-[amenity=cinema], node|z17-[amenity=ice_cream], -area|z17-[amenity=ice_cream], node|z17-[leisure=bowling_alley], -area|z17-[leisure=bowling_alley], node|z17-[amenity=police], -area|z17-[amenity=police], node|z17-[amenity=prison], -area|z17-[amenity=prison], node|z17-[office=diplomatic], -area|z17-[office=diplomatic], node|z17-[office=lawyer], -area|z17-[office=lawyer], node|z17-[amenity=vending_machine][vending=parking_tickets], -area|z17-[amenity=vending_machine][vending=parking_tickets], node|z17-[amenity=vending_machine][vending=public_transport_tickets], -area|z17-[amenity=vending_machine][vending=public_transport_tickets], node|z17-[amenity=payment_terminal], -area|z17-[amenity=payment_terminal], node|z17-[amenity=shower], -area|z17-[amenity=shower], node|z17-[amenity=motorcycle_rental], node|z17-[amenity=bicycle_rental], -area|z17-[amenity=bicycle_rental], node|z17-[amenity=bicycle_repair_station], -area|z17-[amenity=bicycle_repair_station], node|z17-[amenity=post_office], -area|z17-[amenity=post_office], node|z17-[man_made=works], -area|z17-[man_made=works], node|z17-[amenity=parcel_locker], -area|z17-[amenity=parcel_locker], node|z17-[amenity=public_bath], -area|z17-[amenity=public_bath], node|z17-[aeroway=gate], -area|z17-[aeroway=gate], node|z17-[sport], -area|z17-[sport], node|z17-[highway=ladder], node|z18-[amenity=dojo], -area|z18-[amenity=dojo], node|z18-[amenity=vending_machine], -area|z18-[amenity=vending_machine], node|z18-[amenity=post_box], -area|z18-[amenity=post_box], node|z18-[amenity=fire_station], -area|z18-[amenity=fire_station], node|z18-[emergency=defibrillator], -area|z18-[emergency=defibrillator], node|z18-[emergency=assembly_point], -area|z18-[emergency=assembly_point], node|z18-[emergency=lifeguard], node|z18-[amenity=toilets], -area|z18-[amenity=toilets], node|z18-[amenity=atm], -area|z18-[amenity=atm], node|z18-[amenity=bureau_de_change], -area|z18-[amenity=bureau_de_change], node|z18-[amenity=money_transfer], -area|z18-[amenity=money_transfer], node|z18-[amenity=library], -area|z18-[amenity=library], node|z18-[amenity=waste_disposal], -area|z18-[amenity=waste_disposal], node|z18-[amenity=hunting_stand], -area|z18-[amenity=hunting_stand], node|z18-[shop=lottery], node|z18-[shop=hearing_aids], node|z18-[man_made=chimney], -area|z18-[man_made=chimney], node|z18-[man_made=crane], -area|z18-[man_made=crane], node|z18-[man_made=silo], -area|z18-[man_made=silo], node|z18-[man_made=storage_tank], -area|z18-[man_made=storage_tank], node|z18-[man_made=water_tower], node|z18-[man_made=tower], node|z18-[amenity=bbq], -area|z18-[amenity=bbq], node|z18-[leisure=firepit], node|z18-[amenity=brothel], -area|z18-[amenity=brothel], node|z18-[amenity=stripclub], -area|z18-[amenity=stripclub], node|z18-[amenity=love_hotel], node|z18-[amenity=public_bookcase], -area|z18-[amenity=public_bookcase], node|z19-[power=substation], -area|z19-[power=substation], node|z18-[man_made=survey_point], node|z18-[man_made=petroleum_well], node|z18-[man_made=flare], @@ -1103,11 +844,8 @@ node|z19-[man_made=cairn], /* TODO: all specific tourism/office/craft feature definitions atm rely on this to increase font size on z18- */ node|z18-[tourism], -area|z18-[tourism], node|z18-[office], -area|z18-[office], node|z18-[craft], -area|z18-[craft], {font-size: 11;} /* 5.1 Hospital */ @@ -1119,156 +857,110 @@ node|z15[amenity=hospital] node|z16-[amenity=hospital], {icon-image: hospital-m.svg;icon-min-distance: 4;} node|z17[amenity=clinic], -area|z17[amenity=clinic], node|z17[amenity=doctors], -area|z17[amenity=doctors], {icon-image: clinic-m.svg;icon-min-distance: 4;} node|z18-[amenity=hospital], {icon-image: hospital-m.svg;font-size: 11;} node|z18-[amenity=clinic], -area|z18-[amenity=clinic], node|z18-[amenity=doctors], -area|z18-[amenity=doctors], {icon-image: clinic-m.svg;font-size: 11;} node|z17[healthcare=laboratory], -area|z17[healthcare=laboratory], {icon-image: sample_collection-m.svg;} node|z18-[healthcare=laboratory], -area|z18-[healthcare=laboratory], {icon-image: sample_collection-m.svg;font-size: 11;} node|z17[amenity=dentist], -area|z17[amenity=dentist] {icon-image: dentist-m.svg;} node|z18-[amenity=dentist], -area|z18-[amenity=dentist] {icon-image: dentist-m.svg;font-size: 11;} node|z17[healthcare=physiotherapist], -area|z17[healthcare=physiotherapist] {icon-image: physiotherapist-m.svg;} node|z18-[healthcare=physiotherapist], -area|z18-[healthcare=physiotherapist] {icon-image: physiotherapist-m.svg;font-size: 11;} node|z17[healthcare=alternative], -area|z17[healthcare=alternative] {icon-image: alternative-m.svg;} node|z18-[healthcare=alternative], -area|z18-[healthcare=alternative] {icon-image: alternative-m.svg;font-size: 11;} node|z17[healthcare=audiologist], -area|z17[healthcare=audiologist] {icon-image: audiologist-m.svg;} node|z18-[healthcare=audiologist], -area|z18-[healthcare=audiologist] {icon-image: audiologist-m.svg;font-size: 11;} node|z18-[shop=hearing_aids], {icon-image: hearing_aids-m.svg;font-size: 11;} node|z17[healthcare=blood_donation], -area|z17[healthcare=blood_donation] {icon-image: blood_donation-m.svg;} node|z18-[healthcare=blood_donation], -area|z18-[healthcare=blood_donation] {icon-image: blood_donation-m.svg;font-size: 11;} node|z17[healthcare=optometrist], -area|z17[healthcare=optometrist] {icon-image: optometrist-m.svg;} node|z18-[healthcare=optometrist], -area|z18-[healthcare=optometrist] {icon-image: optometrist-m.svg;font-size: 11;} node|z17[healthcare=podiatrist], -area|z17[healthcare=podiatrist] {icon-image: podiatrist-m.svg;} node|z18-[healthcare=podiatrist], -area|z18-[healthcare=podiatrist] {icon-image: podiatrist-m.svg;font-size: 11;} node|z17[healthcare=psychotherapist], -area|z17[healthcare=psychotherapist] {icon-image: psychotherapist-m.svg;} node|z18-[healthcare=psychotherapist], -area|z18-[healthcare=psychotherapist] {icon-image: psychotherapist-m.svg;font-size: 11;} node|z17[healthcare=sample_collection], -area|z17[healthcare=sample_collection] {icon-image: sample_collection-m.svg;} node|z18-[healthcare=sample_collection], -area|z18-[healthcare=sample_collection] {icon-image: sample_collection-m.svg;font-size: 11;} node|z17[healthcare=speech_therapist], -area|z17[healthcare=speech_therapist] {icon-image: speech_therapist-m.svg;} node|z18-[healthcare=speech_therapist], -area|z18-[healthcare=speech_therapist] {icon-image: speech_therapist-m.svg;font-size: 11;} node|z16-[amenity=veterinary], -area|z16-[amenity=veterinary] {icon-image: veterinary-m.svg;} node|z18-[amenity=veterinary], -area|z18-[amenity=veterinary] {font-size: 11;} node|z16-[amenity=pharmacy], -area|z16-[amenity=pharmacy] {icon-image: pharmacy-m.svg;icon-min-distance: 20;} node|z17-[amenity=pharmacy], -area|z17-[amenity=pharmacy] {text-offset: 1;font-size: 11;icon-min-distance: 20;} /* 5.2 Education */ area|z14[amenity=university][name] {icon-image: college-s.svg;icon-min-distance: 12;} -area|z15-[amenity=university][name], -node|z15-[amenity=university][name] +node|z15-[amenity=university][name], {icon-image: college-m.svg;icon-min-distance: 12;} node|z16[amenity=university][name], -area|z16[amenity=university][name] {icon-min-distance: 11;} node|z17[amenity=university][name], -area|z17[amenity=university][name] {icon-min-distance: 10;} node|z18-[amenity=university][name], -area|z18-[amenity=university][name] {icon-min-distance: 0; font-size: 11;} node|z15-[amenity=university][!name] {text: none} node|z16-[amenity=college], -area|z16-[amenity=college] {icon-image: college-m.svg;} node|z18-[amenity=college], -area|z18-[amenity=college] {font-size: 11;} node|z17-[amenity=kindergarten], -area|z17-[amenity=kindergarten] {icon-image: kindergarten-m.svg;} node|z18-[amenity=kindergarten], -area|z18-[amenity=kindergarten] {font-size: 11;} node|z17-[amenity=childcare], -area|z17-[amenity=childcare] {icon-image: kindergarten-m.svg;} node|z18-[amenity=childcare], -area|z18-[amenity=childcare] {font-size: 11;} node|z17-[amenity=school], -area|z17-[amenity=school] {icon-image: school-m.svg;} node|z18-[amenity=school], -area|z18-[amenity=school] {font-size: 11;} node|z17-[amenity=music_school], -area|z17-[amenity=music_school] {icon-image: music_school-m.svg;} node|z17-[amenity=driving_school], -area|z17-[amenity=driving_school] {icon-image: driving_school-m.svg;} node|z17-[amenity=language_school], -area|z17-[amenity=language_school] {icon-image: language_school-m.svg;} node|z17-[leisure=hackerspace], -area|z17-[leisure=hackerspace] {icon-image: hackerspace-m.svg;} node|z17-[leisure=escape_game] {icon-image: escape_game.svg;} @@ -1295,251 +987,175 @@ node|z17-[leisure=fitness_centre] node|z17-[leisure=sauna] {icon-image: public_bath-m.svg;icon-min-distance: 10;} node|z17-[leisure=playground], -area|z17-[leisure=playground], {icon-image: playground-m.svg;font-size: 11;icon-min-distance: 10;} node|z17-[leisure=swimming_pool], -area|z17-[leisure=swimming_pool] {icon-image: swimming-m.svg;icon-min-distance: 10;} node|z17-[leisure=swimming_pool][access=private], -area|z17-[leisure=swimming_pool][access=private] {icon-image: zero-icon.svg;} node|z15-[leisure=golf_course], -area|z15-[leisure=golf_course], node|z17-[leisure=miniature_golf], -area|z17-[leisure=miniature_golf], {icon-image: golf-m.svg;icon-min-distance: 10;} node|z17-[amenity=dojo] {icon-image: martial-arts-m.svg;} node|z17-[sport], -area|z17-[sport], {icon-image: pitch-m.svg; icon-min-distance: 10; } node|z17-[sport=american_football], -area|z17-[sport=american_football] {icon-image: america-football-m.svg;} node|z17-[sport=basketball], -area|z17-[sport=basketball] {icon-image: basketball-m.svg;} node|z17-[sport=baseball], -area|z17-[sport=baseball] {icon-image: baseball-m.svg;} node|z17-[sport=equestrian], -area|z17-[sport=equestrian] {icon-image: equestrian-m.svg;} node|z17-[sport=soccer], -area|z17-[sport=soccer] {icon-image: soccer-m.svg;} node|z17-[sport=tennis], -area|z17-[sport=tennis] {icon-image: tennis-m.svg;} node|z17-[sport=skiing], -area|z17-[sport=skiing] {icon-image: skiing-m.svg;} node|z17-[sport=archery], -area|z17-[sport=archery] {icon-image: archery-m.svg;} node|z17-[sport=shooting], -area|z17-[sport=shooting] {icon-image: archery-m.svg;} node|z17-[sport=australian_football], -area|z17-[sport=australian_football] {icon-image: australian-football-m.svg;} node|z17-[sport=cricket], -area|z17-[sport=cricket] {icon-image: cricket-m.svg;} node|z17-[sport=curling], -area|z17-[sport=curling] {icon-image: curling-m.svg;} node|z17-[sport=scuba_diving], -area|z17-[sport=scuba_diving] {icon-image: diving-m.svg;} node|z17-[sport=9pin], -area|z17-[sport=9pin] {icon-image: bowling-m.svg;} node|z17-[sport=10pin], -area|z17-[sport=10pin] {icon-image: bowling-m.svg;} node|z17-[sport=chess], -area|z17-[sport=chess] {icon-image: chess-m.svg;} node|z17-[sport=climbing], -area|z17-[sport=climbing] {icon-image: climbing-m.svg;} node|z17-[sport=golf], -area|z17-[sport=golf] {icon-image: golf-m.svg;} node|z17-[sport=skateboard], -area|z17-[sport=skateboard] {icon-image: skateboard-m.svg;} node|z17-[sport=swimming], -area|z17-[sport=swimming] {icon-image: swimming-m.svg;} node|z17-[sport=table_tennis], -area|z17-[sport=table_tennis] {icon-image: table-tennis-m.svg;} node|z17-[sport=volleyball], -area|z17-[sport=volleyball], node|z17-[sport=beachvolleyball], -area|z17-[sport=beachvolleyball], {icon-image: volleyball-m.svg;} node|z17-[sport=yoga], -area|z17-[sport=yoga] {icon-image: yoga-m.svg;} node|z17-[sport=padel], -area|z17-[sport=padel] {icon-image: padel-m.svg;} node|z17-[sport=handball], -area|z17-[sport=handball] {icon-image: handball-m.svg;} node|z17-[sport=futsal], -area|z17-[sport=futsal] {icon-image: soccer-m.svg;} node|z17-[sport=ice_hockey], -area|z17-[sport=ice_hockey] {icon-image: hockey-m.svg;} node|z17-[sport=field_hockey], -area|z17-[sport=field_hockey] {icon-image: hockey-m.svg;} node|z17-[sport=badminton], -area|z17-[sport=badminton] {icon-image: badminton-m.svg;} node|z17-[sport=pelota], -area|z17-[sport=pelota] {icon-image: pelota-m.svg;} node|z18-[sport], -area|z18-[sport], {font-size: 11; } /* 5.4 Religion */ node|z14[amenity=place_of_worship], -area|z14[amenity=place_of_worship] {icon-image: place-of-worship-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=christian], -area|z14[amenity=place_of_worship][religion=christian] {icon-image: christian-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=muslim], -area|z14[amenity=place_of_worship][religion=muslim] {icon-image: muslim-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=buddhist], -area|z14[amenity=place_of_worship][religion=buddhist] {icon-image: buddhist-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=hindu], -area|z14[amenity=place_of_worship][religion=hindu] {icon-image: hindu-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=shinto], -area|z14[amenity=place_of_worship][religion=shinto] {icon-image: shinto-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=jewish], -area|z14[amenity=place_of_worship][religion=jewish] {icon-image: jewish-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14[amenity=place_of_worship][religion=taoist], -area|z14[amenity=place_of_worship][religion=taoist] {icon-image: taoist-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14-[amenity=place_of_worship][religion=christian][denomination=mormon], -area|z14-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-s.svg;text-offset: 1;icon-min-distance: 12;} node|z14-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], -area|z14-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], {icon-image: place-of-worship-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15-[amenity=place_of_worship], -area|z15-[amenity=place_of_worship] {icon-image: place-of-worship-m.svg;icon-min-distance: 10;} node|z15-[amenity=place_of_worship][religion=christian], -area|z15-[amenity=place_of_worship][religion=christian] {icon-image: christian-m.svg;} node|z15-[amenity=place_of_worship][religion=muslim], -area|z15-[amenity=place_of_worship][religion=muslim] {icon-image: muslim-m.svg;} node|z15-[amenity=place_of_worship][religion=buddhist], -area|z15-[amenity=place_of_worship][religion=buddhist] {icon-image: buddhist-m.svg;} node|z15-[amenity=place_of_worship][religion=hindu], -area|z15-[amenity=place_of_worship][religion=hindu] {icon-image: hindu-m.svg;} node|z15-[amenity=place_of_worship][religion=shinto], -area|z15-[amenity=place_of_worship][religion=shinto] {icon-image: shinto-m.svg;} node|z15-[amenity=place_of_worship][religion=jewish], -area|z15-[amenity=place_of_worship][religion=jewish] {icon-image: jewish-m.svg;} node|z15-[amenity=place_of_worship][religion=taoist], -area|z15-[amenity=place_of_worship][religion=taoist] {icon-image: taoist-m.svg;} node|z15-[amenity=place_of_worship][religion=christian][denomination=mormon], -area|z15-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-m.svg;} node|z15-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], -area|z15-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], {icon-image: place-of-worship-m.svg;} /* 5.5 Others */ node|z16-[amenity=nightclub], -area|z16-[amenity=nightclub] {icon-image: nightclub-m.svg;font-size: 11;} node|z18-[amenity=love_hotel], node|z18-[amenity=brothel], -area|z18-[amenity=brothel], node|z18-[amenity=stripclub], -area|z18-[amenity=stripclub] {icon-image: stripclub-m.svg;font-size: 11;} node|z16[amenity=bank], -area|z16[amenity=bank] {icon-image: bank-m.svg;text-offset: 1;font-size: 11;} node|z17-[amenity=bank], -area|z17-[amenity=bank] {icon-image: bank-m.svg;} node|z15-[landuse=landfill], -area|z15-[landuse=landfill] {icon-image: waste-basket-m.svg;text-offset: 1;font-size: 10;} node|z15-[landuse=quarry], -area|z15-[landuse=quarry], node|z15-[landuse=industrial][industrial=mine], -area|z15-[landuse=industrial][industrial=mine] {icon-image: mine-m.svg;text-offset: 1;font-size: 10;} node|z16-[leisure=water_park], -area|z16-[leisure=water_park] {icon-image: swimming-m.svg;icon-min-distance: 30;} node|z17-[leisure=water_park], -area|z17-[leisure=water_park] {icon-min-distance: 20;} node|z16-[leisure=marina], -area|z16-[leisure=marina] {icon-image: marina-m.svg;icon-min-distance: 30;} node|z17-[leisure=marina], -area|z17-[leisure=marina] {icon-min-distance: 20;} node|z16-[amenity=fountain], -area|z16-[amenity=fountain] {icon-image: fountain-s.svg;icon-min-distance: 20;} node|z19-[amenity=fountain], -area|z19-[amenity=fountain] {icon-image: fountain-m.svg;icon-min-distance: 20;} node|z14[man_made=lighthouse], -area|z14[man_made=lighthouse] {icon-image: lighthouse-s.svg;text-offset: 1;icon-min-distance: 5;} node|z15-[man_made=lighthouse], -area|z15-[man_made=lighthouse] {icon-image: lighthouse-m.svg;} node|z12-14[barrier=toll_booth], -area|z12-14[barrier=toll_booth], {icon-image: toll_booth-s.svg;} node|z15-[barrier=toll_booth], -area|z15-[barrier=toll_booth], {icon-image: toll_booth-m.svg;} node|z14[barrier=border_control], @@ -1592,10 +1208,8 @@ node|z17-[man_made=petroleum_well], {icon-image: mast-m.svg;} node|z16-[amenity=taxi], -area|z16-[amenity=taxi] {icon-image: taxi-m.svg;icon-min-distance: 30;} node|z17-[amenity=taxi], -area|z17-[amenity=taxi] {icon-min-distance: 20;} line|z16-[barrier=lift_gate], @@ -1606,81 +1220,60 @@ line|z17-[barrier=swing_gate], {icon-min-distance: 20;} node|z16-[leisure=dog_park], -area|z16-[leisure=dog_park] {icon-image: dog_park-m.svg;icon-min-distance: 30;} node|z17-[leisure=dog_park], -area|z17-[leisure=dog_park] {icon-min-distance: 20;} node|z16-[man_made=windmill], -area|z16-[man_made=windmill] {icon-image: windmill-m.svg;icon-min-distance: 30;} node|z17-[man_made=windmill], -area|z17-[man_made=windmill] {icon-min-distance: 20;} node|z17-[amenity=casino], -area|z17-[amenity=casino] {icon-image: casino-m.svg;icon-min-distance: 20;} node|z17-[amenity=gambling], -area|z17-[amenity=gambling], {icon-image: gambling-m.svg;icon-min-distance: 20;} node|z17-[leisure=adult_gaming_centre], -area|z17-[leisure=adult_gaming_centre], {icon-image: slots-m.svg;icon-min-distance: 20;} node|z17-[leisure=amusement_arcade], -area|z17-[leisure=amusement_arcade], {icon-image: arcade-m.svg;icon-min-distance: 20;} node|z18-[shop=lottery], {icon-image: lottery-m.svg;} node|z17-[amenity=courthouse], -area|z17-[amenity=courthouse] {icon-image: public-building-m.svg;} node|z17-[amenity=nursing_home], -area|z17-[amenity=nursing_home] {icon-image: home-m.svg;} node|z17-[amenity=social_facility], -area|z17-[amenity=social_facility] {icon-image: social_facility-m.svg;} node|z17-[amenity=cinema], -area|z17-[amenity=cinema] {icon-image: cinema-m.svg;} node|z18-[amenity=cinema], -area|z18-[amenity=cinema] {font-size: 11;} node|z17-[leisure=bowling_alley], -area|z17-[leisure=bowling_alley], {icon-image: bowling_alley-m.svg;} node|z18-[leisure=bowling_alley], -area|z18-[leisure=bowling_alley], {font-size: 11;} node|z17-[amenity=police], -area|z17-[amenity=police] {icon-image: police-m.svg;} node|z18-[amenity=police], -area|z18-[amenity=police] {font-size: 11;} node|z17-[amenity=prison], -area|z17-[amenity=prison] {icon-image: prison-m.svg;} node|z18-[amenity=prison], -area|z18-[amenity=prison] {font-size: 11;} node|z16-[amenity=townhall], node|z17-[office=diplomatic], -area|z17-[office=diplomatic], {icon-image: embassy-m.svg;} node|z17-[amenity=townhall], node|z18-[office=diplomatic], -area|z18-[office=diplomatic], {font-size: 11;} node|z17-[amenity=motorcycle_rental], @@ -1689,37 +1282,28 @@ node|z18-[amenity=motorcycle_rental], {font-size: 11;} node|z17-[amenity=bicycle_rental], -area|z17-[amenity=bicycle_rental] {icon-image: bicycle-rental.svg;} node|z18-[amenity=bicycle_rental], -area|z18-[amenity=bicycle_rental] {font-size: 11;} node|z17-[amenity=bicycle_repair_station], -area|z17-[amenity=bicycle_repair_station] {icon-image: bicycle-repair-station.svg;} node|z18-[amenity=bicycle_repair_station], -area|z18-[amenity=bicycle_repair_station] {font-size: 11;} node|z17-[amenity=post_office], -area|z17-[amenity=post_office], {icon-image: mail-m.svg;} node|z18-[amenity=post_office], -area|z18-[amenity=post_office], {font-size: 11;} node|z18-[amenity=post_box], -area|z18-[amenity=post_box], {icon-image: postbox-m.svg;font-size: 11;} node|z19-[emergency=fire_hydrant], {icon-image: firehydrant-m.svg;font-size: 11;} node|z18-[emergency=defibrillator], -area|z18-[emergency=defibrillator] {icon-image: defibrillator-m.svg;font-size: 11;} node|z18-[emergency=assembly_point], -area|z18-[emergency=assembly_point] {icon-image: assembly_point-m.svg;font-size: 11;} node|z17-[emergency=lifeguard], @@ -1730,7 +1314,6 @@ node|z16-[emergency=mountain_rescue], {icon-image: hospital-m.svg; font-size: 11;} node|z17-[office=lawyer], -area|z17-[office=lawyer] {icon-image: lawyer-m.svg;} node|z17-[amenity=telephone] @@ -1740,80 +1323,57 @@ node|z17-[emergency=phone] {icon-image: emergency-phone-m.svg;} node|z17-[amenity=recycling], -area|z17-[amenity=recycling], node|z17-[amenity=waste_transfer_station], -area|z17-[amenity=waste_transfer_station], {icon-image: recycling-m.svg;} node|z17-[power=plant], -area|z17-[power=plant], /* Skip individual solar generators, because there are a lot of mapped panels */ node|z17-[power=generator][generator:source!=solar], -area|z17-[power=generator][generator:source!=solar], node|z19-[power=substation], -area|z19-[power=substation], {icon-image: power-m.svg;font-size: 11;} node|z15-[power=generator][generator:source=wind], -area|z15-[power=generator][generator:source=wind], {icon-image: dot-m.svg;} node|z18-[power=generator][generator:source=wind], -area|z18-[power=generator][generator:source=wind], {icon-image: wind_turbine-m.svg;text: name;text-color: @poi_label; text-offset: 1; font-size: 10;} node|z15-[power=plant][plant:source=wind], -area|z15-[power=plant][plant:source=wind], {icon-image: power_plant_wind-m.svg;} node|z16-[power=plant][plant:source=wind], -area|z16-[power=plant][plant:source=wind], {text: name;text-color: @poi_label; text-offset: 1; font-size: 10;} node|z17-[amenity=shower], -area|z17-[amenity=shower] {icon-image: shower-m.svg;} node|z17-[amenity=payment_terminal], -area|z17-[amenity=payment_terminal] {icon-image: vending-m.svg;} node|z18-[amenity=vending_machine], -area|z18-[amenity=vending_machine], {icon-image: vending-m.svg;} node|z17-[amenity=vending_machine][vending=parking_tickets], -area|z17-[amenity=vending_machine][vending=parking_tickets], {icon-image: parking-meter-m.svg;font-size: 11;} node|z17-[amenity=vending_machine][vending=public_transport_tickets], -area|z17-[amenity=vending_machine][vending=public_transport_tickets], {icon-image: vending-m.svg;} node|z18-[amenity=vending_machine][vending=excrement_bags], -area|z18-[amenity=vending_machine][vending=excrement_bags], {icon-image: excrement_bags-m.svg;} node|z17-[amenity=parcel_locker], -area|z17-[amenity=parcel_locker], {icon-image: parcel_locker-m.svg;} node|z18-[amenity=vending_machine][vending=fuel], -area|z18-[amenity=vending_machine][vending=fuel], {icon-image: fuel-dispenser-m.svg;} node|z17-[aeroway=gate], -area|z17-[aeroway=gate] {icon-image: airport_gate-m.svg;font-size: 11;} -area|z17-[amenity=bureau_de_change], node|z17-[amenity=bureau_de_change], -area|z17-[amenity=money_transfer], node|z17-[amenity=money_transfer], {icon-image: banknote-m.svg;font-size: 11;} node|z18-[amenity=fire_station], -area|z18-[amenity=fire_station] {icon-image: fire_station-m.svg;font-size: 11;} node|z18-[amenity=toilets], -area|z18-[amenity=toilets] {icon-image: toilets-m.svg;font-size: 11;} node|z18-[amenity=atm], -area|z18-[amenity=atm] {icon-image: atm-m.svg;font-size: 11;} node|z18-[amenity=bench] @@ -1824,37 +1384,29 @@ node|z18-[amenity=waste_basket] node|z18-[amenity=library] {icon-image: library-m.svg;font-size: 11;} node|z18-[amenity=waste_disposal], -area|z18-[amenity=waste_disposal] {icon-image: waste-basket-m.svg;font-size: 11;} node|z18-[amenity=internet_cafe] {icon-image: internet_cafe-m.svg;} node|z18-[amenity=hunting_stand], -area|z18-[amenity=hunting_stand] {icon-image: hunting-tower-m.svg;font-size: 11;} node|z16-[man_made=chimney], -area|z16-[man_made=chimney], {icon-image: chimney-m.svg;font-size: 11;} node|z16-[man_made=crane], -area|z16-[man_made=crane], {icon-image: crane-m.svg;font-size: 11;} node|z16-[man_made=works], -area|z16-[man_made=works] {icon-image: factory-m.svg;font-size: 11;} node|z16-[man_made=silo], -area|z16-[man_made=silo], node|z16-[man_made=storage_tank], -area|z16-[man_made=storage_tank], node|z16-[man_made=water_tower], {icon-image: storage-tank.svg;font-size: 11;} node|z18-[amenity=bbq], -area|z18-[amenity=bbq] {icon-image: bbq-m.svg;font-size: 11;} node|z17[leisure=firepit], @@ -1869,184 +1421,101 @@ node|z19-[man_made=cairn] {icon-image: cairn-m.svg;font-size: 11;} node|z18-[amenity=public_bookcase], -area|z18-[amenity=public_bookcase] {icon-image: bookcase-m.svg;font-size: 11;} node|z17-[amenity=public_bath], -area|z17-[amenity=public_bath], {icon-image: public_bath-m.svg;font-size: 11;} /* 6. SHOP */ node|z16-[amenity=marketplace], -area|z16-[amenity=marketplace], {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;} node|z16[amenity=marketplace], -area|z16[amenity=marketplace] {icon-image: marketplace-m.svg; text-offset: 1; font-size: 11; icon-min-distance: 24;} node|z17-[amenity=marketplace], -area|z17-[amenity=marketplace] {icon-image: marketplace-m.svg; font-size: 11; icon-min-distance: 8;} node|z18-[shop], -area|z18-[shop], node|z14-[shop=mall], -area|z14-[shop=mall], node|z15-[shop=car_repair][service=tyres], -area|z15-[shop=car_repair][service=tyres], node|z16-[shop=supermarket], -area|z16-[shop=supermarket], node|z16-[shop=cheese], -area|z16-[shop=cheese], node|z16-[shop=alcohol], -area|z16-[shop=alcohol], node|z16-[shop=art], -area|z16-[shop=art], node|z16-[shop=wine], -area|z16-[shop=wine], node|z16-[shop=books], -area|z16-[shop=books], node|z16-[shop=charity], -area|z16-[shop=charity], node|z16-[shop=second_hand], -area|z16-[shop=second_hand], node|z16-[shop=antiques], -area|z16-[shop=antiques], node|z16-[shop=bakery], -area|z16-[shop=bakery], node|z16-[shop=pastry], -area|z16-[shop=pastry], node|z16-[shop=pasta], node|z16-[shop=beauty], -area|z16-[shop=beauty], node|z16-[shop=cosmetics], -area|z16-[shop=cosmetics], node|z16-[shop=beverages], -area|z16-[shop=beverages], node|z16-[shop=bicycle], -area|z16-[shop=bicycle], node|z16-[shop=butcher], -area|z16-[shop=butcher], node|z16-[shop=car], -area|z16-[shop=car], node|z16-[shop=caravan], -area|z16-[shop=caravan], node|z16-[shop=motorcycle], -area|z16-[shop=motorcycle], node|z16-[shop=car_parts], -area|z16-[shop=car_parts], node|z16-[shop=car_repair], -area|z16-[shop=car_repair], node|z16-[amenity=vehicle_inspection], -area|z16-[amenity=vehicle_inspection], node|z16-[shop=tyres], -area|z16-[shop=tyres], node|z16-[shop=chemist], -area|z16-[shop=chemist], node|z16-[shop=clothes], -area|z16-[shop=clothes], node|z16-[shop=computer], -area|z16-[shop=computer], node|z16-[shop=video_games], -area|z16-[shop=video_games], node|z16-[shop=tattoo], -area|z16-[shop=tattoo], node|z16-[shop=erotic], -area|z16-[shop=erotic], node|z16-[shop=confectionery], -area|z16-[shop=confectionery], node|z16-[shop=chocolate], -area|z16-[shop=chocolate], node|z16-[shop=convenience], -area|z16-[shop=convenience], node|z16-[shop=deli], -area|z16-[shop=deli], node|z16-[shop=farm], -area|z16-[shop=farm], node|z16-[shop=grocery], -area|z16-[shop=grocery], node|z16-[shop=health_food], -area|z16-[shop=health_food], node|z16-[shop=copyshop], -area|z16-[shop=copyshop], node|z16-[shop=photo], -area|z16-[shop=photo], node|z16-[shop=camera], -area|z16-[shop=camera], node|z16-[shop=pet], -area|z16-[shop=pet], node|z16-[shop=department_store], -area|z16-[shop=department_store], node|z16-[shop=interior_decoration], -area|z16-[shop=interior_decoration], node|z16-[shop=doityourself], -area|z16-[shop=doityourself], node|z16-[shop=electronics], -area|z16-[shop=electronics], node|z16-[shop=florist], -area|z16-[shop=florist], node|z16-[shop=furniture], -area|z16-[shop=furniture], node|z16-[shop=kitchen], -area|z16-[shop=kitchen], node|z16-[shop=garden_centre], -area|z16-[shop=garden_centre], node|z16-[shop=gift], -area|z16-[shop=gift], node|z16-[shop=music], -area|z16-[shop=music], node|z16-[amenity=studio], node|z16-[shop=video], -area|z16-[shop=video], node|z16-[shop=musical_instrument], -area|z16-[shop=musical_instrument], node|z16-[shop=greengrocer], -area|z16-[shop=greengrocer], node|z16-[shop=hairdresser], -area|z16-[shop=hairdresser], node|z16-[shop=sewing], -area|z16-[shop=sewing], node|z16-[shop=hardware], -area|z16-[shop=hardware], node|z16-[shop=houseware], -area|z16-[shop=houseware], node|z16-[shop=jewelry], -area|z16-[shop=jewelry], node|z16-[shop=kiosk], -area|z16-[shop=kiosk], node|z16-[shop=laundry], -area|z16-[shop=laundry], node|z16-[shop=dry_cleaning], -area|z16-[shop=dry_cleaning], node|z16-[shop=mobile_phone], -area|z16-[shop=mobile_phone], node|z16-[shop=optician], -area|z16-[shop=optician], node|z16-[shop=outdoor], -area|z16-[shop=outdoor], node|z16-[shop=rental], -area|z16-[shop=rental], node|z16-[shop=rental][rental=bike], -area|z16-[shop=rental][rental=bike], node|z16-[shop=seafood], -area|z16-[shop=seafood], node|z16-[shop=shoes], -area|z16-[shop=shoes], node|z16-[shop=sports], -area|z16-[shop=sports], node|z16-[shop=ticket], -area|z16-[shop=ticket], node|z16-[shop=toys], -area|z16-[shop=toys], node|z16-[shop=stationery], -area|z16-[shop=stationery], node|z17-[shop=variety_store], -area|z17-[shop=variety_store], node|z17-[shop=money_lender], -area|z17-[shop=money_lender], node|z17-[shop=pawnbroker], -area|z17-[shop=pawnbroker], node|z18-[shop=auction], node|z18-[shop=bookmaker], node|z18-[shop=fabric], @@ -2054,475 +1523,316 @@ node|z18-[shop=funeral_directors], node|z18-[shop=collector], node|z18-[shop=wholesale], node|z18-[shop=tobacco], -area|z18-[shop=tobacco], {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;} node|z14[shop=mall], -area|z14[shop=mall], {icon-image: shop-s.svg;icon-min-distance: 16;} node|z15-[shop=mall], -area|z15-[shop=mall], {icon-image: shop-m.svg;font-size: 11;icon-min-distance: 16;} node|z15[shop=car_repair][service=tyres], -area|z15[shop=car_repair][service=tyres], {icon-image: car-repair-s.svg; text-offset: 1; icon-min-distance: 20;} node|z16-[shop=car_repair][service=tyres], -area|z16-[shop=car_repair][service=tyres], {icon-image: car-repair-m.svg;} node|z17-[shop=mall], -area|z17-[shop=mall], {font-size: 11;icon-min-distance: 8;} node|z16[shop=supermarket], -area|z16[shop=supermarket], {icon-image: supermarket-m.svg;font-size: 11;icon-min-distance: 16;} node|z17-[shop=supermarket], -area|z17-[shop=supermarket], {icon-image: supermarket-m.svg;font-size: 11;icon-min-distance: 8;} node|z16[shop=cheese], -area|z16[shop=cheese] {icon-image: cheese-m.svg;} node|z16-[shop=pasta], {icon-image: shop-m.svg;} node|z16[shop=alcohol], -area|z16[shop=alcohol] {icon-image: alcohol-m.svg;} node|z16[shop=art], -area|z16[shop=art] {icon-image: art-m.svg;} node|z16[shop=wine], -area|z16[shop=wine] {icon-image: alcohol-m.svg;} node|z16[shop=books], -area|z16[shop=books] {icon-image: book-shop-m.svg;} node|z16[shop=charity], -area|z16[shop=charity] {icon-image: charity_shop-m.svg;} node|z16[shop=second_hand], -area|z16[shop=second_hand] {icon-image: second_hand_shop-m.svg;} node|z16[shop=antiques], -area|z16[shop=antiques] {icon-image: antiques-m.svg;} node|z16[shop=bakery], -area|z16[shop=bakery], node|z16[shop=pastry], -area|z16[shop=pastry], {icon-image: bakery-m.svg;} node|z16[shop=beauty], -area|z16[shop=beauty] {icon-image: beauty-m.svg;} node|z16[shop=cosmetics], -area|z16[shop=cosmetics] {icon-image: beauty-m.svg;} node|z16[shop=beverages], -area|z16[shop=beverages] {icon-image: alcohol-m.svg;} node|z16[shop=bicycle], -area|z16[shop=bicycle] {icon-image: shop-bicycle-m.svg;} node|z16[shop=butcher], -area|z16[shop=butcher] {icon-image: butcher-m.svg;} node|z16[shop=car], -area|z16[shop=car] {icon-image: car_shop-m.svg;} node|z16[shop=caravan], -area|z16[shop=caravan] {icon-image: caravan-shop-m.svg;} node|z16[shop=motorcycle], -area|z16[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;} node|z16[shop=car_parts], -area|z16[shop=car_parts] {icon-image: car-part-m.svg;} node|z16[shop=car_repair], -area|z16[shop=car_repair] {icon-image: car-repair-m.svg;} node|z16[shop=motorcycle_repair], -area|z16[shop=motorcycle_repair] {icon-image: motorcycle_repair-m.svg;} node|z16[shop=tyres], -area|z16[shop=tyres] {icon-image: car-repair-m.svg;} node|z16-[amenity=vehicle_inspection], -area|z16-[amenity=vehicle_inspection], {icon-image: vehicle_inspection-m.svg;} node|z16[shop=chemist], -area|z16[shop=chemist] {icon-image: chemist-m.svg;} node|z16[shop=clothes], -area|z16[shop=clothes] {icon-image: clothes-m.svg;} node|z16[shop=computer], -area|z16[shop=computer] {icon-image: computer-m.svg;} node|z16[shop=video_games], -area|z16[shop=video_games] {icon-image: video-games-m.svg;} node|z16[shop=tattoo], -area|z16[shop=tattoo] {icon-image: craft-m.svg;} node|z16[shop=erotic], -area|z16[shop=erotic] {icon-image: erotic-m.svg;} node|z16[shop=confectionery], -area|z16[shop=confectionery], node|z16[shop=chocolate], -area|z16[shop=chocolate] {icon-image: confectionery-m.svg;} node|z16[amenity=ice_cream], -area|z16[amenity=ice_cream] {icon-image: ice_cream-m.svg;} node|z16[shop=convenience], -area|z16[shop=convenience], node|z16[shop=deli], -area|z16[shop=deli], node|z16[shop=farm], -area|z16[shop=farm], node|z16[shop=grocery], -area|z16[shop=grocery], node|z16[shop=health_food], -area|z16[shop=health_food], {icon-image: convenience-m.svg;} node|z16[shop=copyshop], -area|z16[shop=copyshop] {icon-image: copyshop-m.svg;} node|z16[shop=camera], -area|z16[shop=camera] {icon-image: photo-shop-m.svg;} node|z16[shop=photo], -area|z16[shop=photo] {icon-image: photo-shop-m.svg;} node|z16[shop=pet], -area|z16[shop=pet] {icon-image: petshop-m.svg;} node|z16[shop=department_store], -area|z16[shop=department_store] {icon-image: department_store-m.svg;} node|z16[shop=interior_decoration], -area|z16[shop=interior_decoration] {icon-image: interior_decoration-m.svg;} node|z16[shop=doityourself], -area|z16[shop=doityourself] {icon-image: doityourself-m.svg;} node|z16[shop=electronics], -area|z16[shop=electronics] {icon-image: electronics-m.svg;} node|z16[shop=florist], -area|z16[shop=florist] {icon-image: florist-m.svg;} node|z16[shop=furniture], -area|z16[shop=furniture], node|z16[shop=kitchen], -area|z16[shop=kitchen], {icon-image: furniture-m.svg;} node|z16[shop=garden_centre], -area|z16[shop=garden_centre] {icon-image: garden_center-m.svg;} node|z16[shop=gift], -area|z16[shop=gift] {icon-image: gift-m.svg;} node|z16[shop=music], -area|z16[shop=music], {icon-image: music-m.svg;} node|z16[amenity=studio], {icon-image: studio-m.svg;} node|z16[shop=video], -area|z16[shop=video] {icon-image: media-m.svg;} node|z16[shop=musical_instrument], -area|z16[shop=musical_instrument] {icon-image: musical-instrument-m.svg;} node|z16[shop=greengrocer], -area|z16[shop=greengrocer] {icon-image: greengrocer-m.svg;} node|z16[shop=hairdresser], -area|z16[shop=hairdresser] {icon-image: hairdresser-m.svg;} node|z16-[shop=sewing], -area|z16-[shop=sewing] {icon-image: needle_and_thread-m.svg;} node|z16[shop=hardware], -area|z16[shop=hardware], node|z16[shop=houseware], -area|z16[shop=houseware], {icon-image: doityourself-m.svg;} node|z16[shop=jewelry], -area|z16[shop=jewelry] {icon-image: jewelry-m.svg;} node|z16[shop=kiosk], -area|z16[shop=kiosk] {icon-image: kiosk-m.svg;} node|z16[shop=laundry], -area|z16[shop=laundry] {icon-image:laundry-m.svg;} node|z16[shop=dry_cleaning], -area|z16[shop=dry_cleaning] {icon-image:dry_cleaning-m.svg;} node|z16[shop=mobile_phone], -area|z16[shop=mobile_phone] {icon-image: mobile_phone-m.svg;} node|z16[shop=optician], -area|z16[shop=optician] {icon-image: optician-m.svg;} node|z16[shop=outdoor], -area|z16[shop=outdoor] {icon-image: outdoor-shop-m.svg;} node|z16[shop=seafood], -area|z16[shop=seafood] {icon-image: seafood-shop-m.svg;} node|z16[shop=shoes], -area|z16[shop=shoes] {icon-image: shoes-m.svg;} node|z16[shop=sports], -area|z16[shop=sports] {icon-image: sports-m.svg;} node|z16[shop=ticket], -area|z16[shop=ticket] {icon-image: ticket-shop-m.svg;} node|z16[shop=toys], -area|z16[shop=toys] {icon-image: toys-m.svg;} node|z16[shop=stationery], -area|z16[shop=stationery] {icon-image: stationery_shop-m.svg;} node|z16[shop=rental], -area|z16[shop=rental] {icon-image: rental-m.svg;} node|z16[shop=rental][rental=bike], -area|z16[shop=rental][rental=bike], {icon-image: shop-rental-bicycle-m.svg;} node|z17-[shop=cheese], -area|z17-[shop=cheese] {icon-image: cheese-m.svg;icon-min-distance: 24;} node|z17-[shop=alcohol], -area|z17-[shop=alcohol] {icon-image: alcohol-m.svg;icon-min-distance: 24;} node|z17-[shop=art], -area|z17-[shop=art] {icon-image: art-m.svg;icon-min-distance: 24;} node|z17-[shop=wine], -area|z17-[shop=wine] {icon-image: alcohol-m.svg;icon-min-distance: 24;} node|z17-[shop=books], -area|z17-[shop=books] {icon-image: book-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=charity], -area|z17-[shop=charity] {icon-image: charity_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=second_hand], -area|z17-[shop=second_hand] {icon-image: second_hand_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=antiques], -area|z17-[shop=antiques] {icon-image: antiques-m.svg;icon-min-distance: 24;} node|z17-[shop=bakery], -area|z17-[shop=bakery], node|z17-[shop=pastry], -area|z17-[shop=pastry], {icon-image: bakery-m.svg;icon-min-distance: 24;} node|z17-[shop=beauty], -area|z17-[shop=beauty] {icon-image: beauty-m.svg;icon-min-distance: 24;} node|z17-[shop=cosmetics], -area|z17-[shop=cosmetics] {icon-image: beauty-m.svg;icon-min-distance: 24;} node|z17-[shop=beverages], -area|z17-[shop=beverages] {icon-image: alcohol-m.svg;icon-min-distance: 24;} node|z17-[shop=bicycle], -area|z17-[shop=bicycle] {icon-image: shop-bicycle-m.svg;icon-min-distance: 24;} node|z17-[shop=butcher], -area|z17-[shop=butcher] {icon-image: butcher-m.svg;icon-min-distance: 24;} node|z17-[shop=car], -area|z17-[shop=car] {icon-image: car_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=caravan], -area|z17-[shop=caravan] {icon-image: caravan-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=motorcycle], -area|z17-[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=car_parts], -area|z17-[shop=car_parts] {icon-image: car-part-m.svg;icon-min-distance: 24;} node|z17-[shop=car_repair], -area|z17-[shop=car_repair] {icon-image: car-repair-m.svg;icon-min-distance: 24;} node|z17-[shop=motorcycle_repair], -area|z17-[shop=motorcycle_repair] {icon-image: motorcycle_repair-m.svg;icon-min-distance: 24;} node|z17-[shop=tyres], -area|z17-[shop=tyres] {icon-image: car-repair-m.svg;icon-min-distance: 24;} node|z17-[amenity=vehicle_inspection], -area|z17-[amenity=vehicle_inspection], {icon-image: vehicle_inspection-m.svg;icon-min-distance: 24;} node|z17-[shop=chemist], -area|z17-[shop=chemist] {icon-image: chemist-m.svg;icon-min-distance: 24;} node|z17-[shop=clothes], -area|z17-[shop=clothes] {icon-image: clothes-m.svg;icon-min-distance: 24;} node|z17-[shop=computer], -area|z17-[shop=computer] {icon-image: computer-m.svg;icon-min-distance: 24;} node|z17-[shop=video_games], -area|z17-[shop=video_games] {icon-image: video-games-m.svg;icon-min-distance: 24;} node|z17-[shop=tattoo], -area|z17-[shop=tattoo] {icon-image: craft-m.svg;icon-min-distance: 24;} node|z17-[shop=erotic], -area|z17-[shop=erotic] {icon-image: erotic-m.svg;icon-min-distance: 24;} node|z17-[shop=confectionery], -area|z17-[shop=confectionery], node|z17-[shop=chocolate], -area|z17-[shop=chocolate] {icon-image: confectionery-m.svg;icon-min-distance: 24;} node|z17-[amenity=ice_cream], -area|z17-[amenity=ice_cream] {icon-image: ice_cream-m.svg;icon-min-distance: 24;} node|z17-[shop=convenience], -area|z17-[shop=convenience], node|z17-[shop=deli], -area|z17-[shop=deli], node|z17-[shop=farm], -area|z17-[shop=farm], node|z17-[shop=grocery], -area|z17-[shop=grocery], node|z17-[shop=health_food], -area|z17-[shop=health_food], {icon-image: convenience-m.svg;icon-min-distance: 24;} node|z17-[shop=copyshop], -area|z17-[shop=copyshop] {icon-image: copyshop-m.svg;icon-min-distance: 24;} node|z17-[shop=camera], -area|z17-[shop=camera] {icon-image: photo-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=photo], -area|z17-[shop=photo] {icon-image: photo-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=pet], -area|z17-[shop=pet] {icon-image: petshop-m.svg;icon-min-distance: 24;} node|z17-[shop=department_store], -area|z17-[shop=department_store] {icon-image: department_store-m.svg;icon-min-distance: 24;} node|z17-[shop=interior_decoration], -area|z17-[shop=interior_decoration] {icon-image: interior_decoration-m.svg;icon-min-distance: 24;} node|z17-[shop=doityourself], -area|z17-[shop=doityourself] {icon-image: doityourself-m.svg;icon-min-distance: 24;} node|z17-[shop=electronics], -area|z17-[shop=electronics] {icon-image: electronics-m.svg;icon-min-distance: 24;} node|z17-[shop=florist], -area|z17-[shop=florist] {icon-image: florist-m.svg;icon-min-distance: 24;} node|z17-[shop=furniture], -area|z17-[shop=furniture], node|z17-[shop=kitchen], -area|z17-[shop=kitchen], {icon-image: furniture-m.svg;icon-min-distance: 24;} node|z17-[shop=garden_centre], -area|z17-[shop=garden_centre] {icon-image: garden_center-m.svg;icon-min-distance: 24;} node|z17-[shop=gift], -area|z17-[shop=gift] {icon-image: gift-m.svg;icon-min-distance: 24;} node|z17-[shop=music], -area|z17-[shop=music], {icon-image: music-m.svg;icon-min-distance: 24;} node|z17-[amenity=studio], {icon-image: studio-m.svg;icon-min-distance: 24;} node|z17-[shop=video], -area|z17-[shop=video] {icon-image: media-m.svg;icon-min-distance: 24;} node|z17-[shop=musical_instrument], -area|z17-[shop=musical_instrument] {icon-image: musical-instrument-m.svg;icon-min-distance: 24;} node|z17-[shop=greengrocer], -area|z17-[shop=greengrocer] {icon-image: greengrocer-m.svg;icon-min-distance: 24;} node|z17-[shop=hairdresser], -area|z17-[shop=hairdresser] {icon-image: hairdresser-m.svg;icon-min-distance: 24;} node|z17-[shop=sewing], -area|z17-[shop=sewing] {icon-image: needle_and_thread-m.svg;icon-min-distance 24;} node|z17-[shop=hardware], -area|z17-[shop=hardware], node|z17-[shop=houseware], -area|z17-[shop=houseware], {icon-image: doityourself-m.svg;icon-min-distance: 24;} node|z17-[shop=jewelry], -area|z17-[shop=jewelry] {icon-image: jewelry-m.svg;icon-min-distance: 24;} node|z17-[shop=kiosk], -area|z17-[shop=kiosk] {icon-image: kiosk-m.svg;icon-min-distance: 24;} node|z17-[shop=laundry], -area|z17-[shop=laundry] {icon-image:laundry-m.svg;icon-min-distance: 24;} node|z17-[shop=dry_cleaning], -area|z17-[shop=dry_cleaning] {icon-image:dry_cleaning-m.svg;icon-min-distance: 24;} node|z17-[shop=mobile_phone], -area|z17-[shop=mobile_phone] {icon-image: mobile_phone-m.svg;icon-min-distance: 24;} node|z17-[shop=optician], -area|z17-[shop=optician] {icon-image: optician-m.svg;icon-min-distance: 24;} node|z17-[shop=outdoor], -area|z17-[shop=outdoor] {icon-image: outdoor-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=seafood], -area|z17-[shop=seafood] {icon-image: seafood-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=shoes], -area|z17-[shop=shoes] {icon-image: shoes-m.svg;icon-min-distance: 24;} node|z17-[shop=sports], -area|z17-[shop=sports] {icon-image: sports-m.svg;icon-min-distance: 24;} node|z17-[shop=ticket], -area|z17-[shop=ticket] {icon-image: ticket-shop-m.svg;icon-min-distance: 24;} node|z17-[shop=toys], -area|z17-[shop=toys] {icon-image: toys-m.svg;icon-min-distance: 24;} node|z17-[shop=stationery], -area|z17-[shop=stationery] {icon-image: stationery_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=newsagent], -area|z17-[shop=newsagent] {icon-image: newsagent_shop-m.svg;icon-min-distance: 24;} node|z17-[shop=variety_store], -area|z17-[shop=variety_store], {icon-image: shop-m.svg;} node|z17-[shop=massage], -area|z17-[shop=massage], {icon-image: public_bath-m.svg;icon-min-distance: 24;} node|z17-[shop=money_lender], -area|z17-[shop=money_lender], {icon-image: bank-m.svg;icon-min-distance: 24;} -area|z17-[shop=pawnbroker], node|z17-[shop=pawnbroker], {icon-image: bookmaker-m.svg;icon-min-distance: 24;} node|z17-[shop=rental], -area|z17-[shop=rental] {icon-image: rental-m.svg;icon-min-distance: 24;} node|z17-[shop=rental][rental=bike], -area|z17-[shop=rental][rental=bike], {icon-image: shop-rental-bicycle-m.svg;icon-min-distance: 24;} node|z18-[shop=auction], {icon-image: auction-m.svg;} @@ -2537,36 +1847,27 @@ node|z18-[shop=bookmaker], node|z18-[shop=wholesale], {icon-image: wholesale-m.svg;} node|z18-[shop=tobacco], -area|z18-[shop=tobacco], {icon-image: tobacco-m.svg;icon-min-distance: 24;} /* 6.1 Craft */ node|z17-[craft=beekeeper], -area|z17-[craft=beekeeper] {icon-image:beekeeper-m.svg;} node|z17-[craft=blacksmith], -area|z17-[craft=blacksmith] {icon-image:blacksmith-m.svg;} node|z17-[craft=brewery], -area|z17-[craft=brewery] {icon-image:brewery-m.svg;} node|z17-[craft=carpenter], -area|z17-[craft=carpenter] {icon-image:carpenter-m.svg;} node|z17-[craft=caterer], {icon-image:caterer-m.svg;} node|z17-[craft=confectionery], -area|z17-[craft=confectionery] {icon-image:confectionery-m.svg;} node|z17-[craft=electrician], -area|z17-[craft=electrician] {icon-image:electrician-m.svg;} node|z17-[craft=electronics_repair], -area|z17-[craft=electronics_repair] {icon-image:electrician-m.svg;} node|z17-[craft=gardener], -area|z17-[craft=gardener] {icon-image:florist-m.svg;} node|z17-[craft=grinding_mill], {icon-image:grinding_mill-m.svg;} @@ -2579,28 +1880,20 @@ node|z17-[craft=key_cutter], node|z17-[craft=locksmith], {icon-image:key_cutter-m.svg;} node|z17-[craft=painter], -area|z17-[craft=painter] {icon-image:painter-m.svg;} node|z17-[craft=photographer], -area|z17-[craft=photographer] {icon-image:photo-shop-m.svg;} node|z17-[craft=plumber], -area|z17-[craft=plumber] {icon-image:plumber-m.svg;} node|z17-[craft=sawmill], -area|z17-[craft=sawmill] {icon-image:sawmill-m.svg;} node|z17-[craft=shoemaker], -area|z17-[craft=shoemaker] {icon-image:shoes-m.svg;} node|z17-[craft=tailor], -area|z17-[craft=tailor] {icon-image:clothes-m.svg;} node|z17-[craft=metal_construction], -area|z17-[craft=metal_construction] {icon-image:metal_construction-m.svg;} node|z17-[craft=winery], -area|z17-[craft=winery], {icon-image:winery-m.svg;} /* 7. CAR */ @@ -2610,59 +1903,39 @@ area|z15-[highway=rest_area], {text-position: center;} node|z14-[amenity=fuel], -area|z14-[amenity=fuel], node|z14-[amenity=charging_station][motorcar?], -area|z14-[amenity=charging_station][motorcar?], area|z14-[highway=services], area|z15-[highway=rest_area], node|z15-[amenity=sanitary_dump_station], -area|z15-[amenity=sanitary_dump_station], node|z16-[amenity=charging_station], -area|z16-[amenity=charging_station], node|z17-[amenity=bicycle_parking], -area|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], -area|z17-[amenity=motorcycle_parking], node|z17-[amenity=car_wash], -area|z17-[amenity=car_wash], node|z18-[amenity=parking], -area|z18-[amenity=parking], node|z18-[amenity=car_rental], -area|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], -area|z18-[amenity=car_sharing] {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} node|z14[amenity=fuel], -area|z14[amenity=fuel] {icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} node|z15[amenity=fuel], -area|z15[amenity=fuel] {icon-image: fuel-m.svg; icon-min-distance: 20;} node|z16[amenity=fuel], -area|z16[amenity=fuel] {icon-image: fuel-m.svg; icon-min-distance: 10;} node|z17-[amenity=fuel], -area|z17-[amenity=fuel] {icon-image: fuel-m.svg;} node|z18-[amenity=fuel], -area|z18-[amenity=fuel] {font-size: 11;} node|z14[amenity=charging_station][motorcar?], -area|z14[amenity=charging_station][motorcar?], {icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 20;} node|z15[amenity=charging_station][motorcar?], -area|z15[amenity=charging_station][motorcar?], {icon-image: charging-station-m.svg;icon-min-distance: 20;} node|z16[amenity=charging_station], -area|z16[amenity=charging_station] {icon-image: charging-station-m.svg;icon-min-distance: 10;} node|z17-[amenity=charging_station], -area|z17-[amenity=charging_station] {icon-image: charging-station-m.svg;} node|z18-[amenity=charging_station], -area|z18-[amenity=charging_station] {font-size: 11;} area|z14[highway=services], @@ -2680,112 +1953,81 @@ area|z18-[highway=rest_area], {font-size: 11;} node|z17-[amenity=car_wash], -area|z17-[amenity=car_wash] {icon-image: car-wash-m.svg;font-size: 11;icon-min-distance: 24;} node|z18-[amenity=car_rental], -area|z18-[amenity=car_rental] {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 11;} node|z18-[amenity=car_sharing], -area|z18-[amenity=car_sharing] {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 11;} node|z15-[amenity=sanitary_dump_station], -area|z15-[amenity=sanitary_dump_station] {icon-image: dump-station-m.svg; icon-min-distance: 20;} node|z18-[amenity=compressed_air], -area|z18-[amenity=compressed_air], {icon-image: compressed_air-m.svg;} /* 7.1 Parking */ node|z16-[amenity=parking], -area|z16-[amenity=parking], {icon-image: parking-s.svg;icon-min-distance: 5;} node|z17-[amenity=parking], -area|z17-[amenity=parking], {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10} node|z16-[amenity=parking][location=underground], -area|z16-[amenity=parking][location=underground], {icon-image:parking_underground-m.svg;} node|z16-[amenity=parking][fee?], -area|z16-[amenity=parking][fee?], {icon-image: parking_pay-s.svg;} node|z17-[amenity=parking][fee?], -area|z17-[amenity=parking][fee?], {icon-image: parking_pay-m.svg;} node|z16-[amenity=parking][location=underground][fee?], -area|z16-[amenity=parking][location=underground][fee?], {icon-image:parking_underground_pay-m.svg;} /* no icon as these subtypes should display later */ node|z16-[amenity=parking][access=private], -area|z16-[amenity=parking][access=private], node|z16-[amenity=parking][parking=street_side], -area|z16-[amenity=parking][parking=street_side], node|z16-[amenity=parking][parking=lane], -area|z16-[amenity=parking][parking=lane], /* =no doesn't work in kothic */ /* node|z16-[amenity=parking][access=no], */ /* area|z16-[amenity=parking][access=no], */ node|z16-[amenity=parking][parking=street_side][fee?], -area|z16-[amenity=parking][parking=street_side][fee?], node|z16-[amenity=parking][parking=lane][fee?], -area|z16-[amenity=parking][parking=lane][fee?], {icon-image: none; icon-min-distance: 0;} node|z18-[amenity=parking][parking=street_side], -area|z18-[amenity=parking][parking=street_side], node|z18-[amenity=parking][parking=lane], -area|z18-[amenity=parking][parking=lane], {icon-image: parking-s.svg;} node|z18-[amenity=parking][parking=street_side][fee?], -area|z18-[amenity=parking][parking=street_side][fee?], node|z18-[amenity=parking][parking=lane][fee?], -area|z18-[amenity=parking][parking=lane][fee?], {icon-image: parking_pay-s.svg;} node|z17-[amenity=parking_entrance], -area|z17-[amenity=parking_entrance], {icon-image: parking_entrance-m.svg;} node|z17-[amenity=parking_entrance][access=private], -area|z17-[amenity=parking_entrance][access=private], {icon-image: none; text: none;} node|z19-[amenity=parking_entrance][access=private], -area|z19-[amenity=parking_entrance][access=private], {icon-image: parking_entrance_private-m.svg; text: name;} node|z18-[amenity=parking][access=private], -area|z18-[amenity=parking][access=private], /* node|z18-[amenity=parking][access=no], */ /* area|z18-[amenity=parking][access=no], */ {icon-image:parking_private-m.svg;} node|z18-[amenity=parking][location=underground][access=private], -area|z18-[amenity=parking][location=underground][access=private], {icon-image:parking_underground_private-m.svg;} node|z18-[amenity=parking][parking=street_side][access=private], -area|z18-[amenity=parking][parking=street_side][access=private], {icon-image: parking_private-s.svg;} node|z18-[amenity=parking][parking=lane][access=private], -area|z18-[amenity=parking][parking=lane][access=private], {icon-image: none; text: none;} node|z19-[amenity=parking][parking=lane][access=private], -area|z19-[amenity=parking][parking=lane][access=private], {icon-image: parking_private-s.svg; text: name;} node|z17-[amenity=bicycle_parking], -area|z17-[amenity=bicycle_parking], {icon-image: bicycle-parking-m.svg;} node|z17-[amenity=motorcycle_parking], -area|z17-[amenity=motorcycle_parking], {icon-image: motorcycle-parking-m.svg;} node|z18-[amenity=parking_space][parking_space=disabled], -area|z18-[amenity=parking_space][parking_space=disabled], {icon-image: parking-disabled-m.svg;} From b465b958544e42db0f5209d70f9fb050ffc62c2f Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Wed, 7 May 2025 22:30:58 +0200 Subject: [PATCH 053/222] [android][sdk] Move everything to .sdk package Signed-off-by: Andrei Shkrob --- .../src/fdroid/java/app/organicmaps/location | 1 - .../fdroid/java/app/organicmaps/sdk/location | 1 + .../location/GoogleFusedLocationProvider.java | 8 +- .../location/LocationProviderFactory.java | 7 +- .../src/huawei/java/app/organicmaps/location | 1 - .../huawei/java/app/organicmaps/sdk/location | 1 + android/app/src/main/cpp/CMakeLists.txt | 112 +++---- .../organicmaps/sdk/ChoosePositionMode.cpp | 4 +- .../DownloadResourcesLegacyActivity.cpp | 8 +- .../app/organicmaps/{ => sdk}/Framework.cpp | 242 ++++++++-------- .../app/organicmaps/{ => sdk}/Framework.hpp | 0 .../organicmaps/{ => sdk}/LocationState.cpp | 16 +- .../cpp/app/organicmaps/{ => sdk}/Map.cpp | 50 ++-- .../app/organicmaps/{ => sdk}/MapManager.cpp | 70 ++--- .../main/cpp/app/organicmaps/sdk/MapStyle.cpp | 4 +- .../cpp/app/organicmaps/sdk/OrganicMaps.cpp | 6 +- .../main/cpp/app/organicmaps/sdk/Router.cpp | 4 +- .../organicmaps/{ => sdk}/TrackRecorder.cpp | 14 +- .../organicmaps/{ => sdk}/TrafficState.cpp | 14 +- .../organicmaps/{ => sdk}/UserMarkHelper.cpp | 10 +- .../organicmaps/{ => sdk}/UserMarkHelper.hpp | 4 +- .../bookmarks/data/BookmarkManager.cpp | 160 +++++----- .../organicmaps/{ => sdk}/core/ScopedEnv.hpp | 0 .../{ => sdk}/core/ScopedLocalRef.hpp | 0 .../organicmaps/{ => sdk}/core/jni_helper.cpp | 24 +- .../organicmaps/{ => sdk}/core/jni_helper.hpp | 0 .../{ => sdk}/core/jni_java_methods.cpp | 0 .../{ => sdk}/core/jni_java_methods.hpp | 0 .../organicmaps/{ => sdk}/core/logging.cpp | 6 +- .../organicmaps/{ => sdk}/core/logging.hpp | 0 .../{ => sdk}/core/render_context.cpp | 0 .../{ => sdk}/core/render_context.hpp | 0 .../organicmaps/{ => sdk}/editor/Editor.cpp | 122 ++++---- .../{ => sdk}/editor/OpeningHours.cpp | 48 +-- .../organicmaps/{ => sdk}/editor/OsmOAuth.cpp | 20 +- .../{ => sdk}/isolines/IsolinesManager.cpp | 12 +- .../{ => sdk}/opengl/android_gl_utils.cpp | 0 .../{ => sdk}/opengl/android_gl_utils.hpp | 0 .../{ => sdk}/opengl/androidoglcontext.cpp | 0 .../{ => sdk}/opengl/androidoglcontext.hpp | 0 .../opengl/androidoglcontextfactory.cpp | 2 +- .../opengl/androidoglcontextfactory.hpp | 2 +- .../organicmaps/{ => sdk}/opengl/gl3stub.cpp | 0 .../organicmaps/{ => sdk}/opengl/gl3stub.h | 0 .../{ => sdk}/platform/AndroidPlatform.cpp | 18 +- .../{ => sdk}/platform/AndroidPlatform.hpp | 0 .../{ => sdk}/platform/GuiThread.cpp | 6 +- .../{ => sdk}/platform/GuiThread.hpp | 0 .../{ => sdk}/platform/HttpThread.cpp | 8 +- .../{ => sdk}/platform/Language.cpp | 6 +- .../{ => sdk}/platform/Localization.cpp | 6 +- .../{ => sdk}/platform/PThreadImpl.cpp | 2 +- .../{ => sdk}/platform/SecureStorage.cpp | 0 .../{ => sdk}/platform/SocketImpl.cpp | 2 +- .../organicmaps/sdk/routing/JunctionInfo.hpp | 2 +- .../organicmaps/sdk/routing/RouteMarkData.hpp | 2 +- .../sdk/routing/RoutePointInfo.hpp | 2 +- .../sdk/routing/RouteRecommendationType.hpp | 2 +- .../organicmaps/sdk/routing/RoutingInfo.hpp | 4 +- .../sdk/routing/RoutingOptions.cpp | 4 +- .../sdk/routing/SingleLaneInfo.hpp | 2 +- .../sdk/routing/TransitRouteInfo.hpp | 2 +- .../sdk/routing/TransitStepInfo.hpp | 2 +- .../sdk/search/DisplayedCategories.cpp | 4 +- .../organicmaps/sdk/search/SearchEngine.cpp | 12 +- .../organicmaps/sdk/search/SearchRecents.cpp | 6 +- .../{ => sdk}/settings/MapLanguageCode.cpp | 6 +- .../{ => sdk}/settings/UnitLocale.cpp | 6 +- .../app/organicmaps/{ => sdk}/sound/tts.cpp | 12 +- .../{ => sdk}/subway/SubwayManager.cpp | 10 +- .../app/organicmaps/{ => sdk}/util/Config.cpp | 36 +-- .../organicmaps/{ => sdk}/util/Distance.hpp | 4 +- .../{ => sdk}/util/FeatureIdBuilder.hpp | 4 +- .../organicmaps/{ => sdk}/util/GeoUtils.cpp | 4 +- .../organicmaps/{ => sdk}/util/HttpClient.cpp | 10 +- .../organicmaps/{ => sdk}/util/Language.cpp | 4 +- .../{ => sdk}/util/LogsManager.cpp | 4 +- .../{ => sdk}/util/NetworkPolicy.cpp | 2 +- .../{ => sdk}/util/NetworkPolicy.hpp | 0 .../{ => sdk}/util/StringUtils.cpp | 24 +- .../cpp/app/organicmaps/sdk/util/UiThread.cpp | 12 + .../vulkan/android_vulkan_context_factory.cpp | 2 +- .../vulkan/android_vulkan_context_factory.hpp | 2 +- .../cpp/app/organicmaps/util/UiThread.cpp | 12 - .../java/app/organicmaps/ChartController.java | 5 +- .../DownloadResourcesLegacyActivity.java | 61 ++-- .../java/app/organicmaps/MapFragment.java | 6 +- .../organicmaps/MapPlaceholderActivity.java | 6 +- .../java/app/organicmaps/MwmActivity.java | 98 +++---- .../java/app/organicmaps/MwmApplication.java | 59 ++-- .../java/app/organicmaps/PanelAnimator.java | 2 +- .../java/app/organicmaps/SplashActivity.java | 12 +- .../app/organicmaps/WebContainerDelegate.java | 2 +- .../organicmaps/background/OsmUploadWork.java | 6 +- .../base/BaseMwmFragmentActivity.java | 6 +- .../base/BaseMwmRecyclerFragment.java | 2 +- .../organicmaps/base/BaseToolbarActivity.java | 2 +- .../BaseBookmarkCategoryAdapter.java | 2 +- .../bookmarks/BookmarkCategoriesActivity.java | 4 +- .../bookmarks/BookmarkCategoriesAdapter.java | 4 +- .../bookmarks/BookmarkCategoriesFragment.java | 16 +- .../BookmarkCategorySettingsActivity.java | 2 +- .../BookmarkCategorySettingsFragment.java | 4 +- .../bookmarks/BookmarkCollectionAdapter.java | 6 +- .../bookmarks/BookmarkListActivity.java | 4 +- .../bookmarks/BookmarkListAdapter.java | 12 +- .../bookmarks/BookmarksListFragment.java | 26 +- .../bookmarks/BookmarksSharingHelper.java | 10 +- .../bookmarks/CategoryValidator.java | 2 +- .../ChooseBookmarkCategoryAdapter.java | 2 +- .../ChooseBookmarkCategoryFragment.java | 4 +- .../ChooseBookmarksSortingTypeFragment.java | 4 +- .../app/organicmaps/bookmarks/Holders.java | 16 +- .../organicmaps/bookmarks/IconsAdapter.java | 2 +- .../bookmarks/OperationStatus.java | 4 +- .../app/organicmaps/car/CarAppSession.java | 20 +- .../app/organicmaps/car/SurfaceRenderer.java | 16 +- .../car/screens/MapPlaceholderScreen.java | 4 +- .../car/screens/NavigationScreen.java | 21 +- .../organicmaps/car/screens/PlaceScreen.java | 12 +- .../bookmarks/BookmarkCategoriesScreen.java | 4 +- .../screens/bookmarks/BookmarksLoader.java | 22 +- .../screens/bookmarks/BookmarksScreen.java | 2 +- .../car/screens/bookmarks/SortingScreen.java | 8 +- .../DownloadMapsForFirstLaunchScreen.java | 8 +- .../screens/download/DownloadMapsScreen.java | 4 +- .../screens/download/DownloaderHelpers.java | 2 +- .../screens/download/DownloaderScreen.java | 8 +- .../RequestPermissionsActivity.java | 2 +- .../RequestPermissionsScreenBuilder.java | 2 +- .../RequestPermissionsScreenWithApi.java | 2 +- ...uestPermissionsScreenWithNotification.java | 6 +- .../car/screens/search/SearchOnMapScreen.java | 8 +- .../car/screens/search/SearchScreen.java | 8 +- .../settings/DrivingOptionsScreen.java | 2 +- .../car/screens/settings/HelpScreen.java | 4 +- .../car/screens/settings/SettingsScreen.java | 4 +- .../car/util/CarSensorsManager.java | 19 +- .../util/CurrentCountryChangedListener.java | 4 +- .../app/organicmaps/car/util/IntentUtils.java | 14 +- .../organicmaps/car/util/RoutingHelpers.java | 2 +- .../organicmaps/car/util/RoutingUtils.java | 7 +- .../app/organicmaps/car/util/ThemeUtils.java | 1 - .../app/organicmaps/car/util/UiHelpers.java | 19 +- .../dialog/EditTextDialogFragment.java | 2 +- .../Android7RootCertificateWorkaround.java | 2 +- .../organicmaps/downloader/BottomPanel.java | 21 +- .../downloader/CountrySuggestFragment.java | 10 +- .../downloader/DownloaderAdapter.java | 10 +- .../downloader/DownloaderFragment.java | 4 +- .../downloader/DownloaderInsetsListener.java | 2 +- .../downloader/DownloaderNotifier.java | 5 +- .../downloader/DownloaderService.java | 4 +- .../downloader/DownloaderStatusIcon.java | 3 +- .../DownloaderToolbarController.java | 2 +- .../downloader/OnmapDownloader.java | 14 +- .../editor/AdvancedTimetableFragment.java | 5 +- .../organicmaps/editor/CuisineAdapter.java | 1 + .../organicmaps/editor/EditorFragment.java | 20 +- .../editor/EditorHostFragment.java | 14 +- .../editor/FeatureCategoryActivity.java | 3 +- .../editor/FeatureCategoryAdapter.java | 4 +- .../editor/FeatureCategoryFragment.java | 9 +- .../editor/HoursMinutesPickerFragment.java | 4 +- .../organicmaps/editor/LanguagesAdapter.java | 2 +- .../organicmaps/editor/LanguagesFragment.java | 3 +- .../editor/MultilanguageAdapter.java | 9 +- .../organicmaps/editor/OsmLoginFragment.java | 13 +- .../organicmaps/editor/PhoneListAdapter.java | 5 +- .../organicmaps/editor/ProfileFragment.java | 7 +- .../organicmaps/editor/ReportFragment.java | 3 +- .../editor/SelfServiceAdapter.java | 2 +- .../editor/SelfServiceFragment.java | 3 +- .../editor/SimpleTimetableAdapter.java | 11 +- .../editor/SimpleTimetableFragment.java | 2 +- .../app/organicmaps/editor/StreetAdapter.java | 4 +- .../organicmaps/editor/StreetFragment.java | 3 +- .../editor/TimetableContainerFragment.java | 3 +- .../organicmaps/help/CopyrightFragment.java | 2 +- .../app/organicmaps/help/FaqFragment.java | 2 +- .../app/organicmaps/help/HelpFragment.java | 8 +- .../java/app/organicmaps/intent/Factory.java | 22 +- .../location/TrackRecordingService.java | 13 +- .../maplayer/LayerBottomSheetItem.java | 1 + .../organicmaps/maplayer/LayersAdapter.java | 4 +- .../app/organicmaps/maplayer/LayersUtils.java | 2 + .../maplayer/MapButtonsController.java | 18 +- .../maplayer/MapButtonsViewModel.java | 2 +- .../app/organicmaps/maplayer/SearchWheel.java | 4 +- .../maplayer/ToggleMapLayerFragment.java | 8 +- .../traffic/widget/TrafficButton.java | 2 +- .../widget/TrafficButtonController.java | 2 +- .../BaseRoutingErrorDialogFragment.java | 6 +- .../routing/ManageRouteAdapter.java | 6 +- .../routing/ManageRouteBottomSheet.java | 6 +- .../routing/NavigationController.java | 12 +- .../routing/NavigationService.java | 24 +- .../routing/ResultCodesHelper.java | 69 ++--- .../routing/RoutingBottomMenuController.java | 12 +- .../routing/RoutingController.java | 25 +- .../routing/RoutingErrorDialogFragment.java | 6 +- .../routing/RoutingMapsDownloadFragment.java | 6 +- .../routing/RoutingPlanController.java | 4 +- .../routing/RoutingPlanInplaceController.java | 2 +- .../sdk/DownloadResourcesLegacyActivity.java | 30 ++ .../app/organicmaps/{ => sdk}/Framework.java | 21 +- .../java/app/organicmaps/{ => sdk}/Map.java | 23 +- .../{ => sdk}/MapRenderingListener.java | 2 +- .../java/app/organicmaps/sdk/OrganicMaps.java | 67 ++++- .../sdk/PlacePageActivationListener.java | 2 +- .../{ => sdk}/api/ParsedRoutingData.java | 2 +- .../{ => sdk}/api/ParsedSearchRequest.java | 2 +- .../{ => sdk}/api/RequestType.java | 2 +- .../organicmaps/{ => sdk}/api/RoutePoint.java | 2 +- .../{ => sdk}/bookmarks/data/Bookmark.java | 6 +- .../data/BookmarkCategoriesDataProvider.java | 2 +- .../bookmarks/data/BookmarkCategory.java | 2 +- .../bookmarks/data/BookmarkInfo.java | 8 +- .../bookmarks/data/BookmarkManager.java | 12 +- .../bookmarks/data/BookmarkSharingResult.java | 2 +- .../CacheBookmarkCategoriesDataProvider.java | 2 +- .../bookmarks/data/CategoryDataSource.java | 4 +- .../CoreBookmarkCategoriesDataProvider.java | 2 +- .../bookmarks/data/DistanceAndAzimut.java | 4 +- .../bookmarks/data/ElevationInfo.java | 4 +- .../{ => sdk}/bookmarks/data/Error.java | 2 +- .../{ => sdk}/bookmarks/data/FeatureId.java | 2 +- .../{ => sdk}/bookmarks/data/Icon.java | 2 +- .../bookmarks/data/IconClickListener.java | 2 +- .../{ => sdk}/bookmarks/data/KmlFileType.java | 2 +- .../{ => sdk}/bookmarks/data/MapObject.java | 4 +- .../{ => sdk}/bookmarks/data/Metadata.java | 2 +- .../bookmarks/data/ParcelablePointD.java | 2 +- .../{ => sdk}/bookmarks/data/Result.java | 2 +- .../bookmarks/data/RoadWarningMarkType.java | 2 +- .../{ => sdk}/bookmarks/data/SortedBlock.java | 2 +- .../{ => sdk}/bookmarks/data/Track.java | 4 +- .../{ => sdk}/content/DataSource.java | 2 +- .../display/DisplayChangedListener.java | 2 +- .../{ => sdk}/display/DisplayManager.java | 4 +- .../{ => sdk}/display/DisplayType.java | 2 +- .../{ => sdk}/downloader/ChunkTask.java | 9 +- .../{ => sdk}/downloader/CountryItem.java | 16 +- .../ExpandRetryConfirmationListener.java | 2 +- .../{ => sdk}/downloader/MapManager.java | 11 +- .../{ => sdk}/downloader/UpdateInfo.java | 2 +- .../organicmaps/{ => sdk}/editor/Editor.java | 16 +- .../{ => sdk}/editor/OpeningHours.java | 6 +- .../{ => sdk}/editor/OsmOAuth.java | 4 +- .../editor/data/FeatureCategory.java | 2 +- .../{ => sdk}/editor/data/HoursMinutes.java | 4 +- .../{ => sdk}/editor/data/Language.java | 2 +- .../{ => sdk}/editor/data/LocalizedName.java | 2 +- .../editor/data/LocalizedStreet.java | 2 +- .../editor/data/NamesDataSource.java | 2 +- .../editor/data/TimeFormatUtils.java | 2 +- .../{ => sdk}/editor/data/Timespan.java | 2 +- .../{ => sdk}/editor/data/Timetable.java | 2 +- .../location/AndroidNativeProvider.java | 9 +- .../location/BaseLocationProvider.java | 2 +- .../{ => sdk}/location/LocationHelper.java | 28 +- .../{ => sdk}/location/LocationListener.java | 2 +- .../{ => sdk}/location/LocationState.java | 4 +- .../{ => sdk}/location/PlatformSocket.java | 4 +- .../location/RouteSimulationProvider.java | 8 +- .../{ => sdk}/location/SensorHelper.java | 13 +- .../{ => sdk}/location/SensorListener.java | 2 +- .../{ => sdk}/location/TrackRecorder.java | 2 +- .../organicmaps/{ => sdk}/maplayer/Mode.java | 14 +- .../isolines/IsolinesErrorDialogListener.java | 2 +- .../maplayer/isolines/IsolinesManager.java | 17 +- .../maplayer/isolines/IsolinesState.java | 2 +- .../isolines/OnIsolinesChangedListener.java | 12 +- .../OnTransitSchemeChangedListener.java | 8 +- .../maplayer/subway/SubwayManager.java | 16 +- .../maplayer/subway/TransitSchemeState.java | 2 +- .../maplayer/traffic/TrafficManager.java | 4 +- .../maplayer/traffic/TrafficState.java | 2 +- .../organicmaps/sdk/routing/ResultCodes.java | 23 ++ .../organicmaps/sdk/routing/RoutingInfo.java | 2 +- .../sdk/routing/RoutingOptions.java | 2 +- .../organicmaps/sdk/search/SearchEngine.java | 6 +- .../organicmaps/sdk/search/SearchRecents.java | 2 +- .../organicmaps/sdk/search/SearchResult.java | 4 +- .../{ => sdk}/settings/MapLanguageCode.java | 2 +- .../{ => sdk}/settings/RoadType.java | 2 +- .../sdk/settings/SpeedCameraMode.java | 8 + .../{ => sdk}/settings/UnitLocale.java | 2 +- .../{ => sdk}/sound/AudioFocusManager.java | 2 +- .../{ => sdk}/sound/LanguageData.java | 2 +- .../{ => sdk}/sound/MediaPlayerWrapper.java | 2 +- .../{ => sdk}/sound/TtsPlayer.java | 11 +- .../{ => sdk}/util/BatteryState.java | 2 +- .../util/ClientCertTLSSocketFactory.java | 4 +- .../organicmaps/{ => sdk}/util/Config.java | 3 +- .../{ => sdk}/util/ConnectionState.java | 4 +- .../organicmaps/{ => sdk}/util/Constants.java | 2 +- .../organicmaps/{ => sdk}/util/DateUtils.java | 2 +- .../organicmaps/{ => sdk}/util/Distance.java | 2 +- .../organicmaps/{ => sdk}/util/GeoUtils.java | 4 +- .../{ => sdk}/util/HttpClient.java | 5 +- .../organicmaps/{ => sdk}/util/KeyValue.java | 4 +- .../organicmaps/{ => sdk}/util/Language.java | 2 +- .../{ => sdk}/util/LocationUtils.java | 2 +- .../{ => sdk}/util/NetworkPolicy.java | 2 +- .../{ => sdk}/util/PowerManagment.java | 9 +- .../organicmaps/{ => sdk}/util/ROMUtils.java | 2 +- .../{ => sdk}/util/SecureStorage.java | 4 +- .../{ => sdk}/util/SharedPropertiesUtils.java | 6 +- .../{ => sdk}/util/StorageUtils.java | 5 +- .../{ => sdk}/util/StringUtils.java | 2 +- .../{ => sdk}/util/ThemeSwitcher.java | 13 +- .../organicmaps/{ => sdk}/util/UiUtils.java | 9 +- .../java/app/organicmaps/sdk/util/Utils.java | 274 ++++++++++++++++++ .../util/concurrency/ThreadPool.java | 2 +- .../{ => sdk}/util/concurrency/UiThread.java | 2 +- .../{ => sdk}/util/log/Logger.java | 2 +- .../{ => sdk}/util/log/LogsManager.java | 6 +- .../{ => sdk}/util/log/ZipLogsTask.java | 2 +- .../placepage/PlacePageButtonFactory.java | 6 + .../widget/placepage/PlacePageData.java | 2 +- .../organicmaps/search/CategoriesAdapter.java | 2 +- .../FloatingSearchToolbarController.java | 2 +- .../app/organicmaps/search/SearchAdapter.java | 2 +- .../organicmaps/search/SearchFragment.java | 28 +- .../search/SearchHistoryAdapter.java | 4 +- .../search/SearchHistoryFragment.java | 6 +- .../app/organicmaps/search/TabAdapter.java | 2 +- .../settings/DrivingOptionsFragment.java | 1 + .../settings/SettingsPrefsFragment.java | 36 +-- .../settings/StoragePathAdapter.java | 2 +- .../settings/StoragePathFragment.java | 10 +- .../settings/StoragePathManager.java | 10 +- .../VoiceInstructionsSettingsFragment.java | 15 +- .../java/app/organicmaps/util/InputUtils.java | 2 +- .../app/organicmaps/util/SharingUtils.java | 10 +- .../java/app/organicmaps/util/ThemeUtils.java | 1 + .../main/java/app/organicmaps/util/Utils.java | 259 +---------------- .../organicmaps/util/WindowInsetUtils.java | 1 + .../util/bottomsheet/MenuAdapter.java | 3 +- .../bottomsheet/MenuBottomSheetFragment.java | 2 +- .../organicmaps/widget/PlaceholderView.java | 2 +- .../widget/SearchToolbarController.java | 4 +- .../widget/StackedButtonDialogFragment.java | 4 +- .../widget/StackedButtonsDialog.java | 2 +- .../organicmaps/widget/ToolbarController.java | 2 +- .../app/organicmaps/widget/menu/MainMenu.java | 2 +- .../widget/menu/MyPositionButton.java | 6 +- .../app/organicmaps/widget/menu/NavMenu.java | 11 +- .../widget/placepage/AxisValueFormatter.java | 2 +- .../BookmarkColorDialogFragment.java | 4 +- .../widget/placepage/DirectionFragment.java | 27 +- .../placepage/EditBookmarkFragment.java | 12 +- .../ElevationProfileViewRenderer.java | 7 +- .../widget/placepage/FloatingMarkerView.java | 4 +- .../placepage/PlacePageButtonFactory.java | 5 +- .../widget/placepage/PlacePageController.java | 14 +- .../widget/placepage/PlacePageUtils.java | 4 +- .../widget/placepage/PlacePageView.java | 55 ++-- .../widget/placepage/PlacePageViewModel.java | 2 +- .../sections/PlaceOpeningHoursAdapter.java | 10 +- .../sections/PlacePageBookmarkFragment.java | 10 +- .../sections/PlacePageLinksFragment.java | 6 +- .../PlacePageOpeningHoursFragment.java | 14 +- .../sections/PlacePagePhoneFragment.java | 4 +- .../sections/PlacePageWikipediaFragment.java | 6 +- .../PlaceOpeningHoursAdapterTest.java | 6 +- .../app/src/web/java/app/organicmaps/location | 1 - .../src/web/java/app/organicmaps/sdk/location | 1 + drape/gl_includes.hpp | 2 +- 370 files changed, 1998 insertions(+), 1883 deletions(-) delete mode 120000 android/app/src/fdroid/java/app/organicmaps/location create mode 120000 android/app/src/fdroid/java/app/organicmaps/sdk/location rename android/app/src/google/java/app/organicmaps/{ => sdk}/location/GoogleFusedLocationProvider.java (97%) rename android/app/src/google/java/app/organicmaps/{ => sdk}/location/LocationProviderFactory.java (88%) delete mode 120000 android/app/src/huawei/java/app/organicmaps/location create mode 120000 android/app/src/huawei/java/app/organicmaps/sdk/location rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/DownloadResourcesLegacyActivity.cpp (92%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/Framework.cpp (82%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/Framework.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/LocationState.cpp (77%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/Map.cpp (67%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/MapManager.cpp (83%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/TrackRecorder.cpp (53%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/TrafficState.cpp (63%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/UserMarkHelper.cpp (96%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/UserMarkHelper.hpp (94%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkManager.cpp (81%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/ScopedEnv.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/ScopedLocalRef.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/jni_helper.cpp (94%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/jni_helper.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/jni_java_methods.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/jni_java_methods.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/logging.cpp (91%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/logging.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/render_context.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/core/render_context.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/editor/Editor.cpp (76%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/editor/OpeningHours.cpp (86%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/editor/OsmOAuth.cpp (73%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/isolines/IsolinesManager.cpp (71%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/android_gl_utils.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/android_gl_utils.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/androidoglcontext.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/androidoglcontext.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/androidoglcontextfactory.cpp (99%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/androidoglcontextfactory.hpp (96%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/gl3stub.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/opengl/gl3stub.h (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/AndroidPlatform.cpp (93%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/AndroidPlatform.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/GuiThread.cpp (83%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/GuiThread.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/HttpThread.cpp (89%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/Language.cpp (93%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/Localization.cpp (94%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/PThreadImpl.cpp (82%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/SecureStorage.cpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/platform/SocketImpl.cpp (98%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/settings/MapLanguageCode.cpp (54%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/settings/UnitLocale.cpp (67%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/sound/tts.cpp (51%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/subway/SubwayManager.cpp (70%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/Config.cpp (56%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/Distance.hpp (85%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/FeatureIdBuilder.hpp (85%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/GeoUtils.cpp (75%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/HttpClient.cpp (96%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/Language.cpp (54%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/LogsManager.cpp (57%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/NetworkPolicy.cpp (91%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/NetworkPolicy.hpp (100%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/util/StringUtils.cpp (66%) create mode 100644 android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/vulkan/android_vulkan_context_factory.cpp (98%) rename android/app/src/main/cpp/app/organicmaps/{ => sdk}/vulkan/android_vulkan_context_factory.hpp (93%) delete mode 100644 android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp create mode 100644 android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java rename android/app/src/main/java/app/organicmaps/{ => sdk}/Framework.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/Map.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/MapRenderingListener.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/api/ParsedRoutingData.java (93%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/api/ParsedSearchRequest.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/api/RequestType.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/api/RoutePoint.java (91%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Bookmark.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkCategoriesDataProvider.java (88%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkCategory.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkInfo.java (93%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkManager.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/BookmarkSharingResult.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/CacheBookmarkCategoriesDataProvider.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/CategoryDataSource.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/CoreBookmarkCategoriesDataProvider.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/DistanceAndAzimut.java (83%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/ElevationInfo.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Error.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/FeatureId.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Icon.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/IconClickListener.java (78%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/KmlFileType.java (73%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/MapObject.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Metadata.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/ParcelablePointD.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Result.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/RoadWarningMarkType.java (62%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/SortedBlock.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/bookmarks/data/Track.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/content/DataSource.java (76%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/display/DisplayChangedListener.java (87%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/display/DisplayManager.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/display/DisplayType.java (54%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/downloader/ChunkTask.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/downloader/CountryItem.java (92%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/downloader/ExpandRetryConfirmationListener.java (92%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/downloader/MapManager.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/downloader/UpdateInfo.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/Editor.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/OpeningHours.java (93%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/OsmOAuth.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/FeatureCategory.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/HoursMinutes.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/Language.java (92%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/LocalizedName.java (92%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/LocalizedStreet.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/NamesDataSource.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/TimeFormatUtils.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/Timespan.java (91%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/editor/data/Timetable.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/AndroidNativeProvider.java (93%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/BaseLocationProvider.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/LocationHelper.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/LocationListener.java (91%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/LocationState.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/PlatformSocket.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/RouteSimulationProvider.java (89%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/SensorHelper.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/SensorListener.java (85%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/location/TrackRecorder.java (90%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/Mode.java (84%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/isolines/IsolinesErrorDialogListener.java (74%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/isolines/IsolinesManager.java (70%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/isolines/IsolinesState.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/isolines/OnIsolinesChangedListener.java (72%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/subway/OnTransitSchemeChangedListener.java (78%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/subway/SubwayManager.java (68%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/subway/TransitSchemeState.java (91%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/traffic/TrafficManager.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/maplayer/traffic/TrafficState.java (98%) create mode 100644 android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java rename android/app/src/main/java/app/organicmaps/{ => sdk}/settings/MapLanguageCode.java (79%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/settings/RoadType.java (65%) create mode 100644 android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java rename android/app/src/main/java/app/organicmaps/{ => sdk}/settings/UnitLocale.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/sound/AudioFocusManager.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/sound/LanguageData.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/sound/MediaPlayerWrapper.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/sound/TtsPlayer.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/BatteryState.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/ClientCertTLSSocketFactory.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/Config.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/ConnectionState.java (96%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/Constants.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/DateUtils.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/Distance.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/GeoUtils.java (75%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/HttpClient.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/KeyValue.java (89%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/Language.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/LocationUtils.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/NetworkPolicy.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/PowerManagment.java (92%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/ROMUtils.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/SecureStorage.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/SharedPropertiesUtils.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/StorageUtils.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/StringUtils.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/ThemeSwitcher.java (94%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/UiUtils.java (98%) create mode 100644 android/app/src/main/java/app/organicmaps/sdk/util/Utils.java rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/concurrency/ThreadPool.java (95%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/concurrency/UiThread.java (97%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/log/Logger.java (99%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/log/LogsManager.java (98%) rename android/app/src/main/java/app/organicmaps/{ => sdk}/util/log/ZipLogsTask.java (99%) create mode 100644 android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java rename android/app/src/main/java/app/organicmaps/{ => sdk}/widget/placepage/PlacePageData.java (78%) delete mode 120000 android/app/src/web/java/app/organicmaps/location create mode 120000 android/app/src/web/java/app/organicmaps/sdk/location diff --git a/android/app/src/fdroid/java/app/organicmaps/location b/android/app/src/fdroid/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/fdroid/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/fdroid/java/app/organicmaps/sdk/location b/android/app/src/fdroid/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/fdroid/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java b/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java similarity index 97% rename from android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java rename to android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java index f33db2a8d..500de1d3b 100644 --- a/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java +++ b/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java @@ -1,8 +1,8 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static app.organicmaps.util.concurrency.UiThread.runLater; +import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; import android.app.PendingIntent; import android.content.Context; @@ -26,8 +26,8 @@ import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.location.Priority; import com.google.android.gms.location.SettingsClient; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; class GoogleFusedLocationProvider extends BaseLocationProvider { diff --git a/android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java b/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java similarity index 88% rename from android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java rename to android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java index 5b802eb03..7232f118e 100644 --- a/android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java +++ b/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java @@ -1,12 +1,13 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import androidx.annotation.NonNull; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -import app.organicmaps.util.Config; -import app.organicmaps.util.log.Logger; + +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.log.Logger; public class LocationProviderFactory { diff --git a/android/app/src/huawei/java/app/organicmaps/location b/android/app/src/huawei/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/huawei/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/huawei/java/app/organicmaps/sdk/location b/android/app/src/huawei/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/huawei/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt index 2aa64f470..770e2682a 100644 --- a/android/app/src/main/cpp/CMakeLists.txt +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -5,21 +5,21 @@ project(organicmaps C CXX) set(SRC # JNI headers ../../../../../private.h - app/organicmaps/core/jni_helper.hpp - app/organicmaps/core/jni_java_methods.hpp - app/organicmaps/core/logging.hpp - app/organicmaps/core/ScopedEnv.hpp - app/organicmaps/core/ScopedLocalRef.hpp - app/organicmaps/Framework.hpp - app/organicmaps/opengl/android_gl_utils.hpp - app/organicmaps/opengl/androidoglcontext.hpp - app/organicmaps/opengl/androidoglcontextfactory.hpp - app/organicmaps/opengl/gl3stub.h - app/organicmaps/platform/GuiThread.hpp - app/organicmaps/platform/AndroidPlatform.hpp - app/organicmaps/util/Distance.hpp - app/organicmaps/util/FeatureIdBuilder.hpp - app/organicmaps/vulkan/android_vulkan_context_factory.hpp + app/organicmaps/sdk/core/jni_helper.hpp + app/organicmaps/sdk/core/jni_java_methods.hpp + app/organicmaps/sdk/core/logging.hpp + app/organicmaps/sdk/core/ScopedEnv.hpp + app/organicmaps/sdk/core/ScopedLocalRef.hpp + app/organicmaps/sdk/Framework.hpp + app/organicmaps/sdk/opengl/android_gl_utils.hpp + app/organicmaps/sdk/opengl/androidoglcontext.hpp + app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp + app/organicmaps/sdk/opengl/gl3stub.h + app/organicmaps/sdk/platform/GuiThread.hpp + app/organicmaps/sdk/platform/AndroidPlatform.hpp + app/organicmaps/sdk/util/Distance.hpp + app/organicmaps/sdk/util/FeatureIdBuilder.hpp + app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp # JNI sources app/organicmaps/sdk/search/DisplayedCategories.cpp @@ -39,47 +39,47 @@ set(SRC app/organicmaps/sdk/MapStyle.cpp app/organicmaps/sdk/OrganicMaps.cpp app/organicmaps/sdk/Router.cpp - app/organicmaps/core/jni_helper.cpp - app/organicmaps/core/jni_java_methods.cpp - app/organicmaps/core/logging.cpp - app/organicmaps/bookmarks/data/BookmarkManager.cpp - app/organicmaps/DownloadResourcesLegacyActivity.cpp - app/organicmaps/editor/Editor.cpp - app/organicmaps/editor/OpeningHours.cpp - app/organicmaps/editor/OsmOAuth.cpp - app/organicmaps/Framework.cpp - app/organicmaps/isolines/IsolinesManager.cpp - app/organicmaps/LocationState.cpp - app/organicmaps/Map.cpp - app/organicmaps/MapManager.cpp - app/organicmaps/settings/UnitLocale.cpp - app/organicmaps/settings/MapLanguageCode.cpp - app/organicmaps/sound/tts.cpp - app/organicmaps/subway/SubwayManager.cpp - app/organicmaps/TrackRecorder.cpp - app/organicmaps/TrafficState.cpp - app/organicmaps/UserMarkHelper.cpp - app/organicmaps/opengl/android_gl_utils.cpp - app/organicmaps/opengl/androidoglcontext.cpp - app/organicmaps/opengl/androidoglcontextfactory.cpp - app/organicmaps/opengl/gl3stub.cpp - app/organicmaps/platform/GuiThread.cpp - app/organicmaps/platform/HttpThread.cpp - app/organicmaps/platform/Language.cpp - app/organicmaps/platform/Localization.cpp - app/organicmaps/platform/AndroidPlatform.cpp - app/organicmaps/platform/PThreadImpl.cpp - app/organicmaps/platform/SecureStorage.cpp - app/organicmaps/platform/SocketImpl.cpp - app/organicmaps/util/Config.cpp - app/organicmaps/util/GeoUtils.cpp - app/organicmaps/util/HttpClient.cpp - app/organicmaps/util/Language.cpp - app/organicmaps/util/LogsManager.cpp - app/organicmaps/util/NetworkPolicy.cpp - app/organicmaps/util/StringUtils.cpp - app/organicmaps/util/UiThread.cpp - app/organicmaps/vulkan/android_vulkan_context_factory.cpp + app/organicmaps/sdk/core/jni_helper.cpp + app/organicmaps/sdk/core/jni_java_methods.cpp + app/organicmaps/sdk/core/logging.cpp + app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp + app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp + app/organicmaps/sdk/editor/Editor.cpp + app/organicmaps/sdk/editor/OpeningHours.cpp + app/organicmaps/sdk/editor/OsmOAuth.cpp + app/organicmaps/sdk/Framework.cpp + app/organicmaps/sdk/isolines/IsolinesManager.cpp + app/organicmaps/sdk/LocationState.cpp + app/organicmaps/sdk/Map.cpp + app/organicmaps/sdk/MapManager.cpp + app/organicmaps/sdk/settings/UnitLocale.cpp + app/organicmaps/sdk/settings/MapLanguageCode.cpp + app/organicmaps/sdk/sound/tts.cpp + app/organicmaps/sdk/subway/SubwayManager.cpp + app/organicmaps/sdk/TrackRecorder.cpp + app/organicmaps/sdk/TrafficState.cpp + app/organicmaps/sdk/UserMarkHelper.cpp + app/organicmaps/sdk/opengl/android_gl_utils.cpp + app/organicmaps/sdk/opengl/androidoglcontext.cpp + app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp + app/organicmaps/sdk/opengl/gl3stub.cpp + app/organicmaps/sdk/platform/GuiThread.cpp + app/organicmaps/sdk/platform/HttpThread.cpp + app/organicmaps/sdk/platform/Language.cpp + app/organicmaps/sdk/platform/Localization.cpp + app/organicmaps/sdk/platform/AndroidPlatform.cpp + app/organicmaps/sdk/platform/PThreadImpl.cpp + app/organicmaps/sdk/platform/SecureStorage.cpp + app/organicmaps/sdk/platform/SocketImpl.cpp + app/organicmaps/sdk/util/Config.cpp + app/organicmaps/sdk/util/GeoUtils.cpp + app/organicmaps/sdk/util/HttpClient.cpp + app/organicmaps/sdk/util/Language.cpp + app/organicmaps/sdk/util/LogsManager.cpp + app/organicmaps/sdk/util/NetworkPolicy.cpp + app/organicmaps/sdk/util/StringUtils.cpp + app/organicmaps/sdk/util/UiThread.cpp + app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp ) omim_add_library(${PROJECT_NAME} SHARED ${SRC}) diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp index c6e37227b..cc49a4712 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp similarity index 92% rename from android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp index 1ac953548..da1cc89c5 100644 --- a/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp @@ -16,7 +16,7 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include #include @@ -70,7 +70,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env, jclass clazz) { // clear all g_filesToDownload.clear(); @@ -149,7 +149,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(JNIEnv * env, jclass clazz, jobject listener) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(JNIEnv * env, jclass clazz, jobject listener) { if (g_filesToDownload.empty()) return ERR_NO_MORE_FILES; @@ -178,7 +178,7 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env, jclass clazz) { LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest)); g_currentRequest.reset(); diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp similarity index 82% rename from android/app/src/main/cpp/app/organicmaps/Framework.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp index 581986277..bda8a5ca7 100644 --- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp @@ -1,19 +1,19 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/opengl/androidoglcontextfactory.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "app/organicmaps/sdk/routing/JunctionInfo.hpp" #include "app/organicmaps/sdk/routing/RouteMarkData.hpp" #include "app/organicmaps/sdk/routing/RouteMarkType.hpp" #include "app/organicmaps/sdk/routing/RouteRecommendationType.hpp" #include "app/organicmaps/sdk/routing/RoutingInfo.hpp" #include "app/organicmaps/sdk/routing/TransitRouteInfo.hpp" -#include "app/organicmaps/util/Distance.hpp" -#include "app/organicmaps/util/FeatureIdBuilder.hpp" -#include "app/organicmaps/util/NetworkPolicy.hpp" -#include "app/organicmaps/vulkan/android_vulkan_context_factory.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" +#include "app/organicmaps/sdk/util/FeatureIdBuilder.hpp" +#include "app/organicmaps/sdk/util/NetworkPolicy.hpp" +#include "app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp" #include "map/bookmark_helpers.hpp" #include "map/chart_generator.hpp" @@ -824,35 +824,35 @@ RoutingManager::LoadRouteHandler g_loadRouteHandler; /// @name JNI EXPORTS JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) { auto const info = frm()->GetAddressAtPoint(mercator::FromLatLon(lat, lon)); return jni::ToJavaString(env, info.FormatAddress()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz) { frm()->GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::API); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz, jstring url) +Java_app_organicmaps_sdk_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz, jstring url) { return static_cast(frm()->ParseAndSetApiURL(jni::ToNativeString(env, url))); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz) { using namespace url_scheme; - static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/api/RoutePoint"); + static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/RoutePoint"); // Java signature : RoutePoint(double lat, double lon, String name) static jmethodID const pointConstructor = jni::GetConstructorID(env, pointClazz, "(DDLjava/lang/String;)V"); - static jclass const routeDataClazz = jni::GetGlobalClassRef(env, "app/organicmaps/api/ParsedRoutingData"); + static jclass const routeDataClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedRoutingData"); // Java signature : ParsedRoutingData(RoutePoint[] points, int routerType) { - static jmethodID const routeDataConstructor = jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/api/RoutePoint;I)V"); + static jmethodID const routeDataConstructor = jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/sdk/api/RoutePoint;I)V"); auto const & routingData = frm()->GetParsedRoutingData(); jobjectArray points = jni::ToJavaArray(env, pointClazz, routingData.m_points, @@ -868,10 +868,10 @@ Java_app_organicmaps_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass c } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz) { using namespace url_scheme; - static jclass const cl = jni::GetGlobalClassRef(env, "app/organicmaps/api/ParsedSearchRequest"); + static jclass const cl = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedSearchRequest"); // Java signature : ParsedSearchRequest(String query, String locale, double lat, double lon, boolean isSearchOnMap) static jmethodID const ctor = jni::GetConstructorID(env, cl, "(Ljava/lang/String;Ljava/lang/String;DDZ)V"); auto const & r = frm()->GetParsedSearchRequest(); @@ -880,28 +880,28 @@ Java_app_organicmaps_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedAppName(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedAppName(JNIEnv * env, jclass) { std::string const & appName = frm()->GetParsedAppName(); return (appName.empty()) ? nullptr : jni::ToJavaString(env, appName); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass) { std::string const & code = frm()->GetParsedOAuth2Code(); return jni::ToJavaString(env, code); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass) { std::string const & backUrl = frm()->GetParsedBackUrl(); return (backUrl.empty()) ? nullptr : jni::ToJavaString(env, backUrl); } JNIEXPORT jdoubleArray JNICALL -Java_app_organicmaps_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) { ms::LatLon const center = frm()->GetParsedCenterLatLon(); if (!center.IsValid()) @@ -915,14 +915,14 @@ Java_app_organicmaps_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) +Java_app_organicmaps_sdk_Framework_nativePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) { LOG(LINFO, ("Set global map object listener")); g_placePageActivationListener = env->NewGlobalRef(jListener); // void onPlacePageActivated(MapObject object); jmethodID const activatedId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageActivated", - "(Lapp/organicmaps/widget/placepage/PlacePageData;)V"); + "(Lapp/organicmaps/sdk/widget/placepage/PlacePageData;)V"); // void onPlacePageDeactivated(); jmethodID const deactivateId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageDeactivated", "()V"); @@ -962,7 +962,7 @@ Java_app_organicmaps_Framework_nativePlacePageActivationListener(JNIEnv *env, jc } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemovePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) +Java_app_organicmaps_sdk_Framework_nativeRemovePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) { if (g_placePageActivationListener == nullptr) return; @@ -977,7 +977,7 @@ Java_app_organicmaps_Framework_nativeRemovePlacePageActivationListener(JNIEnv *e } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) +Java_app_organicmaps_sdk_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) { ::Framework * fr = frm(); double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale()); @@ -986,7 +986,7 @@ Java_app_organicmaps_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) +Java_app_organicmaps_sdk_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) { ::Framework * fr = frm(); double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale()); @@ -995,16 +995,16 @@ Java_app_organicmaps_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth( +Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth( JNIEnv * env, jclass, jdouble merX, jdouble merY, jdouble cLat, jdouble cLon, jdouble north) { platform::Distance distance; double azimut = -1.0; frm()->GetDistanceAndAzimut(m2::PointD(merX, merY), cLat, cLon, north, distance, azimut); - static jclass const daClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/DistanceAndAzimut"); + static jclass const daClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut"); // Java signature : DistanceAndAzimut(Distance distance, double azimuth) - static jmethodID const methodID = jni::GetConstructorID(env, daClazz, "(Lapp/organicmaps/util/Distance;D)V"); + static jmethodID const methodID = jni::GetConstructorID(env, daClazz, "(Lapp/organicmaps/sdk/util/Distance;D)V"); return env->NewObject(daClazz, methodID, ToJavaDistance(env, distance), @@ -1012,16 +1012,16 @@ Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth( } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuthFromLatLon( +Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuthFromLatLon( JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jdouble cLat, jdouble cLon, jdouble north) { double const merY = mercator::LatToY(lat); double const merX = mercator::LonToX(lon); - return Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north); + return Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat) +Java_app_organicmaps_sdk_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat) { switch (static_cast(coordsFormat)) { @@ -1054,13 +1054,13 @@ Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt) +Java_app_organicmaps_sdk_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt) { return jni::ToJavaString(env, platform::Distance::FormatAltitude(alt)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed) +Java_app_organicmaps_sdk_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed) { auto const units = measurement_utils::GetMeasurementUnits(); return jni::ToJavaString(env, measurement_utils::FormatSpeedNumeric(speed, units) + " " + @@ -1069,13 +1069,13 @@ Java_app_organicmaps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble s /* JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetOutdatedCountriesString(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetOutdatedCountriesString(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_framework->GetOutdatedCountriesString()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) { vector countries; Storage const & storage = g_framework->GetStorage(); @@ -1089,44 +1089,44 @@ Java_app_organicmaps_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeToDoAfterUpdate(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeToDoAfterUpdate(JNIEnv * env, jclass) { return g_framework->ToDoAfterUpdate(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDataVersionChanged(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsDataVersionChanged(JNIEnv * env, jclass) { return frm()->IsDataVersionUpdated() ? JNI_TRUE : JNI_FALSE; } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeUpdateSavedDataVersion(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeUpdateSavedDataVersion(JNIEnv * env, jclass) { frm()->UpdateSavedDataVersion(); } */ JNIEXPORT jlong JNICALL -Java_app_organicmaps_Framework_nativeGetDataVersion(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDataVersion(JNIEnv * env, jclass) { return frm()->GetCurrentDataVersion(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetDrawScale(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDrawScale(JNIEnv * env, jclass) { return static_cast(frm()->GetDrawScale()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass) { frm()->GetSearchAPI().PokeSearchInViewport(); } JNIEXPORT jdoubleArray JNICALL -Java_app_organicmaps_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) { m2::PointD const center = frm()->GetViewportCenter(); @@ -1138,43 +1138,43 @@ Java_app_organicmaps_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track) +Java_app_organicmaps_sdk_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track) { frm()->ShowTrack(static_cast(track)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveRoute(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeSaveRoute(JNIEnv *, jclass) { frm()->SaveRoute(); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetWritableDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetWritableDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().WritableDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetSettingsDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetSettingsDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetDataFileExt(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDataFileExt(JNIEnv * env, jclass) { return jni::ToJavaString(env, DATA_FILE_EXTENSION); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) { vector exts = { DATA_FILE_EXTENSION, FONT_FILE_EXTENSION }; platform::CountryIndexes::GetIndexesExts(exts); @@ -1182,7 +1182,7 @@ Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) { static std::array const kBookmarkExtensions = { std::string{kKmzExtension}, @@ -1195,7 +1195,7 @@ Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath) +Java_app_organicmaps_sdk_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath) { string newPath = jni::ToNativeString(env, jNewPath); g_framework->RemoveLocalMaps(); @@ -1204,55 +1204,55 @@ Java_app_organicmaps_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jst } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRoutingActive(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRoutingActive(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRoutingActive(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteBuilding(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteBuilt(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeCloseRouting(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeCloseRouting(JNIEnv * env, jclass) { frm()->GetRoutingManager().CloseRouting(true /* remove route points */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeBuildRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeBuildRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().BuildRoute(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveRoute(false /* deactivateFollowing */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeFollowRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeFollowRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().FollowRoute(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDisableFollowing(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDisableFollowing(JNIEnv * env, jclass) { frm()->GetRoutingManager().DisableFollowMode(); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets) +Java_app_organicmaps_sdk_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets) { ::Framework * fr = frm(); if (!fr->GetRoutingManager().IsRoutingActive()) @@ -1267,20 +1267,20 @@ Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode) +Java_app_organicmaps_sdk_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode) { frm()->GetRoutingManager().GetSpeedCamManager().SetMode( static_cast(mode)); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass) { return static_cast(frm()->GetRoutingManager().GetSpeedCamManager().GetMode()); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) { RoutingManager & rm = frm()->GetRoutingManager(); if (!rm.IsRoutingActive()) @@ -1295,7 +1295,7 @@ Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass) { vector junctionPoints; if (!frm()->GetRoutingManager().RoutingSession().GetRouteJunctionPoints(junctionPoints)) @@ -1308,7 +1308,7 @@ Java_app_organicmaps_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits) +Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits) { RoutingManager::DistanceAltitude altitudes; if (!frm()->GetRoutingManager().GetRouteAltitudesAndDistancesM(altitudes)) @@ -1398,13 +1398,13 @@ Java_app_organicmaps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId, jboolean zoomToDownloadButton) +Java_app_organicmaps_sdk_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId, jboolean zoomToDownloadButton) { g_framework->ShowNode(jni::ToNativeString(env, countryId), (bool) zoomToDownloadButton); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener) +Java_app_organicmaps_sdk_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); frm()->GetRoutingManager().SetRouteBuildingListener( @@ -1414,7 +1414,7 @@ Java_app_organicmaps_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jo } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener) +Java_app_organicmaps_sdk_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); frm()->GetRoutingManager().SetRouteProgressListener( @@ -1422,7 +1422,7 @@ Java_app_organicmaps_Framework_nativeSetRouteProgressListener(JNIEnv * env, jcla } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); @@ -1431,7 +1431,7 @@ Java_app_organicmaps_Framework_nativeSetRoutingRecommendationListener(JNIEnv * e } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingLoadPointsListener( +Java_app_organicmaps_sdk_Framework_nativeSetRoutingLoadPointsListener( JNIEnv *, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); @@ -1442,19 +1442,19 @@ Java_app_organicmaps_Framework_nativeSetRoutingLoadPointsListener( } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeactivatePopup(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeactivatePopup(JNIEnv * env, jclass) { return g_framework->DeactivatePopup(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass) { return g_framework->DeactivateMapSelectionCircle(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title, +Java_app_organicmaps_sdk_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title, jstring subtitle, jobject markType, jint intermediateIndex, jboolean isMyPosition, @@ -1473,64 +1473,64 @@ Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex) { frm()->GetRoutingManager().RemoveRoutePoint(GetRouteMarkType(env, markType), static_cast(intermediateIndex)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveIntermediateRoutePoints(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass) { return frm()->GetRoutingManager().CouldAddIntermediatePoint(); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRoutePoints(JNIEnv * env, jclass) { return CreateRouteMarkDataArray(env, frm()->GetRoutingManager().GetRoutePoints()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass, jint currentIndex, jint targetIndex) { frm()->GetRoutingManager().MoveRoutePoint(currentIndex, targetIndex); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass) { return CreateTransitRouteInfo(env, frm()->GetRoutingManager().GetTransitRouteInfo()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass) { g_framework->ReloadWorldMaps(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDayTime(JNIEnv * env, jclass, jlong utcTimeSeconds, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_Framework_nativeIsDayTime(JNIEnv * env, jclass, jlong utcTimeSeconds, jdouble lat, jdouble lon) { DayTimeType const dt = GetDayTime(static_cast(utcTimeSeconds), lat, lon); return (dt == DayTimeType::Day || dt == DayTimeType::PolarDay); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow, jboolean allowBuildings) +Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow, jboolean allowBuildings) { bool const allow3d = static_cast(allow); bool const allow3dBuildings = static_cast(allowBuildings); @@ -1540,7 +1540,7 @@ Java_app_organicmaps_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean al } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result) +Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result) { bool enabled; bool buildings; @@ -1556,7 +1556,7 @@ Java_app_organicmaps_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject res } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jboolean enabled) { bool const autoZoomEnabled = static_cast(enabled); frm()->SaveAutoZoom(autoZoomEnabled); @@ -1564,19 +1564,19 @@ Java_app_organicmaps_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jb } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->GetTransitManager().EnableTransitSchemeMode(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadTransitSchemeEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { auto const isolinesEnabled = static_cast(enabled); frm()->GetIsolinesManager().SetEnabled(isolinesEnabled); @@ -1584,44 +1584,44 @@ Java_app_organicmaps_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclas } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadIsolinesEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->SaveOutdoorsEnabled(enabled); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadOutdoorsEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->SaveTransitSchemeEnabled(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass) { return frm()->LoadAutoZoom(); } // static void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate); JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jint zoom, jboolean animate) +Java_app_organicmaps_sdk_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jint zoom, jboolean animate) { g_framework->Scale(m2::PointD(mercator::FromLatLon(lat, lon)), zoom, animate); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass) { if (!frm()->HasPlacePageInfo()) return nullptr; @@ -1640,7 +1640,7 @@ Java_app_organicmaps_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, j } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint id) +Java_app_organicmaps_sdk_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint id) { auto const metaID = static_cast(id); string_view const value = g_framework->GetPlacePageInfo().GetMetadata(metaID); @@ -1650,14 +1650,14 @@ Java_app_organicmaps_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass) { ::Framework * fr = frm(); return storage::IsPointCoveredByDownloadedMaps(fr->GetViewportCenter(), fr->GetStorage(), fr->GetCountryInfoGetter()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -1667,75 +1667,75 @@ Java_app_organicmaps_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * en } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left, jint top, jint right, jint bottom) +Java_app_organicmaps_sdk_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left, jint top, jint right, jint bottom) { frm()->SetVisibleViewport(m2::RectD(left, top, right, bottom)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteFinished(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteFinished(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteFinished(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass) { frm()->RunFirstLaunchAnimation(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass) { return frm()->GetRoutingManager().OpenRoutePointsTransaction(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass, jint transactionId) { frm()->GetRoutingManager().ApplyRoutePointsTransaction(transactionId); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass, jint transactionId) { frm()->GetRoutingManager().CancelRoutePointsTransaction(transactionId); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass) { return frm()->GetRoutingManager().InvalidRoutePointsTransactionId(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass) { return frm()->GetRoutingManager().HasSavedRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeLoadRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeLoadRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().LoadRoutePoints(g_loadRouteHandler); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeSaveRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().SaveRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().DeleteSavedRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId) +Java_app_organicmaps_sdk_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId) { auto const f = g_framework->BuildFeatureId(env, featureId); @@ -1744,13 +1744,13 @@ Java_app_organicmaps_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject f } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMakeCrash(JNIEnv *env, jclass type) +Java_app_organicmaps_sdk_Framework_nativeMakeCrash(JNIEnv *env, jclass type) { CHECK(false, ("Diagnostic native crash!")); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, +Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, jint facilityType, jboolean state) { frm()->GetPowerManager().SetFacility(static_cast(facilityType), @@ -1758,32 +1758,32 @@ Java_app_organicmaps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass) { return static_cast(frm()->GetPowerManager().GetScheme()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType) +Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType) { frm()->GetPowerManager().SetScheme(static_cast(schemeType)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) +Java_app_organicmaps_sdk_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) { // isAnim = true because of previous nativeSetChoosePositionMode animations. frm()->SetViewportCenter(mercator::FromLatLon(lat, lon), static_cast(zoom), true /* isAnim */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeStopLocationFollow(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeStopLocationFollow(JNIEnv *, jclass) { frm()->StopLocationFollow(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat, +Java_app_organicmaps_sdk_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) { auto const center = mercator::FromLatLon(static_cast(lat), @@ -1793,13 +1793,13 @@ Java_app_organicmaps_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass) { return static_cast(frm()->HasPlacePageInfo()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMemoryWarning(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeMemoryWarning(JNIEnv *, jclass) { return frm()->MemoryWarning(); } diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/Framework.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Framework.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/LocationState.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp similarity index 77% rename from android/app/src/main/cpp/app/organicmaps/LocationState.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp index cd2864d70..8e12965b7 100644 --- a/android/app/src/main/cpp/app/organicmaps/LocationState.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp @@ -1,9 +1,9 @@ #include "Framework.hpp" #include "map/gps_tracker.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -18,7 +18,7 @@ static void LocationStateModeChanged(location::EMyPositionMode mode, // public static void nativeSwitchToNextMode(); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, jclass clazz) { ASSERT(g_framework, ()); g_framework->SwitchMyPositionNextMode(); @@ -26,7 +26,7 @@ Java_app_organicmaps_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, // private static int nativeGetMode(); JNIEXPORT jint JNICALL -Java_app_organicmaps_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz) { // GetMyPositionMode() is initialized only after drape creation. // https://github.com/organicmaps/organicmaps/issues/1128#issuecomment-1784435190 @@ -36,7 +36,7 @@ Java_app_organicmaps_location_LocationState_nativeGetMode(JNIEnv * env, jclass c // public static void nativeSetListener(ModeChangeListener listener); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) { ASSERT(g_framework, ()); @@ -46,21 +46,21 @@ Java_app_organicmaps_location_LocationState_nativeSetListener(JNIEnv * env, jcla // public static void nativeRemoveListener(); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz) { ASSERT(g_framework, ()); g_framework->SetMyPositionModeListener(location::TMyPositionModeChanged()); } JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz, int errorCode) +Java_app_organicmaps_sdk_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz, int errorCode) { ASSERT(g_framework, ()); g_framework->OnLocationError(errorCode); } JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeLocationUpdated(JNIEnv * env, jclass clazz, jlong time, +Java_app_organicmaps_sdk_location_LocationState_nativeLocationUpdated(JNIEnv * env, jclass clazz, jlong time, jdouble lat, jdouble lon, jfloat accuracy, jdouble altitude, jfloat speed, jfloat bearing) { diff --git a/android/app/src/main/cpp/app/organicmaps/Map.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp similarity index 67% rename from android/app/src/main/cpp/app/organicmaps/Map.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp index 2062ba8ab..f5332f3d9 100644 --- a/android/app/src/main/cpp/app/organicmaps/Map.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp @@ -1,8 +1,8 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "storage/storage_defines.hpp" @@ -23,7 +23,7 @@ void OnRenderingInitializationFinished(std::shared_ptr const & listener extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeCreateEngine(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Map_nativeCreateEngine(JNIEnv * env, jclass, jobject surface, jint density, jboolean firstLaunch, jboolean isLaunchByDeepLink, @@ -35,25 +35,25 @@ Java_app_organicmaps_Map_nativeCreateEngine(JNIEnv * env, jclass, } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeIsEngineCreated(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeIsEngineCreated(JNIEnv *, jclass) { return g_framework->IsDrapeEngineCreated(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi) +Java_app_organicmaps_sdk_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi) { return g_framework->UpdateDpi(dpi); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass) { return g_framework->ExecuteMapApiRequest(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSetRenderingInitializationFinishedListener( +Java_app_organicmaps_sdk_Map_nativeSetRenderingInitializationFinishedListener( JNIEnv *, jclass, jobject listener) { if (listener) @@ -68,68 +68,68 @@ Java_app_organicmaps_Map_nativeSetRenderingInitializationFinishedListener( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface) +Java_app_organicmaps_sdk_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface) { return g_framework->AttachSurface(env, surface); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface) +Java_app_organicmaps_sdk_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface) { g_framework->DetachSurface(destroySurface); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w, jint h) +Java_app_organicmaps_sdk_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w, jint h) { g_framework->Resize(env, surface, w, h); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass) { return g_framework->DestroySurfaceOnDetach(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativePauseSurfaceRendering(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativePauseSurfaceRendering(JNIEnv *, jclass) { g_framework->PauseSurfaceRendering(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass) { g_framework->ResumeSurfaceRendering(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz, int offsetY) +Java_app_organicmaps_sdk_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz, int offsetY) { g_framework->UpdateMyPositionRoutingOffset(offsetY); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeApplyWidgets(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeApplyWidgets(JNIEnv *, jclass) { g_framework->ApplyWidgets(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeCleanWidgets(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeCleanWidgets(JNIEnv *, jclass) { g_framework->CleanWidgets(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSetupWidget( +Java_app_organicmaps_sdk_Map_nativeSetupWidget( JNIEnv *, jclass, jint widget, jfloat x, jfloat y, jint anchor) { g_framework->SetupWidget(static_cast(widget), x, y, static_cast(anchor)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, jboolean forceRedraw) +Java_app_organicmaps_sdk_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, jboolean forceRedraw) { location::CompassInfo info; info.m_bearing = north; @@ -138,33 +138,33 @@ Java_app_organicmaps_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, j } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeScalePlus(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeScalePlus(JNIEnv *, jclass) { g_framework->Scale(::Framework::SCALE_MAG); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeScaleMinus(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeScaleMinus(JNIEnv *, jclass) { g_framework->Scale(::Framework::SCALE_MIN); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnScroll( +Java_app_organicmaps_sdk_Map_nativeOnScroll( JNIEnv *, jclass, jdouble distanceX, jdouble distanceY) { g_framework->Scroll(distanceX, distanceY); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnScale( +Java_app_organicmaps_sdk_Map_nativeOnScale( JNIEnv *, jclass, jdouble factor, jdouble focusX, jdouble focusY, jboolean isAnim) { g_framework->Scale(factor, {focusX, focusY}, isAnim); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnTouch(JNIEnv *, jclass, jint action, +Java_app_organicmaps_sdk_Map_nativeOnTouch(JNIEnv *, jclass, jint action, jint id1, jfloat x1, jfloat y1, jint id2, jfloat x2, jfloat y2, jint maskedPointer) @@ -175,14 +175,14 @@ Java_app_organicmaps_Map_nativeOnTouch(JNIEnv *, jclass, jint action, } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeStorageConnected(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeStorageConnected(JNIEnv *, jclass) { android::Platform::Instance().OnExternalStorageStatusChanged(true); g_framework->AddLocalMaps(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeStorageDisconnected(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeStorageDisconnected(JNIEnv *, jclass) { android::Platform::Instance().OnExternalStorageStatusChanged(false); g_framework->RemoveLocalMaps(); diff --git a/android/app/src/main/cpp/app/organicmaps/MapManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp similarity index 83% rename from android/app/src/main/cpp/app/organicmaps/MapManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp index 3b0a5bfc9..75083bb58 100644 --- a/android/app/src/main/cpp/app/organicmaps/MapManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp @@ -1,7 +1,7 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" #include "coding/internal/file_data.hpp" @@ -70,7 +70,7 @@ struct CountryItemBuilder CountryItemBuilder(JNIEnv *env) { - m_class = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/CountryItem"); + m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/CountryItem"); m_ctor = jni::GetConstructorID(env, m_class, "(Ljava/lang/String;)V"); m_Id = env->GetFieldID(m_class, "id", "Ljava/lang/String;"); @@ -112,55 +112,55 @@ extern "C" // static String nativeGetRoot(); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, GetStorage().GetRootId()); } // static boolean nativeMoveFile(String oldFile, String newFile); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz, jstring oldFile, jstring newFile) +Java_app_organicmaps_sdk_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz, jstring oldFile, jstring newFile) { return base::MoveFileX(jni::ToNativeString(env, oldFile), jni::ToNativeString(env, newFile)); } // static boolean nativeHasSpaceToDownloadAmount(long bytes); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes) { return storage::IsEnoughSpaceForDownload(bytes); } // static boolean nativeHasSpaceToDownloadCountry(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env, jclass clazz, jstring root) { return storage::IsEnoughSpaceForDownload(jni::ToNativeString(env, root), GetStorage()); } // static boolean nativeHasSpaceToUpdate(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env, jclass clazz, jstring root) { return IsEnoughSpaceForUpdate(jni::ToNativeString(env, root), GetStorage()); } // static int nativeGetDownloadedCount(); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz) { return static_cast(GetStorage().GetDownloadedFilesCount()); } // static @Nullable UpdateInfo nativeGetUpdateInfo(@Nullable String root); JNIEXPORT jobject JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz, jstring root) { storage::Storage::UpdateInfo info; if (!GetStorage().GetUpdateInfo(GetRootId(env, root), info)) return nullptr; - static jclass const infoClass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/UpdateInfo"); + static jclass const infoClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/UpdateInfo"); ASSERT(infoClass, (jni::DescribeException())); static jmethodID const ctor = jni::GetConstructorID(env, infoClass, "(IJ)V"); ASSERT(ctor, (jni::DescribeException())); @@ -269,7 +269,7 @@ static void PutItemsToList( // static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, boolean myMapsMode, List result); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result) +Java_app_organicmaps_sdk_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result) { if (hasLocation && !myMapsMode) { @@ -292,7 +292,7 @@ Java_app_organicmaps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass // static void nativeUpdateItem(CountryItem item); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass, jobject item) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass, jobject item) { auto const & ciBuilder = CountryItemBuilder::Instance(env); jstring id = static_cast(env->GetObjectField(item, ciBuilder.m_Id)); @@ -305,7 +305,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jcl // static void nativeGetStatus(String root); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz, jstring root) { storage::NodeStatuses ns; GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns); @@ -314,7 +314,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass // static void nativeGetError(String root); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz, jstring root) { storage::NodeStatuses ns; GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns); @@ -323,21 +323,21 @@ Java_app_organicmaps_downloader_MapManager_nativeGetError(JNIEnv * env, jclass c // static String nativeGetName(String root); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz, jstring root) { return jni::ToJavaString(env, GetStorage().GetNodeLocalName(jni::ToNativeString(env, root))); } // static @Nullable String nativeFindCountry(double lat, double lon); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) { return jni::ToJavaString(env, g_framework->NativeFramework()->GetCountryInfoGetter().GetRegionCountryId(mercator::FromLatLon(lat, lon))); } // static boolean nativeIsDownloading(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz) { return static_cast(GetStorage().IsDownloadInProgress()); } @@ -365,7 +365,7 @@ static void EndBatchingCallbacks(JNIEnv * env) for (TBatchedData const & dataItem : key.second) { // Create StorageCallbackData instance… - static jclass batchDataClass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/MapManager$StorageCallbackData"); + static jclass batchDataClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/MapManager$StorageCallbackData"); static jmethodID batchDataCtor = jni::GetConstructorID(env, batchDataClass, "(Ljava/lang/String;IIZ)V"); jni::TScopedLocalRef const id(env, jni::ToJavaString(env, dataItem.m_countryId)); @@ -388,7 +388,7 @@ static void EndBatchingCallbacks(JNIEnv * env) // static void nativeDownload(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().DownloadNode(jni::ToNativeString(env, root)); @@ -397,7 +397,7 @@ Java_app_organicmaps_downloader_MapManager_nativeDownload(JNIEnv * env, jclass c // static boolean nativeRetry(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().RetryDownloadNode(jni::ToNativeString(env, root)); @@ -406,7 +406,7 @@ Java_app_organicmaps_downloader_MapManager_nativeRetry(JNIEnv * env, jclass claz // static void nativeUpdate(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().UpdateNode(GetRootId(env, root)); @@ -415,7 +415,7 @@ Java_app_organicmaps_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass cla // static void nativeCancel(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().CancelDownloadNode(GetRootId(env, root)); @@ -424,7 +424,7 @@ Java_app_organicmaps_downloader_MapManager_nativeCancel(JNIEnv * env, jclass cla // static void nativeDelete(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); auto const countryId = jni::ToNativeString(env, root); @@ -457,7 +457,7 @@ static void ProgressChangedCallback(std::shared_ptr const & listenerRef // static int nativeSubscribe(StorageCallback listener); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz, jobject listener) { return GetStorage().Subscribe(std::bind(&StatusChangedCallback, jni::make_global_ref(listener), std::placeholders::_1), std::bind(&ProgressChangedCallback, jni::make_global_ref(listener), std::placeholders::_1, std::placeholders::_2)); @@ -465,14 +465,14 @@ Java_app_organicmaps_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass // static void nativeUnsubscribe(int slot); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz, jint slot) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz, jint slot) { GetStorage().Unsubscribe(slot); } // static void nativeSubscribeOnCountryChanged(CurrentCountryChangedListener listener); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env, jclass clazz, jobject listener) { ASSERT(!g_countryChangedListener, ()); g_countryChangedListener = env->NewGlobalRef(listener); @@ -492,7 +492,7 @@ Java_app_organicmaps_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEn // static void nativeUnsubscribeOnCountryChanged(); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env, jclass clazz) { g_framework->NativeFramework()->SetCurrentCountryChangedListener(nullptr); @@ -502,14 +502,14 @@ Java_app_organicmaps_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNI // static boolean nativeHasUnsavedEditorChanges(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env, jclass clazz, jstring root) { return g_framework->NativeFramework()->HasUnsavedEdits(jni::ToNativeString(env, root)); } // static void nativeGetPathTo(String root, List result); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz, jstring root, jobject result) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz, jstring root, jobject result) { auto const listAddMethod = jni::ListBuilder::Instance(env).m_add; @@ -521,7 +521,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass // static int nativeGetOverallProgress(String[] countries); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env, jclass clazz, jobjectArray jcountries) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env, jclass clazz, jobjectArray jcountries) { int const size = env->GetArrayLength(jcountries); storage::CountriesVec countries; @@ -544,28 +544,28 @@ Java_app_organicmaps_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env // static boolean nativeIsAutoretryFailed(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env, jclass clazz) { return g_framework->IsAutoRetryDownloadFailed(); } // static boolean nativeIsDownloadOn3gEnabled(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env, jclass clazz) { return g_framework->IsDownloadOn3gEnabled(); } // static void nativeEnableDownloadOn3g(); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env, jclass clazz) { g_framework->EnableDownloadOn3g(); } // static @Nullable String nativeGetSelectedCountry(); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz) { if (!g_framework->NativeFramework()->HasPlacePageInfo()) return nullptr; diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp index 5e51c9c50..6083134a1 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp index 8e676c733..a54c78142 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp @@ -1,8 +1,8 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" extern "C" { diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp index 656eebbc3..48e9a4673 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp similarity index 53% rename from android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp index eaba5327d..66c2bcbe2 100644 --- a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp @@ -9,7 +9,7 @@ extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz, jboolean enable) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz, jboolean enable) { GpsTracker::Instance().SetEnabled(enable); Framework * const f = frm(); @@ -22,37 +22,37 @@ extern "C" } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz) { return GpsTracker::Instance().IsEnabled(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env, jclass clazz) { frm()->StartTrackRecording(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env, jclass clazz) { frm()->StopTrackRecording(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env, jclass clazz, jstring name) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env, jclass clazz, jstring name) { frm()->SaveTrackRecordingWithName(jni::ToNativeString(env, name)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env, jclass clazz) { return frm()->IsTrackRecordingEmpty(); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env, jclass clazz) { return frm()->IsTrackRecordingEnabled(); } diff --git a/android/app/src/main/cpp/app/organicmaps/TrafficState.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp similarity index 63% rename from android/app/src/main/cpp/app/organicmaps/TrafficState.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp index 8f70c8141..6206f6d3e 100644 --- a/android/app/src/main/cpp/app/organicmaps/TrafficState.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp @@ -1,8 +1,8 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -13,35 +13,35 @@ static void TrafficStateChanged(TrafficManager::TrafficState state, std::shared_ } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTrafficStateListener(std::bind(&TrafficStateChanged, std::placeholders::_1, jni::make_global_ref(listener))); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTrafficStateListener(TrafficManager::TrafficStateChangedFn()); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->EnableTraffic(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); return static_cast(g_framework->IsTrafficEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->DisableTraffic(); diff --git a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp index 32d2571ba..44d6424c3 100644 --- a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp @@ -49,7 +49,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje static jmethodID const ctorId = jni::GetConstructorID( env, g_mapObjectClazz, "(" - "Lapp/organicmaps/bookmarks/data/FeatureId;" // featureId + "Lapp/organicmaps/sdk/bookmarks/data/FeatureId;" // featureId "I" // mapObjectType "Ljava/lang/String;" // title "Ljava/lang/String;" // secondaryTitle @@ -104,7 +104,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, // @Nullable String[] rawTypes) static jmethodID const ctorId = jni::GetConstructorID(env, g_bookmarkClazz, - "(Lapp/organicmaps/bookmarks/data/FeatureId;JJLjava/lang/String;" + "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;JJLjava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" "Lapp/organicmaps/sdk/routing/RoutePointInfo;" "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;" @@ -137,7 +137,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, jobject CreateElevationPoint(JNIEnv * env, ElevationInfo::Point const & point) { static jclass const pointClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo$Point"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point"); // public Point(double distance, int altitude) static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DI)V"); @@ -149,7 +149,7 @@ jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & p { CHECK(!points.empty(), ("Elevation points must be non empty!")); static jclass const pointClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo$Point"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point"); return jni::ToJavaArray(env, pointClass, points, [](JNIEnv * env, ElevationInfo::Point const & item) { @@ -164,7 +164,7 @@ jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info) // long m_duration) static jmethodID const ctorId = jni::GetConstructorID(env, g_elevationInfoClazz, "(JLjava/lang/String;Ljava/lang/String;" - "[Lapp/organicmaps/bookmarks/data/ElevationInfo$Point;" + "[Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;" "IIIIIJ)V"); jni::TScopedLocalObjectArrayRef jPoints(env, ToElevationPointArray(env, info.GetPoints())); // TODO (KK): elevation info should have only the elevation data - see the https://github.com/organicmaps/organicmaps/pull/10063 diff --git a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp index 9a56c4c2f..e67e0254d 100644 --- a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp @@ -2,8 +2,8 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include diff --git a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp similarity index 81% rename from android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp index f801f37b5..69c99079b 100644 --- a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp @@ -1,7 +1,7 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "map/bookmark_helpers.hpp" #include "map/place_page_info.hpp" @@ -51,9 +51,9 @@ void PrepareClassRefs(JNIEnv * env) return; g_bookmarkManagerClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkManager"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkManager"); g_bookmarkManagerInstanceField = jni::GetStaticFieldID(env, g_bookmarkManagerClass, "INSTANCE", - "Lapp/organicmaps/bookmarks/data/BookmarkManager;"); + "Lapp/organicmaps/sdk/bookmarks/data/BookmarkManager;"); jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField); @@ -68,27 +68,27 @@ void PrepareClassRefs(JNIEnv * env) "(ZLjava/lang/String;Z)V"); g_onPreparedFileForSharingMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing", - "(Lapp/organicmaps/bookmarks/data/BookmarkSharingResult;)V"); + "(Lapp/organicmaps/sdk/bookmarks/data/BookmarkSharingResult;)V"); g_longClass = jni::GetGlobalClassRef(env,"java/lang/Long"); g_longConstructor = jni::GetConstructorID(env, g_longClass, "(J)V"); g_sortedBlockClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/SortedBlock"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/SortedBlock"); g_sortedBlockConstructor = jni::GetConstructorID(env, g_sortedBlockClass, "(Ljava/lang/String;[Ljava/lang/Long;[Ljava/lang/Long;)V"); g_onBookmarksSortingCompleted = jni::GetMethodID(env, bookmarkManagerInstance, - "onBookmarksSortingCompleted", "([Lapp/organicmaps/bookmarks/data/SortedBlock;J)V"); + "onBookmarksSortingCompleted", "([Lapp/organicmaps/sdk/bookmarks/data/SortedBlock;J)V"); g_onBookmarksSortingCancelled = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksSortingCancelled", "(J)V"); g_bookmarkInfoClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkInfo"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkInfo"); g_bookmarkInfoConstructor = jni::GetConstructorID(env, g_bookmarkInfoClass, "(JJ)V" ); g_bookmarkCategoryClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkCategory"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkCategory"); //public BookmarkCategory(long id, // String name, @@ -183,7 +183,7 @@ void OnAsyncLoadingFileError(JNIEnv * env, std::string const & fileName, bool is void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const & result) { - static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkSharingResult"); + static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult"); // BookmarkSharingResult(long[] categoriesIds, @Code int code, @NonNull String sharingPath, @NonNull String mimeType, @NonNull String errorString) static jmethodID const ctorBookmarkSharingResult = jni::GetConstructorID(env, classBookmarkSharingResult, "([JILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); @@ -297,21 +297,21 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids) extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap( JNIEnv *, jobject, jlong bmkId) { frm()->ShowBookmark(static_cast(bmkId)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap( JNIEnv *, jobject, jlong catId) { frm()->ShowBookmarkCategory(static_cast(catId), true /* animated */); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass) { PrepareClassRefs(env); BookmarkManager::AsyncLoadingCallbacks callbacks; @@ -327,7 +327,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeCreateCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeCreateCategory( JNIEnv * env, jobject, jstring name) { auto const categoryId = frm()->GetBookmarkManager().CreateBookmarkCategory(ToNativeString(env, name)); @@ -336,7 +336,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeCreateCategory( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteCategory( JNIEnv *, jobject, jlong catId) { auto const categoryId = static_cast(catId); @@ -345,20 +345,20 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteCategory( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId) { frm()->GetBookmarkManager().GetEditSession().DeleteBookmark(static_cast(bmkId)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteTrack( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteTrack( JNIEnv *, jobject, jlong trkId) { frm()->GetBookmarkManager().GetEditSession().DeleteTrack(static_cast(trkId)); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory( JNIEnv * env, jobject, double lat, double lon) { if (!frm()->HasPlacePageInfo()) @@ -389,48 +389,48 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEdite } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory( JNIEnv *, jobject) { return static_cast(frm()->LastEditedBMCategory()); } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastEditedColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedColor( JNIEnv *, jobject) { return static_cast(frm()->LastEditedBMColor()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass, jstring path, jboolean isTemporaryFile) { frm()->AddBookmarksFile(ToNativeString(env, path), isTemporaryFile); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsAsyncBookmarksLoadingInProgress(JNIEnv *, jclass) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsAsyncBookmarksLoadingInProgress(JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().IsAsyncLoadingInProgress()); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsVisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsVisible( JNIEnv *, jobject, jlong catId) { return static_cast(frm()->GetBookmarkManager().IsVisible(static_cast(catId))); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetVisibility( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetVisibility( JNIEnv *, jobject, jlong catId, jboolean isVisible) { frm()->GetBookmarkManager().GetEditSession().SetIsVisible(static_cast(catId), isVisible); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryName( JNIEnv * env, jobject, jlong catId, jstring name) { frm()->GetBookmarkManager().GetEditSession().SetCategoryName(static_cast(catId), @@ -438,7 +438,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryName( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env, jobject, jlong catId, jstring desc) @@ -448,7 +448,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryTags( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryTags( JNIEnv * env, jobject, jlong catId, jobjectArray tagsIds) { auto const size = env->GetArrayLength(tagsIds); @@ -465,7 +465,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryTags( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules( JNIEnv *, jobject, jlong catId, jint accessRules) { frm()->GetBookmarkManager().GetEditSession().SetCategoryAccessRules( @@ -473,7 +473,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty( JNIEnv * env, jobject, jlong catId, jstring key, jstring value) { frm()->GetBookmarkManager().GetEditSession().SetCategoryCustomProperty( @@ -481,7 +481,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryCustomPrope } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage( JNIEnv * env, jobject, jlong bmkId) { if (!frm()->HasPlacePageInfo()) @@ -496,7 +496,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePag } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( JNIEnv * env, jobject, jlong bmkId) { auto const bookmark = frm()->GetBookmarkManager().GetBookmark(static_cast(bmkId)); @@ -508,7 +508,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition( JNIEnv *, jobject, jlong catId, jint positionInCategory) { auto const & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast(catId)); @@ -522,12 +522,12 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPositio static uint32_t shift(uint32_t v, uint8_t bitCount) { return v << bitCount; } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrack( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack( JNIEnv * env, jobject, jlong trackId, jclass trackClazz) { // Track(long trackId, long categoryId, String name, String lengthString, int color) static jmethodID const cId = jni::GetConstructorID(env, trackClazz, - "(JJLjava/lang/String;Lapp/organicmaps/util/Distance;I)V"); + "(JJLjava/lang/String;Lapp/organicmaps/sdk/util/Distance;I)V"); auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast(trackId)); ASSERT(nTrack, ("Track must not be null with id:)", trackId)); @@ -545,7 +545,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrack( } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( JNIEnv *, jobject, jlong catId, jint positionInCategory) { auto const & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast(catId)); @@ -557,42 +557,42 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName( JNIEnv * env, jclass, jstring name) { return static_cast(frm()->GetBookmarkManager().IsUsedCategoryName(ToNativeString(env, name))); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareForSearch( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareForSearch( JNIEnv *, jclass, jlong catId) { frm()->GetBookmarkManager().PrepareForSearch(static_cast(catId)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreAllCategoriesInvisible()); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreAllCategoriesVisible()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility( JNIEnv *, jclass, jboolean visible) { frm()->GetBookmarkManager().SetAllCategoriesVisibility(static_cast(visible)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(JNIEnv * env, jclass, jlong trackId, jint kmlFileType) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(JNIEnv * env, jclass, jlong trackId, jint kmlFileType) { frm()->GetBookmarkManager().PrepareTrackFileForSharing(static_cast(trackId), [env](BookmarkManager::SharingResult const & result) { @@ -601,7 +601,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSha } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType) { auto const size = env->GetArrayLength(catIds); kml::GroupIdCollection catIdsVector(size); @@ -614,7 +614,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareFileForSharing( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( JNIEnv *, jclass, jlong catId) { return static_cast(frm()->GetBookmarkManager().IsCategoryEmpty( @@ -622,27 +622,27 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled( JNIEnv *, jclass, jboolean enabled) { frm()->GetBookmarkManager().SetNotificationsEnabled(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreNotificationsEnabled()); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id) { return MakeCategory(env, static_cast(id)); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject) { auto const & bm = frm()->GetBookmarkManager(); auto const & ids = bm.GetSortedBmGroupIdList(); @@ -651,7 +651,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv *env, jobject) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv *env, jobject) { auto const & bm = frm()->GetBookmarkManager(); auto const count = bm.GetBmGroupsCount(); @@ -660,7 +660,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesC } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId) { auto const & bm = frm()->GetBookmarkManager(); auto const ids = bm.GetChildrenCategories(static_cast(parentId)); @@ -669,7 +669,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeHasLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeHasLastSortingType( JNIEnv *, jobject, jlong catId) { auto const & bm = frm()->GetBookmarkManager(); @@ -678,7 +678,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeHasLastSortingType( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastSortingType( JNIEnv *, jobject, jlong catId) { auto const & bm = frm()->GetBookmarkManager(); @@ -690,7 +690,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastSortingType( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetLastSortingType( JNIEnv *, jobject, jlong catId, jint type) { auto & bm = frm()->GetBookmarkManager(); @@ -699,7 +699,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetLastSortingType( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeResetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeResetLastSortingType( JNIEnv *, jobject, jlong catId) { auto & bm = frm()->GetBookmarkManager(); @@ -707,7 +707,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeResetLastSortingType( } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(JNIEnv *env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(JNIEnv *env, jobject, jlong catId, jboolean hasMyPosition) { auto const & bm = frm()->GetBookmarkManager(); @@ -724,7 +724,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTyp } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env, jobject, jlong catId, jint sortingType, jboolean hasMyPosition, jdouble lat, jdouble lon, jlong timestamp) { @@ -741,14 +741,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIE } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkName( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, getBookmark(bmk)->GetPreferredName()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, @@ -756,14 +756,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, getBookmark(bmk)->GetDescription()); } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( JNIEnv *, jclass, jlong bmk) { auto const * mark = getBookmark(bmk); @@ -772,7 +772,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( JNIEnv *, jclass, jlong bmk) { auto const * mark = getBookmark(bmk); @@ -781,7 +781,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( JNIEnv * env, jclass, jlong bmk, jstring name, jint color, jstring descr) { @@ -802,7 +802,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( constexpr static uint8_t ExtractByte(uint32_t number, uint8_t byteIdx) { return (number >> (8 * byteIdx)) & 0xFF; } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetTrackParams( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetTrackParams( JNIEnv * env, jclass, jlong trackId, jstring name, jint color, jstring descr) { @@ -821,14 +821,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetTrackParams( } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackDescription( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackDescription( JNIEnv * env, jclass, jlong trackId) { return jni::ToJavaString(env, frm()->GetBookmarkManager().GetTrack(static_cast(trackId))->GetDescription()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory( JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong bmk) { g_framework->MoveBookmark(static_cast(bmk), static_cast(oldCat), @@ -836,7 +836,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong trackId) { g_framework->MoveTrack(static_cast(trackId), static_cast(oldCat), @@ -844,7 +844,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackColor( JNIEnv *, jclass, jlong trackId, jint color) { uint8_t alpha = ExtractByte(color, 3); @@ -852,28 +852,28 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackColor( } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkXY( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkXY( JNIEnv * env, jclass, jlong bmk) { return jni::GetNewParcelablePointD(env, getBookmark(bmk)->GetPivot()); } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkScale( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkScale( JNIEnv *, jclass, jlong bmk) { return getBookmark(bmk)->GetScale(); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url( JNIEnv * env, jclass, jlong bmk, jboolean addName) { return jni::ToJavaString(env, frm()->CodeGe0url(getBookmark(bmk), addName)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( JNIEnv * env, jclass, jlong bmkId) { auto const address = frm()->GetAddressAtPoint(getBookmark(bmkId)->GetPivot()).FormatAddress(); @@ -881,7 +881,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance( JNIEnv *, jclass, jlong trackId) { auto const & bm = frm()->GetBookmarkManager(); @@ -889,7 +889,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositio } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener( JNIEnv * env, jclass) { frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback( @@ -897,14 +897,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPos } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener( JNIEnv *, jclass) { frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(nullptr); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint( JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters) { auto & bm = frm()->GetBookmarkManager(); @@ -914,7 +914,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActivePoin } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance( JNIEnv *, jclass, jlong trackId) { auto & bm = frm()->GetBookmarkManager(); @@ -922,21 +922,21 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationActivePoin } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener( JNIEnv *env, jclass) { frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(std::bind(&OnElevationActivePointChanged, env)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener( JNIEnv *, jclass) { frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(nullptr); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_widget_placepage_PlacePageButtonFactory_nativeHasRecentlyDeletedBookmark(JNIEnv *, jclass) +Java_app_organicmaps_sdk_widget_placepage_PlacePageButtonFactory_nativeHasRecentlyDeletedBookmark(JNIEnv *, jclass) { return frm()->GetBookmarkManager().HasRecentlyDeletedBookmark(); } diff --git a/android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedEnv.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedEnv.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp index 8485ef1d6..9050f7823 100644 --- a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp @@ -52,17 +52,17 @@ JNI_OnLoad(JavaVM * jvm, void *) jni::InitAssertLog(); JNIEnv * env = jni::GetEnv(); - g_mapObjectClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/MapObject"); - g_featureIdClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/FeatureId"); - g_bookmarkClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/Bookmark"); - g_httpClientClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/HttpClient"); - g_httpParamsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/HttpClient$Params"); - g_platformSocketClazz = jni::GetGlobalClassRef(env, "app/organicmaps/location/PlatformSocket"); - g_utilsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/Utils"); - g_loggerClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/log/Logger"); - g_keyValueClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/KeyValue"); - g_networkPolicyClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/NetworkPolicy"); - g_elevationInfoClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo"); + g_mapObjectClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/MapObject"); + g_featureIdClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/FeatureId"); + g_bookmarkClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/Bookmark"); + g_httpClientClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient"); + g_httpParamsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient$Params"); + g_platformSocketClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/location/PlatformSocket"); + g_utilsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Utils"); + g_loggerClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/log/Logger"); + g_keyValueClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/KeyValue"); + g_networkPolicyClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/NetworkPolicy"); + g_elevationInfoClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo"); return JNI_VERSION_1_6; } @@ -269,7 +269,7 @@ std::string DescribeException() jobject GetNewParcelablePointD(JNIEnv * env, m2::PointD const & point) { - jclass klass = env->FindClass("app/organicmaps/bookmarks/data/ParcelablePointD"); + jclass klass = env->FindClass("app/organicmaps/sdk/bookmarks/data/ParcelablePointD"); ASSERT ( klass, () ); jmethodID methodID = GetConstructorID(env, klass, "(DD)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/logging.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp similarity index 91% rename from android/app/src/main/cpp/app/organicmaps/core/logging.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp index abe1fcbd2..857d49aca 100644 --- a/android/app/src/main/cpp/app/organicmaps/core/logging.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp @@ -3,9 +3,9 @@ #include "base/exception.hpp" #include "base/logging.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/logging.hpp" -#include "app/organicmaps/core/ScopedEnv.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/logging.hpp" +#include "app/organicmaps/sdk/core/ScopedEnv.hpp" #include #include diff --git a/android/app/src/main/cpp/app/organicmaps/core/logging.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/logging.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/logging.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/render_context.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/render_context.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/render_context.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/render_context.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp similarity index 76% rename from android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp index fc0222f72..4efb0db64 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "editor/osm_editor.hpp" @@ -66,38 +66,38 @@ extern "C" using osm::Editor; JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeInit(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeInit(JNIEnv * env, jclass) { - g_localNameClazz = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/LocalizedName"); + g_localNameClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/LocalizedName"); // LocalizedName(int code, @NonNull String name, @NonNull String lang, @NonNull String langName) g_localNameCtor = jni::GetConstructorID(env, g_localNameClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); g_localNameFieldCode = env->GetFieldID(g_localNameClazz, "code", "I"); g_localNameFieldName = env->GetFieldID(g_localNameClazz, "name", "Ljava/lang/String;"); - g_localStreetClazz = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/LocalizedStreet"); + g_localStreetClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/LocalizedStreet"); // LocalizedStreet(@NonNull String defaultName, @NonNull String localizedName) g_localStreetCtor = jni::GetConstructorID(env, g_localStreetClazz, "(Ljava/lang/String;Ljava/lang/String;)V"); g_localStreetFieldDef = env->GetFieldID(g_localStreetClazz, "defaultName", "Ljava/lang/String;"); g_localStreetFieldLoc = env->GetFieldID(g_localStreetClazz, "localizedName", "Ljava/lang/String;"); - g_namesDataSourceClassID = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/NamesDataSource"); - g_namesDataSourceConstructorID = jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/editor/data/LocalizedName;I)V"); + g_namesDataSourceClassID = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/NamesDataSource"); + g_namesDataSourceConstructorID = jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/sdk/editor/data/LocalizedName;I)V"); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_editableMapObject.GetOpeningHours()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value) { g_editableMapObject.SetOpeningHours(jni::ToNativeString(env, value)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -113,7 +113,7 @@ Java_app_organicmaps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -121,7 +121,7 @@ Java_app_organicmaps_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, j } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -129,32 +129,32 @@ Java_app_organicmaps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStars(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStars(JNIEnv * env, jclass) { return g_editableMapObject.GetStars(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass) { return osm::EditableMapObject::kMaximumLevelsEditableByUsers; } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeHasWifi(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeHasWifi(JNIEnv *, jclass) { return g_editableMapObject.GetInternet() == feature::Internet::Wlan; } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi) +Java_app_organicmaps_sdk_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi) { if (hasWifi != (g_editableMapObject.GetInternet() == feature::Internet::Wlan)) g_editableMapObject.SetInternet(hasWifi ? feature::Internet::Wlan : feature::Internet::Unknown); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) { switch (g_framework->NativeFramework()->SaveEditedMapObject(g_editableMapObject)) { @@ -169,7 +169,7 @@ Java_app_organicmaps_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -179,7 +179,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -189,7 +189,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -199,7 +199,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -209,7 +209,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -219,7 +219,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jclass clazz) { auto const & editable = g_editableMapObject.GetEditableProperties(); size_t const size = editable.size(); @@ -233,31 +233,31 @@ Java_app_organicmaps_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jcl } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsAddressEditable(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsNameEditable(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsPointType(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsBuilding(); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass) { auto const namesDataSource = g_editableMapObject.GetNamesDataSource(); @@ -268,7 +268,7 @@ Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names) +Java_app_organicmaps_sdk_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names) { int const length = env->GetArrayLength(names); for (int i = 0; i < length; i++) @@ -280,29 +280,29 @@ Java_app_organicmaps_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectA } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStreet(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStreet(JNIEnv * env, jclass) { return ToJavaStreet(env, g_editableMapObject.GetStreet()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street) +Java_app_organicmaps_sdk_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street) { g_editableMapObject.SetStreet({jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldDef)), jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldLoc))}); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz) { return jni::ToJavaArray(env, g_localStreetClazz, g_editableMapObject.GetNearbyStreets(), ToJavaStreet); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jclass clazz, jboolean includeServiceLangs) +Java_app_organicmaps_sdk_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jclass clazz, jboolean includeServiceLangs) { using TLang = StringUtf8Multilang::Lang; //public Language(@NonNull String code, @NonNull String name) - static jclass const langClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Language"); + static jclass const langClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Language"); static jmethodID const langCtor = jni::GetConstructorID(env, langClass, "(Ljava/lang/String;Ljava/lang/String;)V"); return jni::ToJavaArray(env, langClass, StringUtf8Multilang::GetSupportedLanguages(includeServiceLangs), @@ -315,25 +315,25 @@ Java_app_organicmaps_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jcl } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_editableMapObject.GetHouseNumber()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass, jstring houseNumber) +Java_app_organicmaps_sdk_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass, jstring houseNumber) { g_editableMapObject.SetHouseNumber(jni::ToNativeString(env, houseNumber)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz) { return Editor::Instance().HaveMapEditsOrNotesToUpload(); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz, jstring token, jstring appVersion, jstring appId) +Java_app_organicmaps_sdk_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz, jstring token, jstring appVersion, jstring appId) { // TODO: Handle upload status in callback Editor::Instance().UploadChanges(jni::ToNativeString(env, token), @@ -342,7 +342,7 @@ Java_app_organicmaps_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass claz } JNIEXPORT jlongArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) { auto const stats = Editor::Instance().GetStats(); jlongArray result = env->NewLongArray(3); @@ -353,13 +353,13 @@ Java_app_organicmaps_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz) { Editor::Instance().ClearAllLocalEdits(); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeStartEdit(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeStartEdit(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -374,7 +374,7 @@ Java_app_organicmaps_editor_Editor_nativeStartEdit(JNIEnv *, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, jstring featureType) { ::Framework * frm = g_framework->NativeFramework(); @@ -385,7 +385,7 @@ Java_app_organicmaps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, // static void nativeCreateNote(String text); JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) +Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) { g_framework->NativeFramework()->CreateNote( g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); @@ -393,7 +393,7 @@ Java_app_organicmaps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, // static void nativePlaceDoesNotExist(String comment); JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) +Java_app_organicmaps_sdk_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) { g_framework->NativeFramework()->CreateNote(g_editableMapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist, @@ -401,13 +401,13 @@ Java_app_organicmaps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz) { g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); @@ -418,7 +418,7 @@ Java_app_organicmaps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * en } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring query, jstring jLang) { @@ -430,7 +430,7 @@ Java_app_organicmaps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * en } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) { osm::AllCuisines const & cuisines = osm::Cuisines::Instance().AllSupportedCuisines(); std::vector keys; @@ -441,13 +441,13 @@ Java_app_organicmaps_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz) { return jni::ToJavaStringArray(env, g_editableMapObject.GetCuisines()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr) +Java_app_organicmaps_sdk_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr) { std::string const substr = jni::ToNativeString(env, jSubstr); bool const noFilter = substr.length() == 0; @@ -467,7 +467,7 @@ Java_app_organicmaps_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) +Java_app_organicmaps_sdk_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) { int const length = env->GetArrayLength(jKeys); auto const & cuisines = osm::Cuisines::Instance(); @@ -482,7 +482,7 @@ Java_app_organicmaps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) +Java_app_organicmaps_sdk_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) { int const length = env->GetArrayLength(jKeys); std::vector cuisines; @@ -493,38 +493,38 @@ Java_app_organicmaps_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclas } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, g_editableMapObject.FormatCuisines()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, g_editableMapObject.GetID().GetMwmName()); } JNIEXPORT jlong JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz) { return g_editableMapObject.GetID().GetMwmVersion(); } // static boolean nativeIsHouseValid(String houseNumber); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber) +Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber) { return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name) +Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name) { return osm::EditableMapObject::ValidateName(jni::ToNativeString(env, name)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) { auto types = g_editableMapObject.GetTypes(); types.SortBySpec(); @@ -534,20 +534,20 @@ Java_app_organicmaps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) // @FeatureStatus // static native int nativeGetMapObjectStatus(); JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) { return static_cast(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID())); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz) { return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index); } // static nativeMakeLocalizedName(String langCode, String name); JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz, jstring code, jstring name) +Java_app_organicmaps_sdk_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz, jstring code, jstring name) { osm::LocalizedName localizedName(jni::ToNativeString(env, code), jni::ToNativeString(env, name)); return ToJavaName(env, localizedName); diff --git a/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp similarity index 86% rename from android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp index ea9c13732..7802dde29 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "editor/opening_hours_ui.hpp" #include "editor/ui2oh.hpp" @@ -44,7 +44,7 @@ jfieldID g_fidWeekdays; jobject JavaHoursMinutes(JNIEnv * env, jlong hours, jlong minutes) { static const jclass dateUtilsClass = jni::GetGlobalClassRef(env, - "app/organicmaps/util/DateUtils"); + "app/organicmaps/sdk/util/DateUtils"); static jmethodID const is24HourFormatMethod = jni::GetStaticMethodID(env, dateUtilsClass, @@ -182,9 +182,9 @@ TimeTableSet NativeTimetableSet(JNIEnv * env, jobjectArray jTimetables) extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) { - g_clazzHoursMinutes = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/HoursMinutes"); + g_clazzHoursMinutes = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/HoursMinutes"); // Java signature : HoursMinutes(@IntRange(from = 0, to = 24) long hours, @IntRange(from = 0, to = 60) long minutes) g_ctorHoursMinutes = env->GetMethodID(g_clazzHoursMinutes, "", "(JJZ)V"); ASSERT(g_ctorHoursMinutes, (jni::DescribeException())); @@ -193,24 +193,24 @@ Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) g_fidMinutes = env->GetFieldID(g_clazzHoursMinutes, "minutes", "J"); ASSERT(g_fidMinutes, (jni::DescribeException())); - g_clazzTimespan = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Timespan"); + g_clazzTimespan = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timespan"); // Java signature : Timespan(HoursMinutes start, HoursMinutes end) g_ctorTimespan = - env->GetMethodID(g_clazzTimespan, "","(Lapp/organicmaps/editor/data/HoursMinutes;Lapp/organicmaps/editor/data/HoursMinutes;)V"); + env->GetMethodID(g_clazzTimespan, "","(Lapp/organicmaps/sdk/editor/data/HoursMinutes;Lapp/organicmaps/sdk/editor/data/HoursMinutes;)V"); ASSERT(g_ctorTimespan, (jni::DescribeException())); - g_fidStart = env->GetFieldID(g_clazzTimespan, "start", "Lapp/organicmaps/editor/data/HoursMinutes;"); + g_fidStart = env->GetFieldID(g_clazzTimespan, "start", "Lapp/organicmaps/sdk/editor/data/HoursMinutes;"); ASSERT(g_fidStart, (jni::DescribeException())); - g_fidEnd = env->GetFieldID(g_clazzTimespan, "end", "Lapp/organicmaps/editor/data/HoursMinutes;"); + g_fidEnd = env->GetFieldID(g_clazzTimespan, "end", "Lapp/organicmaps/sdk/editor/data/HoursMinutes;"); ASSERT(g_fidEnd, (jni::DescribeException())); - g_clazzTimetable = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Timetable"); + g_clazzTimetable = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timetable"); // Java signature : Timetable(Timespan workingTime, Timespan[] closedHours, boolean isFullday, int weekdays[]) g_ctorTimetable = - env->GetMethodID(g_clazzTimetable, "","(Lapp/organicmaps/editor/data/Timespan;[Lapp/organicmaps/editor/data/Timespan;Z[I)V"); + env->GetMethodID(g_clazzTimetable, "","(Lapp/organicmaps/sdk/editor/data/Timespan;[Lapp/organicmaps/sdk/editor/data/Timespan;Z[I)V"); ASSERT(g_ctorTimetable, (jni::DescribeException())); - g_fidWorkingTimespan = env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/editor/data/Timespan;"); + g_fidWorkingTimespan = env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/sdk/editor/data/Timespan;"); ASSERT(g_fidWorkingTimespan, (jni::DescribeException())); - g_fidClosedTimespans = env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/editor/data/Timespan;"); + g_fidClosedTimespans = env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/sdk/editor/data/Timespan;"); ASSERT(g_fidClosedTimespans, (jni::DescribeException())); g_fidIsFullday = env->GetFieldID(g_clazzTimetable, "isFullday", "Z"); ASSERT(g_fidIsFullday, (jni::DescribeException())); @@ -219,21 +219,21 @@ Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env, jclass clazz) { TimeTableSet tts; return JavaTimetables(env, tts); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeGetComplementTimetable(JNIEnv * env, jclass clazz, jobjectArray timetables) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetComplementTimetable(JNIEnv * env, jclass clazz, jobjectArray timetables) { TimeTableSet const tts = NativeTimetableSet(env, timetables); return JavaTimetable(env, tts.GetComplementTimeTable()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex) { TimeTableSet tts = NativeTimetableSet(env, timetables); @@ -244,7 +244,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jc } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex) { TimeTableSet tts = NativeTimetableSet(env, timetables); @@ -255,7 +255,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclas } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz, jobject jTimetable, jboolean jIsFullday) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -270,7 +270,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz, jobject jTimetable, jobject jOpeningTime) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -279,7 +279,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jcla } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz, jobject jTimetable, jobject jClosedSpan) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -288,7 +288,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclas } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jclass clazz, jobject jTimetable, jint jClosedSpanIndex) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -297,7 +297,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jc } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env, jclass clazz, jstring jSource) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env, jclass clazz, jstring jSource) { TimeTableSet tts; std::string const source = jni::ToNativeString(env, jSource); @@ -308,7 +308,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, jclass clazz, jobjectArray jTts) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, jclass clazz, jobjectArray jTts) { TimeTableSet tts = NativeTimetableSet(env, jTts); std::stringstream sstr; @@ -317,7 +317,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env, jclass clazz, jstring jSource) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env, jclass clazz, jstring jSource) { return OpeningHours(jni::ToNativeString(env, jSource)).IsValid(); } diff --git a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp similarity index 73% rename from android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp index 784d666ab..9ef2078af 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" @@ -27,14 +27,14 @@ extern "C" { JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass) { auto const auth = OsmOAuth::ServerAuth(); return ToJavaString(env, auth.BuildOAuth2Url()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz, jstring login, jstring password) { OsmOAuth auth = OsmOAuth::ServerAuth(); @@ -52,7 +52,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass, jstring oauth2code) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass, jstring oauth2code) { OsmOAuth auth = OsmOAuth::ServerAuth(); try @@ -73,7 +73,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jcla } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -82,7 +82,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -91,7 +91,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, j } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -100,13 +100,13 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user) { return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetHistoryURL(jni::ToNativeString(env, user))); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user) { return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetNotesURL(jni::ToNativeString(env, user))); } diff --git a/android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp similarity index 71% rename from android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp index a55179922..72c462f47 100644 --- a/android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" using namespace std::placeholders; @@ -19,7 +19,7 @@ static void IsolinesStateChanged(IsolinesManager::IsolinesState state, JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetIsolinesListener(std::bind(&IsolinesStateChanged, @@ -28,14 +28,14 @@ Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetIsolinesListener(nullptr); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv *env, +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv *env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp similarity index 99% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp index 00f576dbe..0d7a73e31 100644 --- a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp @@ -1,7 +1,7 @@ #include "androidoglcontextfactory.hpp" #include "android_gl_utils.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp index 8f886a9c4..17e9e0b8a 100644 --- a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "androidoglcontext.hpp" #include "drape/graphics_context_factory.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h diff --git a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp index b15c6d974..67754578e 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp @@ -1,9 +1,9 @@ -#include "app/organicmaps/platform/AndroidPlatform.hpp" -#include "app/organicmaps/platform/GuiThread.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/util/NetworkPolicy.hpp" +#include "app/organicmaps/sdk/util/NetworkPolicy.hpp" #include "platform/network_policy.hpp" #include "platform/settings.hpp" @@ -22,7 +22,7 @@ std::string Platform::GetMemoryInfo() const if (env == nullptr) return std::string(); - static std::shared_ptr classLogsManager = jni::make_global_ref(env->FindClass("app/organicmaps/util/log/LogsManager")); + static std::shared_ptr classLogsManager = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/log/LogsManager")); ASSERT(classLogsManager, ()); jobject context = android::Platform::Instance().GetContext(); @@ -79,7 +79,7 @@ Platform::EConnectionType Platform::ConnectionStatus() if (env == nullptr) return EConnectionType::CONNECTION_NONE; - static std::shared_ptr clazzConnectionState = jni::make_global_ref(env->FindClass("app/organicmaps/util/ConnectionState")); + static std::shared_ptr clazzConnectionState = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/ConnectionState")); ASSERT(clazzConnectionState, ()); static jmethodID const getConnectionMethodId = jni::GetStaticMethodID(env, static_cast(*clazzConnectionState), "getConnectionState", "()B"); @@ -93,7 +93,7 @@ Platform::ChargingStatus Platform::GetChargingStatus() return Platform::ChargingStatus::Unknown; static jclass const clazzBatteryState = - jni::GetGlobalClassRef(env, "app/organicmaps/util/BatteryState"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState"); ASSERT(clazzBatteryState, ()); static jmethodID const getChargingMethodId = @@ -110,7 +110,7 @@ uint8_t Platform::GetBatteryLevel() return 100; static auto const clazzBatteryState = - jni::GetGlobalClassRef(env, "app/organicmaps/util/BatteryState"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState"); ASSERT(clazzBatteryState, ()); static auto const getLevelMethodId = @@ -197,7 +197,7 @@ void Platform::AndroidSecureStorage::Init(JNIEnv * env) if (m_secureStorageClass != nullptr) return; - m_secureStorageClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/SecureStorage"); + m_secureStorageClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/SecureStorage"); ASSERT(m_secureStorageClass, ()); } diff --git a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp similarity index 83% rename from android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp index 4b6b7b30d..ae39ea14e 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/platform/GuiThread.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include @@ -10,7 +10,7 @@ GuiThread::GuiThread() { JNIEnv * env = jni::GetEnv(); - m_class = jni::GetGlobalClassRef(env, "app/organicmaps/util/concurrency/UiThread"); + m_class = GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread"); ASSERT(m_class, ()); m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp similarity index 89% rename from android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp index 506949345..534f9414b 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp @@ -1,5 +1,5 @@ #include "AndroidPlatform.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "base/logging.hpp" #include "platform/http_thread_callback.hpp" @@ -19,7 +19,7 @@ public: std::string const & pb) { JNIEnv * env = jni::GetEnv(); - static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/ChunkTask"); + static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/ChunkTask"); m_klass = klass; // public ChunkTask(long httpCallbackID, String url, long beg, long end, // long expectedFileSize, byte[] postBody, String userAgent) @@ -80,7 +80,7 @@ namespace downloader extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong beg, jbyteArray data, jlong size) +Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong beg, jbyteArray data, jlong size) { downloader::IHttpThreadCallback * cb = reinterpret_cast(httpCallbackID); jbyte * buf = env->GetByteArrayElements(data, 0); @@ -101,7 +101,7 @@ Java_app_organicmaps_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass cla } JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong httpCode, jlong beg, jlong end) +Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong httpCode, jlong beg, jlong end) { downloader::IHttpThreadCallback * cb = reinterpret_cast(httpCallbackID); cb->OnFinish(static_cast(httpCode), beg, end); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/platform/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp index 1cbe2d954..233877018 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp @@ -1,5 +1,5 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" -#include "android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp" #include "platform/locale.hpp" @@ -21,7 +21,7 @@ std::string GetAndroidSystemLanguage() return DEFAULT_LANG; } - static jclass const languageClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/Language"); + static jclass const languageClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Language"); static jmethodID const getDefaultLocaleId = jni::GetStaticMethodID(env, languageClass, "getDefaultLocale", "()Ljava/lang/String;"); jni::TScopedLocalRef localeRef(env, env->CallStaticObjectMethod(languageClass, getDefaultLocaleId)); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp index cc32e532a..11229602c 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp @@ -1,8 +1,8 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/ScopedLocalRef.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/ScopedLocalRef.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "platform/localization.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp similarity index 82% rename from android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp index 9529d29b9..d5a9571cd 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" /// Implements bodies of base/thread.hpp functions for Android diff --git a/android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SecureStorage.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/SecureStorage.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp similarity index 98% rename from android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp index 19073209f..e9c7e0f75 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/socket.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp index 328b7d9fa..be93da80f 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/point_with_altitude.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp index f36a3d4f9..7599841b9 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/point2d.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp index 22008dd3c..aed7b3c86 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "map/place_page_info.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp index c94417820..25d1f3231 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" jobject GetRebuildAfterPointsLoading(JNIEnv * env) { diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp index fcf4c6a94..6f4fe6371 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp" #include "app/organicmaps/util/Distance.hpp" @@ -16,7 +16,7 @@ jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, Rou // int totalTime, SingleLaneInfo[] lanes) static jmethodID const ctorRouteInfoID = jni::GetConstructorID(env, klass, - "(Lapp/organicmaps/util/Distance;Lapp/organicmaps/util/Distance;" + "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII" "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp index 7befa3174..ecb5d5529 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "routing/routing_options.hpp" routing::RoutingOptions::Road makeValue(jint option) diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp index cea8ee643..8574e4c99 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "routing/following_info.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp index 1401fa2b4..c2ef0afb8 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "app/organicmaps/sdk/routing/TransitStepInfo.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp index 2cba3b102..37f3776e2 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "map/transit/transit_display.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp index 273934a45..65706b500 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp @@ -1,5 +1,5 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "search/displayed_categories.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp index afc5420a7..814ca5fa3 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp @@ -1,7 +1,7 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "map/bookmarks_search_params.hpp" #include "map/everywhere_search_params.hpp" @@ -253,8 +253,8 @@ extern "C" boolean hasPopularityHigherPriority) */ g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, - "(Lapp/organicmaps/bookmarks/data/FeatureId;" - "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/util/Distance;" + "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;" + "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/sdk/util/Distance;" "Ljava/lang/String;IIIZ)V"); g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity"); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp index 303303c15..7a2a1fd93 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" #include "search/result.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp similarity index 54% rename from android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp index 5436f3e96..fd3cf07d7 100644 --- a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/settings.hpp" @@ -7,13 +7,13 @@ extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject, jstring languageCode) +Java_app_organicmaps_sdk_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject, jstring languageCode) { g_framework->SetMapLanguageCode(jni::ToNativeString(env, languageCode)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject) +Java_app_organicmaps_sdk_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject) { return jni::ToJavaString(env, g_framework->GetMapLanguageCode()); } diff --git a/android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp similarity index 67% rename from android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp index 7214bff66..4c5dd801d 100644 --- a/android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/measurement_utils.hpp" #include "platform/settings.hpp" @@ -6,7 +6,7 @@ extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units) + Java_app_organicmaps_sdk_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units) { measurement_utils::Units const u = static_cast(units); settings::Set(settings::kMeasurementUnits, u); @@ -14,7 +14,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz) + Java_app_organicmaps_sdk_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz) { measurement_utils::Units u; return static_cast( diff --git a/android/app/src/main/cpp/app/organicmaps/sound/tts.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp similarity index 51% rename from android/app/src/main/cpp/app/organicmaps/sound/tts.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp index 1c25d1828..3fabf7596 100644 --- a/android/app/src/main/cpp/app/organicmaps/sound/tts.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp @@ -1,29 +1,29 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable) { return frm()->GetRoutingManager().EnableTurnNotifications(static_cast(enable)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass) { return static_cast(frm()->GetRoutingManager().AreTurnNotificationsEnabled()); } JNIEXPORT void JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale) { frm()->GetRoutingManager().SetTurnNotificationsLocale(jni::ToNativeString(env, jLocale)); } JNIEXPORT jstring JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass) { return jni::ToJavaString(env, frm()->GetRoutingManager().GetTurnNotificationsLocale()); } diff --git a/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp similarity index 70% rename from android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp index d65c01892..fe70b9a58 100644 --- a/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp @@ -1,7 +1,7 @@ #include -#include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -15,7 +15,7 @@ static void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState sta } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTransitSchemeListener(std::bind(&TransitSchemeStateChanged, @@ -24,7 +24,7 @@ Java_app_organicmaps_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn()); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp similarity index 56% rename from android/app/src/main/cpp/app/organicmaps/util/Config.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp index 3794f7434..02a3b4e50 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp @@ -1,24 +1,24 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/settings.hpp" extern "C" { JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name) + Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name) { std::string value; return settings::Get(jni::ToNativeString(env, name), value); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name) + Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name) { settings::Delete(jni::ToNativeString(env, name)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal) + Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal) { bool val; if (settings::Get(jni::ToNativeString(env, name), val)) @@ -28,13 +28,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val) + Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(val)); } JNIEXPORT jint JNICALL - Java_app_organicmaps_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue) { int32_t value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -44,13 +44,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value) + Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jlong JNICALL - Java_app_organicmaps_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue) { int64_t value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -60,13 +60,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value) + Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jdouble JNICALL - Java_app_organicmaps_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue) { double value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -76,13 +76,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value) + Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jstring JNICALL - Java_app_organicmaps_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue) { std::string value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -92,32 +92,32 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value) + Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value) { (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz) + Java_app_organicmaps_sdk_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz) { return frm()->LoadLargeFontsSize(); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, + Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, jboolean value) { frm()->SetLargeFontsSize(value); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz) + Java_app_organicmaps_sdk_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz) { return frm()->LoadTransliteration(); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz, + Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz, jboolean value) { frm()->SaveTransliteration(value); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Distance.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp similarity index 85% rename from android/app/src/main/cpp/app/organicmaps/util/Distance.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp index 0b10e7f69..fbe8676a1 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Distance.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp @@ -1,12 +1,12 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/distance.hpp" inline jobject ToJavaDistance(JNIEnv * env, platform::Distance const & distance) { - static jclass const distanceClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/Distance"); + static jclass const distanceClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Distance"); static jmethodID const distanceConstructor = jni::GetConstructorID(env, distanceClass, "(DLjava/lang/String;B)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp similarity index 85% rename from android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp index 0d08a5daa..b5c629ba3 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "indexer/feature_decl.hpp" @@ -9,7 +9,7 @@ class FeatureIdBuilder public: explicit FeatureIdBuilder(JNIEnv * env) { - jclass clazz = env->FindClass("app/organicmaps/bookmarks/data/FeatureId"); + jclass clazz = env->FindClass("app/organicmaps/sdk/bookmarks/data/FeatureId"); m_countryName = env->GetFieldID(clazz, "mMwmName", "Ljava/lang/String;"); ASSERT(m_countryName, ()); m_index = env->GetFieldID(clazz, "mFeatureIndex", "I"); diff --git a/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp similarity index 75% rename from android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp index 67518c336..b4ae14484 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp @@ -1,11 +1,11 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/mercator.hpp" extern "C" { JNIEXPORT jobject JNICALL - Java_app_organicmaps_util_GeoUtils_nativeToLatLon( + Java_app_organicmaps_sdk_util_GeoUtils_nativeToLatLon( JNIEnv * env, jobject thiz, jdouble mercX, jdouble mercY) { auto const mercPoint = m2::PointD(static_cast(mercX), static_cast(mercY)); diff --git a/android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp index 8c98a6257..ca49c6354 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp @@ -23,9 +23,9 @@ SOFTWARE. *******************************************************************************/ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/ScopedEnv.hpp" -#include "app/organicmaps/core/ScopedLocalRef.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/ScopedEnv.hpp" +#include "app/organicmaps/sdk/core/ScopedLocalRef.hpp" #include "platform/http_client.hpp" @@ -104,7 +104,7 @@ void SetHeaders(ScopedEnv & env, jobject const params, platform::HttpClient::Hea return; static jmethodID const setHeaders = env->GetMethodID( - g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/util/KeyValue;)V"); + g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/sdk/util/KeyValue;)V"); RethrowOnJniException(env); @@ -228,7 +228,7 @@ bool HttpClient::RunHttpRequest() static jmethodID const httpClientClassRun = env->GetStaticMethodID(g_httpClientClazz, "run", - "(Lapp/organicmaps/util/HttpClient$Params;)Lapp/organicmaps/util/HttpClient$Params;"); + "(Lapp/organicmaps/sdk/util/HttpClient$Params;)Lapp/organicmaps/sdk/util/HttpClient$Params;"); jni::ScopedLocalRef const response(env.get(), env->CallStaticObjectMethod(g_httpClientClazz, httpClientClassRun, httpParamsObject.get())); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Language.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp similarity index 54% rename from android/app/src/main/cpp/app/organicmaps/util/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp index 21aa697dc..3252ca5db 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp @@ -1,10 +1,10 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/preferred_languages.hpp" extern "C" { JNIEXPORT jstring JNICALL -Java_app_organicmaps_util_Language_nativeNormalize(JNIEnv *env, jclass type, jstring lang) +Java_app_organicmaps_sdk_util_Language_nativeNormalize(JNIEnv *env, jclass type, jstring lang) { std::string locale = languages::Normalize(jni::ToNativeString(env, lang)); return jni::ToJavaString(env, locale); diff --git a/android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp similarity index 57% rename from android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp index 802221ebc..272c94eda 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp @@ -1,9 +1,9 @@ #include -#include "app/organicmaps/core/logging.hpp" +#include "app/organicmaps/sdk/core/logging.hpp" extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_util_log_LogsManager_nativeToggleCoreDebugLogs( +Java_app_organicmaps_sdk_util_log_LogsManager_nativeToggleCoreDebugLogs( JNIEnv * /*env*/, jclass /*clazz*/, jboolean enabled) { jni::ToggleDebugLogs(enabled); diff --git a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp similarity index 91% rename from android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp index 405b2d3a8..585bf6837 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" namespace network_policy { diff --git a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp similarity index 66% rename from android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp index 833f2fa23..a72f9e2d2 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "indexer/search_string_utils.hpp" @@ -21,19 +21,19 @@ jobject MakeJavaPair(JNIEnv * env, std::string const & first, std::string const extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz, jstring text) +Java_app_organicmaps_sdk_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz, jstring text) { return strings::IsHTML(jni::ToNativeString(env, text)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz, jstring str, jstring substr) +Java_app_organicmaps_sdk_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz, jstring str, jstring substr) { return search::ContainsNormalized(jni::ToNativeString(env, str), jni::ToNativeString(env, substr)); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr) +Java_app_organicmaps_sdk_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr) { std::string const substr = jni::ToNativeString(env, jSubstr); int const length = env->GetArrayLength(src); @@ -49,13 +49,13 @@ Java_app_organicmaps_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * en return jni::ToJavaStringArray(env, filtered); } -JNIEXPORT jint JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeed( +JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeed( JNIEnv * env, jclass thiz, jdouble metersPerSecond) { return measurement_utils::FormatSpeed(metersPerSecond, measurement_utils::GetMeasurementUnits()); } -JNIEXPORT jobject JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeedAndUnits( +JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeedAndUnits( JNIEnv * env, jclass thiz, jdouble metersPerSecond) { auto const units = measurement_utils::GetMeasurementUnits(); @@ -64,27 +64,27 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpee } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass, jdouble distanceInMeters) +Java_app_organicmaps_sdk_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass, jdouble distanceInMeters) { return ToJavaDistance(env, platform::Distance::CreateFormatted(distanceInMeters)); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env, jclass) { auto const localizedUnits = platform::GetLocalizedDistanceUnits(); return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env, jclass) { auto const localizedUnits = platform::GetLocalizedAltitudeUnits(); return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass) { return jni::ToJavaString(env, platform::GetLocalizedSpeedUnits()); } diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp new file mode 100644 index 000000000..a6c313620 --- /dev/null +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp @@ -0,0 +1,12 @@ +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" + +extern "C" +{ +// static void nativeProcessTask(long taskPointer); +JNIEXPORT void JNICALL +Java_app_organicmaps_sdk_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz, jlong taskPointer) +{ + android::GuiThread::ProcessTask(taskPointer); +} +} diff --git a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp similarity index 98% rename from android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp index 84b922063..07551d254 100644 --- a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp @@ -1,6 +1,6 @@ #include "android_vulkan_context_factory.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp index b98dc4c04..99de315e7 100644 --- a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "drape/vulkan/vulkan_context_factory.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp b/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp deleted file mode 100644 index bd54eec30..000000000 --- a/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/GuiThread.hpp" - -extern "C" -{ -// static void nativeProcessTask(long taskPointer); -JNIEXPORT void JNICALL -Java_app_organicmaps_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz, jlong taskPointer) -{ - android::GuiThread::ProcessTask(taskPointer); -} -} diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java index 89141b7b2..7c3056c58 100644 --- a/android/app/src/main/java/app/organicmaps/ChartController.java +++ b/android/app/src/main/java/app/organicmaps/ChartController.java @@ -21,8 +21,9 @@ import com.github.mikephil.charting.formatter.ValueFormatter; import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.listener.OnChartValueSelectedListener; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.ElevationInfo; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.ElevationInfo; import app.organicmaps.widget.placepage.AxisValueFormatter; import app.organicmaps.widget.placepage.CurrentLocationMarkerView; import app.organicmaps.widget.placepage.FloatingMarkerView; diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java index c7aff32ba..9505280cd 100644 --- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java +++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java @@ -1,5 +1,15 @@ package app.organicmaps; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DISK_ERROR; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DOWNLOAD_ERROR; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DOWNLOAD_SUCCESS; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_NOT_ENOUGH_FREE_SPACE; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_NO_MORE_FILES; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_STORAGE_DISCONNECTED; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeCancelCurrentFile; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeGetBytesToDownload; +import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeStartNextFileDownload; + import android.annotation.SuppressLint; import android.app.Dialog; import android.content.ComponentName; @@ -12,22 +22,21 @@ import android.view.View; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.CallSuper; -import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.StyleRes; import androidx.core.view.ViewCompat; import app.organicmaps.base.BaseMwmFragmentActivity; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.intent.Factory; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.util.Config; -import app.organicmaps.util.ConnectionState; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.ConnectionState; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; @@ -45,15 +54,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity { private static final String TAG = DownloadResourcesLegacyActivity.class.getSimpleName(); - // Error codes, should match the same codes in JNI - private static final int ERR_DOWNLOAD_SUCCESS = 0; - private static final int ERR_DISK_ERROR = -1; - private static final int ERR_NOT_ENOUGH_FREE_SPACE = -2; - private static final int ERR_STORAGE_DISCONNECTED = -3; - private static final int ERR_DOWNLOAD_ERROR = -4; - private static final int ERR_NO_MORE_FILES = -5; - private static final int ERR_FILE_IN_PROGRESS = -6; - private MaterialTextView mTvMessage; private LinearProgressIndicator mProgress; private MaterialButton mBtnDownload; @@ -81,19 +81,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity private int mCountryDownloadListenerSlot; - private interface Listener - { - // Called by JNI. - @Keep - @SuppressWarnings("unused") - void onProgress(int percent); - - // Called by JNI. - @Keep - @SuppressWarnings("unused") - void onFinish(int errorCode); - } - private final LocationListener mLocationListener = new LocationListener() { @Override @@ -126,11 +113,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity mChbDownloadCountry.setText(checkBoxText); } - LocationHelper.from(DownloadResourcesLegacyActivity.this).removeListener(this); + MwmApplication.from(DownloadResourcesLegacyActivity.this).getLocationHelper().removeListener(this); } }; - private final Listener mResourcesDownloadListener = new Listener() + private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener = new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener() { @Override public void onProgress(final int percent) @@ -235,14 +222,14 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity { super.onResume(); if (!isFinishing()) - LocationHelper.from(this).addListener(mLocationListener); + MwmApplication.from(this).getLocationHelper().addListener(mLocationListener); } @Override protected void onPause() { super.onPause(); - LocationHelper.from(this).removeListener(mLocationListener); + MwmApplication.from(this).getLocationHelper().removeListener(mLocationListener); if (mAlertDialog != null && mAlertDialog.isShowing()) mAlertDialog.dismiss(); mAlertDialog = null; @@ -458,8 +445,4 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity { return R.style.MwmTheme_DownloadResourcesLegacy; } - - private static native int nativeGetBytesToDownload(); - private static native int nativeStartNextFileDownload(Listener listener); - private static native void nativeCancelCurrentFile(); } diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java index 58f8e9fcc..1c00e8fdf 100644 --- a/android/app/src/main/java/app/organicmaps/MapFragment.java +++ b/android/app/src/main/java/app/organicmaps/MapFragment.java @@ -16,8 +16,10 @@ import androidx.annotation.Nullable; import androidx.core.content.res.ConfigurationHelper; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.display.DisplayType; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.display.DisplayType; +import app.organicmaps.sdk.Map; +import app.organicmaps.sdk.MapRenderingListener; +import app.organicmaps.sdk.util.log.Logger; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java b/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java index 0d0a0db50..880239f8c 100644 --- a/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java +++ b/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java @@ -7,9 +7,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.base.BaseMwmFragmentActivity; -import app.organicmaps.display.DisplayChangedListener; -import app.organicmaps.display.DisplayManager; -import app.organicmaps.display.DisplayType; +import app.organicmaps.sdk.display.DisplayChangedListener; +import app.organicmaps.sdk.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayType; public class MapPlaceholderActivity extends BaseMwmFragmentActivity implements DisplayChangedListener { diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 096fbe6fa..a946cd946 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -48,38 +48,39 @@ import app.organicmaps.backup.PeriodicBackupRunner; import app.organicmaps.base.BaseMwmFragmentActivity; import app.organicmaps.base.OnBackPressListener; import app.organicmaps.bookmarks.BookmarkCategoriesActivity; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.display.DisplayChangedListener; -import app.organicmaps.display.DisplayManager; -import app.organicmaps.display.DisplayType; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.Map; +import app.organicmaps.sdk.MapRenderingListener; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.display.DisplayChangedListener; +import app.organicmaps.sdk.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayType; import app.organicmaps.downloader.DownloaderActivity; import app.organicmaps.downloader.DownloaderFragment; -import app.organicmaps.downloader.MapManager; +import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.downloader.OnmapDownloader; -import app.organicmaps.downloader.UpdateInfo; -import app.organicmaps.editor.Editor; +import app.organicmaps.sdk.downloader.UpdateInfo; +import app.organicmaps.sdk.editor.Editor; import app.organicmaps.editor.EditorActivity; import app.organicmaps.editor.EditorHostFragment; import app.organicmaps.editor.FeatureCategoryActivity; import app.organicmaps.editor.OsmLoginActivity; -import app.organicmaps.editor.OsmOAuth; +import app.organicmaps.sdk.editor.OsmOAuth; import app.organicmaps.editor.ReportFragment; import app.organicmaps.help.HelpActivity; import app.organicmaps.intent.Factory; import app.organicmaps.intent.IntentProcessor; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.LocationState; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.SensorListener; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.LocationState; +import app.organicmaps.sdk.location.SensorListener; +import app.organicmaps.sdk.location.TrackRecorder; import app.organicmaps.location.TrackRecordingService; import app.organicmaps.maplayer.MapButtonsController; import app.organicmaps.maplayer.MapButtonsViewModel; import app.organicmaps.maplayer.ToggleMapLayerFragment; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.isolines.IsolinesState; +import app.organicmaps.sdk.maplayer.isolines.IsolinesState; import app.organicmaps.routing.ManageRouteBottomSheet; import app.organicmaps.routing.NavigationController; import app.organicmaps.routing.NavigationService; @@ -98,27 +99,27 @@ import app.organicmaps.search.SearchActivity; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.search.SearchFragment; import app.organicmaps.settings.DrivingOptionsActivity; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import app.organicmaps.settings.SettingsActivity; -import app.organicmaps.settings.UnitLocale; +import app.organicmaps.sdk.settings.UnitLocale; import app.organicmaps.leftbutton.LeftButton; import app.organicmaps.leftbutton.LeftButtonsHolder; import app.organicmaps.leftbutton.LeftToggleButton; -import app.organicmaps.util.Config; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.PowerManagment; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.PowerManagment; import app.organicmaps.util.SharingUtils; -import app.organicmaps.util.ThemeSwitcher; +import app.organicmaps.sdk.util.ThemeSwitcher; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.util.bottomsheet.MenuBottomSheetItem; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.widget.StackedButtonsDialog; import app.organicmaps.widget.menu.MainMenu; import app.organicmaps.widget.placepage.PlacePageController; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import app.organicmaps.widget.placepage.PlacePageViewModel; import com.google.android.material.appbar.MaterialToolbar; @@ -132,15 +133,16 @@ import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.POST_NOTIFICATIONS; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static app.organicmaps.location.LocationState.FOLLOW; -import static app.organicmaps.location.LocationState.FOLLOW_AND_ROTATE; -import static app.organicmaps.location.LocationState.LOCATION_TAG; +import static app.organicmaps.sdk.location.LocationState.FOLLOW; +import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE; +import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE; -import static app.organicmaps.util.PowerManagment.POWER_MANAGEMENT_TAG; -import static app.organicmaps.util.concurrency.UiThread.runLater; +import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG; +import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; + public class MwmActivity extends BaseMwmFragmentActivity implements PlacePageActivationListener, @@ -283,10 +285,8 @@ public class MwmActivity extends BaseMwmFragmentActivity checkMeasurementSystem(); } - // Called from JNI. @Override @Keep - @SuppressWarnings("unused") public void onRenderingInitializationFinished() { ThemeSwitcher.INSTANCE.restart(true); @@ -472,7 +472,7 @@ public class MwmActivity extends BaseMwmFragmentActivity private void shareMyLocation() { - final Location loc = LocationHelper.from(this).getSavedLocation(); + final Location loc = MwmApplication.from(this).getLocationHelper().getSavedLocation(); if (loc != null) { SharingUtils.shareLocation(this, loc); @@ -1140,7 +1140,7 @@ public class MwmActivity extends BaseMwmFragmentActivity LocationState.nativeSwitchToNextMode(); } - MapObject startPoint = LocationHelper.from(this).getMyPosition(); + MapObject startPoint = MwmApplication.from(this).getLocationHelper().getMyPosition(); RoutingController.get().prepare(startPoint, endPoint); // TODO: check for tablet. @@ -1295,7 +1295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity mNavigationController.refresh(); refreshLightStatusBar(); - SensorHelper.from(this).addListener(this); + MwmApplication.from(this).getSensorHelper().addListener(this); } @Override @@ -1319,7 +1319,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { if (mOnmapDownloader != null) mOnmapDownloader.onPause(); - SensorHelper.from(this).removeListener(this); + MwmApplication.from(this).getSensorHelper().removeListener(this); dismissLocationErrorDialog(); dismissAlertDialog(); super.onPause(); @@ -1332,9 +1332,9 @@ public class MwmActivity extends BaseMwmFragmentActivity Framework.nativePlacePageActivationListener(this); BookmarkManager.INSTANCE.addLoadingListener(this); RoutingController.get().attach(this); - IsolinesManager.from(getApplicationContext()).attach(this::onIsolinesStateChanged); + MwmApplication.from(getApplicationContext()).getIsolinesManager().attach(this::onIsolinesStateChanged); LocationState.nativeSetListener(this); - LocationHelper.from(this).addListener(this); + MwmApplication.from(this).getLocationHelper().addListener(this); mSearchController.attach(this); Utils.keepScreenOn(Config.isKeepScreenOnEnabled() || RoutingController.get().isNavigating(), getWindow()); } @@ -1345,13 +1345,13 @@ public class MwmActivity extends BaseMwmFragmentActivity super.onStop(); Framework.nativeRemovePlacePageActivationListener(this); BookmarkManager.INSTANCE.removeLoadingListener(this); - LocationHelper.from(this).removeListener(this); + MwmApplication.from(this).getLocationHelper().removeListener(this); if (mDisplayManager.isDeviceDisplayUsed() && !RoutingController.get().isNavigating()) { LocationState.nativeRemoveListener(); RoutingController.get().detach(); } - IsolinesManager.from(getApplicationContext()).detach(); + MwmApplication.from(getApplicationContext()).getIsolinesManager().detach(); mSearchController.detach(); Utils.keepScreenOn(false, getWindow()); @@ -1453,26 +1453,20 @@ public class MwmActivity extends BaseMwmFragmentActivity return true; } - // Called from JNI. @Override - @SuppressWarnings("unused") public void onPlacePageActivated(@NonNull PlacePageData data) { // This will open the place page mPlacePageViewModel.setMapObject((MapObject) data); } - // Called from JNI. @Override - @SuppressWarnings("unused") public void onPlacePageDeactivated() { closePlacePage(); } - // Called from JNI. @Override - @SuppressWarnings("unused") public void onSwitchFullScreenMode() { if ((mPanelAnimator != null && mPanelAnimator.isVisible()) || UiUtils.isVisible(mSearchController.getToolbar())) @@ -1542,7 +1536,7 @@ public class MwmActivity extends BaseMwmFragmentActivity mMapFragment.updateCompassOffset(offsetX, offsetY); - final double north = SensorHelper.from(this).getSavedNorth(); + final double north = MwmApplication.from(this).getSensorHelper().getSavedNorth(); if (!Double.isNaN(north)) Map.onCompassUpdated(north, true); } @@ -1627,7 +1621,7 @@ public class MwmActivity extends BaseMwmFragmentActivity // +S+F-L -> Hide // +S+F+L -> Hide - MapObject myPosition = LocationHelper.from(this).getMyPosition(); + MapObject myPosition = MwmApplication.from(this).getLocationHelper().getMyPosition(); if (myPosition != null && controller.getEndPoint() == null) { @@ -1953,7 +1947,7 @@ public class MwmActivity extends BaseMwmFragmentActivity (dialog, which) -> controller.swapPoints() : (dialog, which) -> { // The current location may change while this dialog is still shown on the screen. - final MapObject myPosition = LocationHelper.from(this).getMyPosition(); + final MapObject myPosition = MwmApplication.from(this).getLocationHelper().getMyPosition(); controller.setStartPoint(myPosition); } ) @@ -1972,7 +1966,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered()) showAddStartOrFinishFrame(controller, true); - final LocationHelper locationHelper = LocationHelper.from(this); + final LocationHelper locationHelper = MwmApplication.from(this).getLocationHelper(); // Check if location was disabled by the user. if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION) @@ -2291,7 +2285,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onUseMyPositionAsStart() { - RoutingController.get().setStartPoint(LocationHelper.from(this).getMyPosition()); + RoutingController.get().setStartPoint(MwmApplication.from(this).getLocationHelper().getMyPosition()); } @Override diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java index a3623632c..cb7f6c6d4 100644 --- a/android/app/src/main/java/app/organicmaps/MwmApplication.java +++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java @@ -1,6 +1,6 @@ package app.organicmaps; -import static app.organicmaps.location.LocationState.LOCATION_TAG; +import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG; import android.app.Activity; import android.app.Application; @@ -22,22 +22,23 @@ import java.lang.ref.WeakReference; import app.organicmaps.background.OsmUploadWork; import app.organicmaps.downloader.Android7RootCertificateWorkaround; import app.organicmaps.downloader.DownloaderNotifier; -import app.organicmaps.display.DisplayManager; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationState; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.display.DisplayManager; +import app.organicmaps.sdk.Map; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationState; +import app.organicmaps.sdk.location.SensorHelper; +import app.organicmaps.sdk.location.TrackRecorder; import app.organicmaps.location.TrackRecordingService; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; import app.organicmaps.routing.NavigationService; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.OrganicMaps; -import app.organicmaps.util.Config; -import app.organicmaps.util.ConnectionState; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.ConnectionState; import app.organicmaps.util.Utils; -import app.organicmaps.util.log.Logger; -import app.organicmaps.util.log.LogsManager; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.sdk.util.log.LogsManager; public class MwmApplication extends Application implements Application.ActivityLifecycleCallbacks { @@ -48,22 +49,6 @@ public class MwmApplication extends Application implements Application.ActivityL @NonNull private OrganicMaps mOrganicMaps; - @SuppressWarnings("NotNullFieldNotInitialized") - @NonNull - private SubwayManager mSubwayManager; - - @SuppressWarnings("NotNullFieldNotInitialized") - @NonNull - private IsolinesManager mIsolinesManager; - - @SuppressWarnings("NotNullFieldNotInitialized") - @NonNull - private LocationHelper mLocationHelper; - - @SuppressWarnings("NotNullFieldNotInitialized") - @NonNull - private SensorHelper mSensorHelper; - @SuppressWarnings("NotNullFieldNotInitialized") @NonNull private DisplayManager mDisplayManager; @@ -81,25 +66,25 @@ public class MwmApplication extends Application implements Application.ActivityL @NonNull public SubwayManager getSubwayManager() { - return mSubwayManager; + return getOrganicMaps().getSubwayManager(); } @NonNull public IsolinesManager getIsolinesManager() { - return mIsolinesManager; + return getOrganicMaps().getIsolinesManager(); } @NonNull public LocationHelper getLocationHelper() { - return mLocationHelper; + return getOrganicMaps().getLocationHelper(); } @NonNull public SensorHelper getSensorHelper() { - return mSensorHelper; + return getOrganicMaps().getSensorHelper(); } @NonNull @@ -150,10 +135,6 @@ public class MwmApplication extends Application implements Application.ActivityL TrackRecordingService.createNotificationChannel(this); registerActivityLifecycleCallbacks(this); - mSubwayManager = new SubwayManager(this); - mIsolinesManager = new IsolinesManager(this); - mLocationHelper = new LocationHelper(this); - mSensorHelper = new SensorHelper(this); mDisplayManager = new DisplayManager(); } @@ -193,7 +174,7 @@ public class MwmApplication extends Application implements Application.ActivityL { Logger.d(TAG, "activity = " + activity); Utils.showOnLockScreen(Config.isShowOnLockScreenEnabled(), activity); - mSensorHelper.setRotation(activity.getWindowManager().getDefaultDisplay().getRotation()); + getSensorHelper().setRotation(activity.getWindowManager().getDefaultDisplay().getRotation()); mTopActivity = new WeakReference<>(activity); } @@ -224,7 +205,7 @@ public class MwmApplication extends Application implements Application.ActivityL { Logger.d(TAG); - mLocationHelper.resumeLocationInForeground(); + getLocationHelper().resumeLocationInForeground(); } private void onBackground() @@ -244,7 +225,7 @@ public class MwmApplication extends Application implements Application.ActivityL else { Logger.i(LOCATION_TAG, "Stopping location in the background"); - mLocationHelper.stop(); + getLocationHelper().stop(); } } } diff --git a/android/app/src/main/java/app/organicmaps/PanelAnimator.java b/android/app/src/main/java/app/organicmaps/PanelAnimator.java index 48fb8a37d..b2c8dc136 100644 --- a/android/app/src/main/java/app/organicmaps/PanelAnimator.java +++ b/android/app/src/main/java/app/organicmaps/PanelAnimator.java @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment; import org.chromium.base.ObserverList; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; class PanelAnimator { diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index 14a7dfa91..db058a4c4 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -22,17 +22,17 @@ import androidx.core.view.OnApplyWindowInsetsListener; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import app.organicmaps.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayManager; import app.organicmaps.downloader.DownloaderActivity; import app.organicmaps.intent.Factory; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.util.Config; -import app.organicmaps.util.LocationUtils; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.LocationUtils; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.io.IOException; diff --git a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java index 322018633..84f5951ab 100644 --- a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java +++ b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java @@ -11,7 +11,7 @@ import android.webkit.WebViewClient; import androidx.annotation.NonNull; import app.organicmaps.base.OnBackPressListener; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public abstract class WebContainerDelegate implements OnBackPressListener { diff --git a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java index 52bc6ad2d..2c459e670 100644 --- a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java +++ b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java @@ -11,9 +11,9 @@ import androidx.work.WorkRequest; import androidx.work.Worker; import androidx.work.WorkerParameters; import app.organicmaps.MwmApplication; -import app.organicmaps.editor.Editor; -import app.organicmaps.editor.OsmOAuth; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.editor.OsmOAuth; +import app.organicmaps.sdk.util.log.Logger; public class OsmUploadWork extends Worker { diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java index 8073bf27f..554c14a6d 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java @@ -24,11 +24,11 @@ import com.google.android.material.appbar.MaterialToolbar; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.SplashActivity; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.util.Config; import app.organicmaps.util.RtlUtils; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java index 1de268d25..406a83cb9 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java @@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.appbar.MaterialToolbar; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; import app.organicmaps.widget.PlaceholderView; diff --git a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java index 320690b13..ae6d3b3de 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.appbar.MaterialToolbar; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java index 2b45a429f..26770e5c1 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java @@ -5,7 +5,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java index a15a30f1b..810077d35 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java @@ -12,8 +12,8 @@ import androidx.fragment.app.Fragment; import app.organicmaps.R; import app.organicmaps.base.BaseToolbarActivity; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.util.ThemeUtils; public class BookmarkCategoriesActivity extends BaseToolbarActivity diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java index 2495b9ed6..033b2e848 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java @@ -14,8 +14,8 @@ import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; import app.organicmaps.adapter.OnItemClickListener; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java index e27be1c1c..86124ce76 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java @@ -27,21 +27,21 @@ import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.adapter.OnItemClickListener; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.BookmarkSharingResult; -import app.organicmaps.bookmarks.data.KmlFileType; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult; +import app.organicmaps.sdk.bookmarks.data.KmlFileType; import app.organicmaps.dialog.EditTextDialogFragment; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.PlaceholderView; import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding; -import app.organicmaps.util.StorageUtils; +import app.organicmaps.sdk.util.StorageUtils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.util.bottomsheet.MenuBottomSheetItem; -import app.organicmaps.util.concurrency.ThreadPool; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.io.File; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java index e96c65bdc..217de687b 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java @@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragmentActivity; -import app.organicmaps.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; public class BookmarkCategorySettingsActivity extends BaseMwmFragmentActivity { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java index 65fd18b25..ced30ffcd 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java @@ -17,8 +17,8 @@ import androidx.annotation.Nullable; import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.util.Utils; import app.organicmaps.util.InputUtils; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java index 3d3749939..802033f2e 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java @@ -11,9 +11,9 @@ import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; import app.organicmaps.adapter.OnItemClickListener; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.util.UiUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java index 353df2963..f08d9e6a5 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java @@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment; import app.organicmaps.R; import app.organicmaps.base.BaseToolbarActivity; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.util.ThemeUtils; public class BookmarkListActivity extends BaseToolbarActivity diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java index 0fa81c1f3..a96d4658f 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkInfo; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.IconClickListener; -import app.organicmaps.bookmarks.data.SortedBlock; -import app.organicmaps.content.DataSource; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkInfo; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.IconClickListener; +import app.organicmaps.sdk.bookmarks.data.SortedBlock; +import app.organicmaps.sdk.content.DataSource; import app.organicmaps.widget.recycler.RecyclerClickListener; import app.organicmaps.widget.recycler.RecyclerLongClickListener; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java index 3ea364a17..687625ccb 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java @@ -26,23 +26,23 @@ import androidx.recyclerview.widget.ConcatAdapter; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; import app.organicmaps.MwmActivity; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkInfo; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.BookmarkSharingResult; -import app.organicmaps.bookmarks.data.CategoryDataSource; -import app.organicmaps.bookmarks.data.Icon; -import app.organicmaps.bookmarks.data.KmlFileType; -import app.organicmaps.bookmarks.data.SortedBlock; -import app.organicmaps.bookmarks.data.Track; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkInfo; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult; +import app.organicmaps.sdk.bookmarks.data.CategoryDataSource; +import app.organicmaps.sdk.bookmarks.data.Icon; +import app.organicmaps.sdk.bookmarks.data.KmlFileType; +import app.organicmaps.sdk.bookmarks.data.SortedBlock; +import app.organicmaps.sdk.bookmarks.data.Track; import app.organicmaps.sdk.search.BookmarkSearchListener; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.util.Graphics; import app.organicmaps.util.SharingUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; @@ -423,7 +423,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment iconsCache = new HashMap<>(); for (final BookmarkInfo bookmarkInfo : bookmarks) diff --git a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java index 126359678..07437e7ae 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java @@ -14,7 +14,7 @@ import androidx.core.graphics.drawable.IconCompat; import androidx.lifecycle.LifecycleOwner; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.UiHelpers; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java index 0771c0937..5de62152c 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java @@ -16,13 +16,13 @@ import androidx.car.app.navigation.model.MapWithContentTemplate; import androidx.core.graphics.drawable.IconCompat; import androidx.lifecycle.LifecycleOwner; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.UiHelpers; -import app.organicmaps.location.LocationHelper; import java.util.Arrays; import java.util.stream.IntStream; @@ -133,7 +133,7 @@ class SortingScreen extends BaseMapScreen @BookmarkManager.SortingType private int[] getAvailableSortingTypes() { - final Location loc = LocationHelper.from(getCarContext()).getSavedLocation(); + final Location loc = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation(); final boolean hasMyPosition = loc != null; return BookmarkManager.INSTANCE.getAvailableSortingTypes(mBookmarkCategoryId, hasMyPosition); } diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java index 6085838cb..3c35505c1 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java @@ -7,10 +7,10 @@ import androidx.annotation.NonNull; import androidx.car.app.model.Action; import androidx.lifecycle.LifecycleOwner; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen { @@ -26,7 +26,7 @@ class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen public void onResume(@NonNull LifecycleOwner owner) { // Attempting to streamline initial download by including the current country in the list of missing maps for simultaneous retrieval. - final Location location = LocationHelper.from(getCarContext()).getSavedLocation(); + final Location location = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation(); if (location == null) return; final String countryId = MapManager.nativeFindCountry(location.getLatitude(), location.getLongitude()); diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java index 75afad4d3..dc8249f6f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java @@ -11,8 +11,8 @@ import androidx.core.graphics.drawable.IconCompat; import app.organicmaps.R; import app.organicmaps.car.screens.base.BaseScreen; import app.organicmaps.car.util.Colors; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.util.StringUtils; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java index 7c899f88f..08fb2647f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.BuildConfig; -import app.organicmaps.downloader.CountryItem; +import app.organicmaps.sdk.downloader.CountryItem; import java.util.ArrayList; import java.util.Collection; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java index 1eabac471..11364553c 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java @@ -14,10 +14,10 @@ import androidx.lifecycle.LifecycleOwner; import app.organicmaps.R; import app.organicmaps.car.screens.ErrorScreen; import app.organicmaps.car.screens.base.BaseScreen; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.util.HashMap; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java index c8e934d03..f1c00c707 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java @@ -15,7 +15,7 @@ import androidx.core.app.NotificationManagerCompat; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragmentActivity; -import app.organicmaps.util.LocationUtils; +import app.organicmaps.sdk.util.LocationUtils; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java index 3b90a793b..662f7fd89 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java @@ -10,7 +10,7 @@ import androidx.car.app.CarContext; import androidx.car.app.Screen; import androidx.core.content.ContextCompat; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public class RequestPermissionsScreenBuilder { diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java index 8cd3a641e..f2a516d92 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java @@ -19,7 +19,7 @@ import app.organicmaps.car.screens.ErrorScreen; import app.organicmaps.car.screens.base.BaseScreen; import app.organicmaps.car.util.Colors; import app.organicmaps.car.util.UserActionRequired; -import app.organicmaps.util.LocationUtils; +import app.organicmaps.sdk.util.LocationUtils; import java.util.Arrays; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java index b916deaa7..1d1933069 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java @@ -24,9 +24,9 @@ import app.organicmaps.R; import app.organicmaps.car.CarAppService; import app.organicmaps.car.screens.base.BaseScreen; import app.organicmaps.car.util.UserActionRequired; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.concurrency.ThreadPool; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.util.concurrent.ExecutorService; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java index 92710669b..fa8779cc9 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java @@ -17,17 +17,17 @@ import androidx.car.app.navigation.model.MapWithContentTemplate; import androidx.core.graphics.drawable.IconCompat; import androidx.lifecycle.LifecycleOwner; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.UiHelpers; -import app.organicmaps.location.LocationHelper; import app.organicmaps.sdk.search.SearchListener; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.sdk.search.SearchResult; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; public class SearchOnMapScreen extends BaseMapScreen implements SearchListener { @@ -140,7 +140,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener { SearchEngine.INSTANCE.cancel(); - final MapObject location = LocationHelper.from(getCarContext()).getMyPosition(); + final MapObject location = MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition(); final boolean hasLocation = location != null; final double lat = hasLocation ? location.getLat() : 0; final double lon = hasLocation ? location.getLon() : 0; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java index e4dc95dac..72f1f676f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java @@ -16,16 +16,16 @@ import androidx.car.app.model.Template; import androidx.core.graphics.drawable.IconCompat; import androidx.lifecycle.LifecycleOwner; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; -import app.organicmaps.location.LocationHelper; import app.organicmaps.sdk.search.SearchListener; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.sdk.search.SearchResult; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, SearchListener { @@ -89,7 +89,7 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search return; } - final MapObject location = LocationHelper.from(getCarContext()).getMyPosition(); + final MapObject location = MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition(); final boolean hasLocation = location != null; final double lat = hasLocation ? location.getLat() : 0; final double lon = hasLocation ? location.getLon() : 0; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java index 0143983da..542d8a434 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java @@ -19,7 +19,7 @@ import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.Toggle; import app.organicmaps.car.util.UiHelpers; import app.organicmaps.sdk.routing.RoutingOptions; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import java.util.HashMap; import java.util.Map; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java index 2079f3e03..fed44a0d5 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java @@ -12,12 +12,12 @@ import androidx.car.app.model.Template; import androidx.car.app.navigation.model.MapWithContentTemplate; import app.organicmaps.BuildConfig; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.UiHelpers; -import app.organicmaps.util.DateUtils; +import app.organicmaps.sdk.util.DateUtils; public class HelpScreen extends BaseMapScreen { diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java index 2749d1ce9..962166016 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java @@ -13,14 +13,14 @@ import androidx.car.app.model.Row; import androidx.car.app.model.Template; import androidx.car.app.navigation.model.MapWithContentTemplate; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.util.ThemeUtils; import app.organicmaps.car.util.Toggle; import app.organicmaps.car.util.UiHelpers; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.util.Config; public class SettingsScreen extends BaseMapScreen { diff --git a/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java b/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java index b8c9a68c3..03585309a 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java +++ b/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java @@ -14,10 +14,9 @@ import androidx.car.app.hardware.info.CarSensors; import androidx.car.app.hardware.info.Compass; import androidx.core.content.ContextCompat; -import app.organicmaps.Map; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.Map; +import app.organicmaps.MwmApplication; +import app.organicmaps.sdk.util.log.Logger; import java.util.List; import java.util.concurrent.Executor; @@ -48,10 +47,10 @@ public class CarSensorsManager if (mIsCarCompassUsed) mCarSensors.addCompassListener(CarSensors.UPDATE_RATE_NORMAL, executor, this::onCarCompassDataAvailable); else - SensorHelper.from(mCarContext).addListener(this::onCompassUpdated); + MwmApplication.from(mCarContext).getSensorHelper().addListener(this::onCompassUpdated); - if (!LocationHelper.from(mCarContext).isActive()) - LocationHelper.from(mCarContext).start(); + if (!MwmApplication.from(mCarContext).getLocationHelper().isActive()) + MwmApplication.from(mCarContext).getLocationHelper().start(); if (mIsCarLocationUsed) mCarSensors.addCarHardwareLocationListener(CarSensors.UPDATE_RATE_FASTEST, executor, this::onCarLocationDataAvailable); @@ -62,7 +61,7 @@ public class CarSensorsManager if (mIsCarCompassUsed) mCarSensors.removeCompassListener(this::onCarCompassDataAvailable); else - SensorHelper.from(mCarContext).removeListener(this::onCompassUpdated); + MwmApplication.from(mCarContext).getSensorHelper().removeListener(this::onCompassUpdated); if (mIsCarLocationUsed) mCarSensors.removeCarHardwareLocationListener(this::onCarLocationDataAvailable); @@ -97,7 +96,7 @@ public class CarSensorsManager { final Location loc = location.getValue(); if (loc != null) - LocationHelper.from(mCarContext).onLocationChanged(loc); + MwmApplication.from(mCarContext).getLocationHelper().onLocationChanged(loc); } } @@ -113,6 +112,6 @@ public class CarSensorsManager Logger.d(TAG); mIsCarCompassUsed = false; mCarSensors.removeCompassListener(this::onCarCompassDataAvailable); - SensorHelper.from(mCarContext).addListener(this::onCompassUpdated); + MwmApplication.from(mCarContext).getSensorHelper().addListener(this::onCompassUpdated); } } diff --git a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java index 86ec576ba..442bbbd3f 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java @@ -9,8 +9,8 @@ import androidx.car.app.ScreenManager; import app.organicmaps.car.screens.download.DownloadMapsScreen; import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.routing.RoutingController; public class CurrentCountryChangedListener implements MapManager.CurrentCountryChangedListener diff --git a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java index 93e4a87da..45384cc14 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java @@ -11,19 +11,19 @@ import androidx.car.app.Screen; import androidx.car.app.ScreenManager; import androidx.car.app.notification.CarPendingIntent; -import app.organicmaps.Framework; -import app.organicmaps.Map; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.Map; import app.organicmaps.api.Const; -import app.organicmaps.api.ParsedSearchRequest; -import app.organicmaps.api.RequestType; +import app.organicmaps.sdk.api.ParsedSearchRequest; +import app.organicmaps.sdk.api.RequestType; import app.organicmaps.car.CarAppService; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.NavigationScreen; import app.organicmaps.car.screens.search.SearchScreen; -import app.organicmaps.display.DisplayManager; -import app.organicmaps.display.DisplayType; +import app.organicmaps.sdk.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayType; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public final class IntentUtils { diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java index d6829617c..5018c9360 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java @@ -16,7 +16,7 @@ public final class RoutingHelpers private RoutingHelpers() {} @NonNull - public static Distance createDistance(@NonNull final app.organicmaps.util.Distance distance) + public static Distance createDistance(@NonNull final app.organicmaps.sdk.util.Distance distance) { int displayUnit = switch (distance.mUnits) { diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java index ff88b958e..9b3d8d852 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java @@ -14,10 +14,11 @@ import androidx.car.app.navigation.model.TravelEstimate; import androidx.car.app.navigation.model.Trip; import androidx.core.graphics.drawable.IconCompat; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.LaneWay; import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.SingleLaneInfo; +import app.organicmaps.sdk.util.Distance; import app.organicmaps.util.Graphics; import app.organicmaps.widget.LanesDrawable; @@ -56,7 +57,7 @@ public final class RoutingUtils // TODO (AndrewShkrob): Use real distance and time estimates builder.addStep(createCurrentStep(context, info), createTravelEstimate(info.distToTurn, 0)); if (!TextUtils.isEmpty(info.nextStreet)) - builder.addStep(createNextStep(context, info), createTravelEstimate(app.organicmaps.util.Distance.EMPTY, 0)); + builder.addStep(createNextStep(context, info), createTravelEstimate(Distance.EMPTY, 0)); return builder.build(); } @@ -96,7 +97,7 @@ public final class RoutingUtils @SuppressWarnings("NewApi") // ZonedDateTime is backported for Android versions below 8.0. @NonNull - private static TravelEstimate createTravelEstimate(@NonNull app.organicmaps.util.Distance distance, int time) + private static TravelEstimate createTravelEstimate(@NonNull Distance distance, int time) { return new TravelEstimate.Builder(RoutingHelpers.createDistance(distance), ZonedDateTime.now().plusSeconds(time)) .setRemainingTimeSeconds(time) diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java index 957c73cd5..5abea9162 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java @@ -9,7 +9,6 @@ import androidx.annotation.StringRes; import androidx.annotation.UiThread; import androidx.car.app.CarContext; -import app.organicmaps.Framework; import app.organicmaps.R; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.MapStyle; diff --git a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java index dc63b14b9..843043839 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java @@ -14,18 +14,19 @@ import androidx.car.app.model.Row; import androidx.car.app.navigation.model.MapController; import androidx.core.graphics.drawable.IconCompat; -import app.organicmaps.Map; +import app.organicmaps.sdk.Map; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.screens.settings.SettingsScreen; -import app.organicmaps.editor.OpeningHours; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationState; -import app.organicmaps.util.LocationUtils; +import app.organicmaps.sdk.editor.OpeningHours; +import app.organicmaps.sdk.editor.data.Timetable; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationState; +import app.organicmaps.sdk.util.LocationUtils; import app.organicmaps.util.Utils; import java.util.Calendar; @@ -180,7 +181,7 @@ public final class UiHelpers builder.setIcon(icon); builder.setOnClickListener(() -> { LocationState.nativeSwitchToNextMode(); - final LocationHelper locationHelper = LocationHelper.from(context); + final LocationHelper locationHelper = MwmApplication.from(context).getLocationHelper(); if (!locationHelper.isActive() && LocationUtils.checkFineLocationPermission(context)) locationHelper.start(); }); diff --git a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java index d317e955c..9f17f6968 100644 --- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java @@ -24,7 +24,7 @@ import com.google.android.material.textfield.TextInputEditText; import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; public class EditTextDialogFragment extends BaseMwmDialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java b/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java index 277d5b622..a8e1c9b8a 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java +++ b/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java @@ -15,7 +15,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; import app.organicmaps.R; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; // Fix missing root certificates for HTTPS connections on Android 7 and below: // https://community.letsencrypt.org/t/letsencrypt-certificates-fails-on-android-phones-running-android-7-or-older/205686 diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java index c3710c084..bc93f7a49 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java +++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java @@ -1,14 +1,27 @@ package app.organicmaps.downloader; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_APPLYING; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_DONE; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_DOWNLOADABLE; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_ENQUEUED; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_FAILED; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_PARTLY; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_PROGRESS; +import static app.organicmaps.sdk.downloader.CountryItem.STATUS_UPDATABLE; + import android.view.View; import com.google.android.material.button.MaterialButton; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import app.organicmaps.R; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; -import static app.organicmaps.downloader.CountryItem.*; +import app.organicmaps.R; + +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.downloader.UpdateInfo; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; + class BottomPanel { diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java index ccf8ed8b4..7806148ae 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java +++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java @@ -14,13 +14,15 @@ import androidx.fragment.app.FragmentActivity; import com.google.android.material.button.MaterialButton; import com.google.android.material.textview.MaterialTextView; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragment; import app.organicmaps.base.BaseMwmFragmentActivity; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.widget.WheelProgressView; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.List; @@ -115,7 +117,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl { super.onResume(); - Location loc = LocationHelper.from(requireContext()).getSavedLocation(); + Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (loc != null) { String id = MapManager.nativeFindCountry(loc.getLatitude(), loc.getLongitude()); diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java index f265e91c1..6b1d0cce4 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java +++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java @@ -19,11 +19,13 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.MwmActivity; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.util.bottomsheet.MenuBottomSheetItem; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -580,7 +582,7 @@ class DownloaderAdapter extends RecyclerView.Adapter { diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java index 92cc82c2a..292452b0c 100644 --- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java @@ -1,5 +1,7 @@ package app.organicmaps.editor; +import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType; + import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -11,10 +13,11 @@ import androidx.annotation.Nullable; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.editor.data.FeatureCategory; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.editor.data.FeatureCategory; import app.organicmaps.widget.SearchToolbarController; import app.organicmaps.widget.ToolbarController; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; import app.organicmaps.util.Utils; import java.util.Arrays; @@ -91,7 +94,7 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment { diff --git a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java index 261eff5df..26caecd95 100644 --- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java @@ -6,7 +6,8 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.editor.data.Language; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.editor.data.Language; import java.util.ArrayList; import java.util.Collections; diff --git a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java index 1d781f56b..97cd905a0 100644 --- a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java @@ -10,10 +10,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputEditText; import app.organicmaps.R; -import app.organicmaps.editor.data.Language; -import app.organicmaps.editor.data.LocalizedName; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.editor.data.Language; +import app.organicmaps.sdk.editor.data.LocalizedName; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java index 761a40d27..7494f6ccb 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java @@ -12,17 +12,18 @@ import android.widget.ScrollView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; -import app.organicmaps.util.Constants; -import app.organicmaps.util.DateUtils; +import app.organicmaps.sdk.editor.OsmOAuth; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; -import app.organicmaps.util.concurrency.ThreadPool; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.concurrency.UiThread; import com.google.android.material.button.MaterialButton; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java index a49084391..a0890ebb3 100644 --- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java @@ -12,8 +12,9 @@ import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputEditText; import app.organicmaps.R; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java index 2db1f724e..e7ec88a6a 100644 --- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java @@ -14,11 +14,12 @@ import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.OsmOAuth; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; -import app.organicmaps.util.concurrency.ThreadPool; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.concurrency.UiThread; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; diff --git a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java index 995d91656..eb1686f47 100644 --- a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java @@ -11,7 +11,8 @@ import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; import com.google.android.material.textfield.TextInputEditText; diff --git a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java index e9810e3d6..9203e23de 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java @@ -12,7 +12,7 @@ import com.google.android.material.radiobutton.MaterialRadioButton; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.util.Utils; +import app.organicmaps.sdk.util.Utils; public class SelfServiceAdapter extends RecyclerView.Adapter { diff --git a/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java b/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java index dc03c79cd..f668a6e67 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java @@ -10,7 +10,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.bookmarks.data.Metadata; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.editor.Editor; public class SelfServiceFragment extends BaseMwmRecyclerFragment { diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java index f019b941b..95720a6d1 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java @@ -19,11 +19,12 @@ import com.google.android.material.checkbox.MaterialCheckBox; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.editor.data.HoursMinutes; -import app.organicmaps.editor.data.TimeFormatUtils; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.OpeningHours; +import app.organicmaps.sdk.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.TimeFormatUtils; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; +import app.organicmaps.sdk.util.UiUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java index 0f8032bd8..482286e5e 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java @@ -10,7 +10,7 @@ import androidx.annotation.Nullable; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.HoursMinutes; public class SimpleTimetableFragment extends BaseMwmRecyclerFragment implements TimetableProvider, diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java index 2ccc6bbf6..4ca4b43dc 100644 --- a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java @@ -14,8 +14,8 @@ import com.google.android.material.textview.MaterialTextView; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.dialog.EditTextDialogFragment; -import app.organicmaps.editor.data.LocalizedStreet; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.data.LocalizedStreet; +import app.organicmaps.sdk.util.UiUtils; public class StreetAdapter extends RecyclerView.Adapter { diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java b/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java index cc5966be0..23b7243dc 100644 --- a/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java @@ -13,7 +13,8 @@ import androidx.annotation.Nullable; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.dialog.EditTextDialogFragment; -import app.organicmaps.editor.data.LocalizedStreet; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.sdk.editor.data.LocalizedStreet; public class StreetFragment extends BaseMwmRecyclerFragment { diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java index 9b01da328..b4478cb07 100644 --- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java @@ -16,7 +16,8 @@ import androidx.fragment.app.FragmentActivity; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.OpeningHours; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textview.MaterialTextView; diff --git a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java index 38f3d0737..b07b1f045 100644 --- a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java @@ -12,7 +12,7 @@ import androidx.core.view.ViewCompat; import app.organicmaps.R; import app.organicmaps.WebContainerDelegate; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.util.Constants; import app.organicmaps.util.WindowInsetUtils; public class CopyrightFragment extends BaseMwmFragment diff --git a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java index b0c329c44..ac4f26b8c 100644 --- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java @@ -15,7 +15,7 @@ import androidx.core.view.ViewCompat; import app.organicmaps.R; import app.organicmaps.WebContainerDelegate; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.util.Constants; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java index 34b805550..458d59a7a 100644 --- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java @@ -15,12 +15,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import app.organicmaps.BuildConfig; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.util.Config; -import app.organicmaps.util.Constants; -import app.organicmaps.util.DateUtils; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.util.Graphics; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.Utils; diff --git a/android/app/src/main/java/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java index 0fd3c867e..acc862a52 100644 --- a/android/app/src/main/java/app/organicmaps/intent/Factory.java +++ b/android/app/src/main/java/app/organicmaps/intent/Factory.java @@ -7,23 +7,23 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.core.content.IntentCompat; -import app.organicmaps.Framework; -import app.organicmaps.Map; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.Map; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; -import app.organicmaps.api.ParsedRoutingData; -import app.organicmaps.api.ParsedSearchRequest; -import app.organicmaps.api.RequestType; -import app.organicmaps.api.RoutePoint; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.api.ParsedRoutingData; +import app.organicmaps.sdk.api.ParsedSearchRequest; +import app.organicmaps.sdk.api.RequestType; +import app.organicmaps.sdk.api.RoutePoint; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.editor.OsmLoginActivity; import app.organicmaps.routing.RoutingController; import app.organicmaps.search.SearchActivity; import app.organicmaps.sdk.search.SearchEngine; -import app.organicmaps.util.StorageUtils; -import app.organicmaps.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.concurrency.ThreadPool; import java.io.File; import java.util.Collections; diff --git a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java index dc2d564db..23d9e66f5 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java +++ b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java @@ -23,8 +23,11 @@ import androidx.core.content.ContextCompat; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.TrackRecorder; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.POST_NOTIFICATIONS; @@ -54,7 +57,7 @@ public class TrackRecordingService extends Service implements LocationListener { if (!TrackRecorder.nativeIsTrackRecordingEnabled()) TrackRecorder.nativeStartTrackRecording(); - LocationHelper.from(context).restartWithNewMode(); + MwmApplication.from(context).getLocationHelper().restartWithNewMode(); ContextCompat.startForegroundService(context, new Intent(context, TrackRecordingService.class)); } @@ -130,7 +133,7 @@ public class TrackRecordingService extends Service implements LocationListener mWarningBuilder = null; if (TrackRecorder.nativeIsTrackRecordingEnabled()) TrackRecorder.nativeStopTrackRecording(); - LocationHelper.from(this).removeListener(this); + MwmApplication.from(this).getLocationHelper().removeListener(this); // The notification is cancelled automatically by the system. } @@ -181,7 +184,7 @@ public class TrackRecordingService extends Service implements LocationListener Logger.e(TAG, "Failed to promote the service to foreground", e); } - final LocationHelper locationHelper = LocationHelper.from(this); + final LocationHelper locationHelper = MwmApplication.from(this).getLocationHelper(); // Subscribe to location updates. This call is idempotent. locationHelper.addListener(this); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java index 5ac9eb47d..167a5485a 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java @@ -9,6 +9,7 @@ import androidx.annotation.StringRes; import app.organicmaps.R; import app.organicmaps.adapter.OnItemClickListener; +import app.organicmaps.sdk.maplayer.Mode; import app.organicmaps.util.ThemeUtils; public class LayerBottomSheetItem diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java index 7f2d02876..eeef5f9c4 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java @@ -9,8 +9,8 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java index ad022fd86..414dbaccf 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java @@ -1,5 +1,7 @@ package app.organicmaps.maplayer; +import app.organicmaps.sdk.maplayer.Mode; + import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index c80f397e0..2fc6851c0 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -24,21 +24,21 @@ import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.R; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.downloader.UpdateInfo; -import app.organicmaps.location.TrackRecorder; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.downloader.UpdateInfo; +import app.organicmaps.sdk.location.TrackRecorder; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.routing.RoutingController; import app.organicmaps.leftbutton.LeftButton; import app.organicmaps.leftbutton.LeftToggleButton; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.util.Config; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.menu.MyPositionButton; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java index ab3bf73de..61ed9c633 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java @@ -3,7 +3,7 @@ package app.organicmaps.maplayer; import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.location.TrackRecorder; public class MapButtonsViewModel extends ViewModel { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java index 077534ab8..69a11d194 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java @@ -18,8 +18,8 @@ import app.organicmaps.R; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.util.Graphics; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; public class SearchWheel implements View.OnClickListener { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java index 84ded9f3b..4998a1617 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java @@ -11,9 +11,11 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.util.SharedPropertiesUtils; +import app.organicmaps.sdk.maplayer.Mode; +import app.organicmaps.sdk.util.SharedPropertiesUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.widget.recycler.SpanningLinearLayoutManager; @@ -74,7 +76,7 @@ public class ToggleMapLayerFragment extends Fragment mode.setEnabled(context, !mode.isEnabled(context)); mAdapter.notifyDataSetChanged(); mMapButtonsController.updateLayerButton(); - if (IsolinesManager.from(context).shouldShowNotification()) + if (MwmApplication.from(context).getIsolinesManager().shouldShowNotification()) Utils.showSnackbar(context, v.getRootView(), R.string.isolines_toast_zooms_1_10); } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java index edfd31a18..4d269c61d 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java @@ -13,7 +13,7 @@ import androidx.core.content.res.ResourcesCompat; import app.organicmaps.R; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java index a39e74c25..138551c74 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.R; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.util.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java index 830271a0e..d63c2ad3f 100644 --- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java @@ -17,9 +17,9 @@ import androidx.appcompat.app.AlertDialog; import app.organicmaps.R; import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter; import app.organicmaps.base.BaseMwmDialogFragment; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java index b8976aced..dcd89472c 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java +++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java @@ -16,11 +16,11 @@ import androidx.appcompat.content.res.AppCompatResources; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java index 9456259bf..b751eebf2 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java +++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java @@ -16,12 +16,12 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.RouteMarkData; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java index c3d5a9fb3..9ef0d3fc8 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java @@ -13,16 +13,16 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.maplayer.MapButtonsViewModel; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.sdk.Router; import app.organicmaps.sdk.routing.CarDirection; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.LanesView; @@ -261,7 +261,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, private void updateSpeedLimit(@NonNull final RoutingInfo info) { - final Location location = LocationHelper.from(mFrame.getContext()).getSavedLocation(); + final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation(); if (location == null) { mSpeedLimit.setSpeedLimit(0, false); return; diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java index 4bec7926d..d00207432 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java @@ -4,7 +4,7 @@ import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.POST_NOTIFICATIONS; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static app.organicmaps.util.Constants.Vendor.XIAOMI; +import static app.organicmaps.sdk.util.Constants.Vendor.XIAOMI; import android.annotation.SuppressLint; import android.app.ForegroundServiceStartNotAllowedException; @@ -31,19 +31,19 @@ import androidx.core.app.NotificationManagerCompat; import androidx.core.app.ServiceCompat; import androidx.core.content.ContextCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.sound.MediaPlayerWrapper; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.sound.TtsPlayer; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.sound.MediaPlayerWrapper; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.sound.TtsPlayer; +import app.organicmaps.sdk.util.Config; import app.organicmaps.util.Graphics; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; public class NavigationService extends Service implements LocationListener { @@ -179,7 +179,7 @@ public class NavigationService extends Service implements LocationListener mNotificationBuilder = null; mCarNotificationExtender = null; - LocationHelper.from(this).removeListener(this); + MwmApplication.from(this).getLocationHelper().removeListener(this); TtsPlayer.INSTANCE.stop(); // The notification is cancelled automatically by the system. @@ -247,7 +247,7 @@ public class NavigationService extends Service implements LocationListener Logger.e(TAG, "Failed to promote the service to foreground", e); } - final LocationHelper locationHelper = LocationHelper.from(this); + final LocationHelper locationHelper = MwmApplication.from(this).getLocationHelper(); // Subscribe to location updates. This call is idempotent. locationHelper.addListener(this); @@ -288,7 +288,7 @@ public class NavigationService extends Service implements LocationListener if (Framework.nativeIsRouteFinished()) { routingController.cancel(); - LocationHelper.from(this).restartWithNewMode(); + MwmApplication.from(this).getLocationHelper().restartWithNewMode(); stopSelf(); return; } diff --git a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java index cda873245..f6bcf80b4 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java +++ b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java @@ -9,45 +9,27 @@ import androidx.annotation.StringRes; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.routing.ResultCodes; import java.util.ArrayList; import java.util.List; public class ResultCodesHelper { - // Codes correspond to native routing::RouterResultCode in routing/routing_callbacks.hpp - static final int NO_ERROR = 0; - static final int CANCELLED = 1; - static final int NO_POSITION = 2; - private static final int INCONSISTENT_MWM_ROUTE = 3; - private static final int ROUTING_FILE_NOT_EXIST = 4; - private static final int START_POINT_NOT_FOUND = 5; - private static final int END_POINT_NOT_FOUND = 6; - private static final int DIFFERENT_MWM = 7; - private static final int ROUTE_NOT_FOUND = 8; - private static final int NEED_MORE_MAPS = 9; - private static final int INTERNAL_ERROR = 10; - private static final int FILE_TOO_OLD = 11; - private static final int INTERMEDIATE_POINT_NOT_FOUND = 12; - private static final int TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK = 13; - private static final int TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN = 14; - private static final int ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR = 15; - static final int HAS_WARNINGS = 16; @NonNull public static ResourcesHolder getDialogTitleSubtitle(@NonNull Context context, - int errorCode, int missingCount) + int errorCode, int missingCount) { - Resources resources = MwmApplication.from(context).getResources(); + Resources resources = context.getResources(); int titleRes = 0; List messages = new ArrayList<>(); @StringRes int cancelBtnResId = android.R.string.cancel; switch (errorCode) { - case NO_POSITION: - if (!LocationHelper.from(context).isActive()) + case ResultCodes.NO_POSITION: + if (!MwmApplication.from(context).getLocationHelper().isActive()) { titleRes = R.string.dialog_routing_location_turn_on; messages.add(resources.getString(R.string.dialog_routing_location_unknown_turn_on)); @@ -59,42 +41,42 @@ public class ResultCodesHelper messages.add(resources.getString(R.string.dialog_routing_location_turn_wifi)); } break; - case INCONSISTENT_MWM_ROUTE: - case ROUTING_FILE_NOT_EXIST: + case ResultCodes.INCONSISTENT_MWM_ROUTE: + case ResultCodes.ROUTING_FILE_NOT_EXIST: titleRes = R.string.routing_download_maps_along; messages.add(resources.getString(R.string.routing_requires_all_map)); break; - case START_POINT_NOT_FOUND: + case ResultCodes.START_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_start; messages.add(resources.getString(R.string.dialog_routing_start_not_determined)); messages.add(resources.getString(R.string.dialog_routing_select_closer_start)); break; - case END_POINT_NOT_FOUND: + case ResultCodes.END_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_end; messages.add(resources.getString(R.string.dialog_routing_end_not_determined)); messages.add(resources.getString(R.string.dialog_routing_select_closer_end)); break; - case INTERMEDIATE_POINT_NOT_FOUND: + case ResultCodes.INTERMEDIATE_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_intermediate; messages.add(resources.getString(R.string.dialog_routing_intermediate_not_determined)); break; - case DIFFERENT_MWM: + case ResultCodes.DIFFERENT_MWM: messages.add(resources.getString(R.string.routing_failed_cross_mwm_building)); break; - case FILE_TOO_OLD: + case ResultCodes.FILE_TOO_OLD: titleRes = R.string.downloader_update_maps; messages.add(resources.getString(R.string.downloader_mwm_migration_dialog)); break; - case TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK: + case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK: messages.add(resources.getString(R.string.transit_not_found)); break; - case TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN: + case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN: titleRes = R.string.dialog_pedestrian_route_is_long_header; messages.add(resources.getString(R.string.dialog_pedestrian_route_is_long_message)); cancelBtnResId = R.string.ok; break; - case ROUTE_NOT_FOUND: - case ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR: + case ResultCodes.ROUTE_NOT_FOUND: + case ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR: if (missingCount == 0) { titleRes = R.string.dialog_routing_unable_locate_route; @@ -107,12 +89,12 @@ public class ResultCodesHelper messages.add(resources.getString(R.string.routing_requires_all_map)); } break; - case INTERNAL_ERROR: + case ResultCodes.INTERNAL_ERROR: titleRes = R.string.dialog_routing_system_error; messages.add(resources.getString(R.string.dialog_routing_application_error)); messages.add(resources.getString(R.string.dialog_routing_try_again)); break; - case NEED_MORE_MAPS: + case ResultCodes.NEED_MORE_MAPS: titleRes = R.string.dialog_routing_download_and_build_cross_route; messages.add(resources.getString(R.string.dialog_routing_download_cross_route)); break; @@ -139,20 +121,19 @@ public class ResultCodesHelper return switch (resultCode) { - case INCONSISTENT_MWM_ROUTE, - ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR, - ROUTING_FILE_NOT_EXIST, - NEED_MORE_MAPS, - ROUTE_NOT_FOUND, - FILE_TOO_OLD -> - true; + case ResultCodes.INCONSISTENT_MWM_ROUTE, + ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR, + ResultCodes.ROUTING_FILE_NOT_EXIST, + ResultCodes.NEED_MORE_MAPS, + ResultCodes.ROUTE_NOT_FOUND, + ResultCodes.FILE_TOO_OLD -> true; default -> false; }; } public static boolean isMoreMapsNeeded(int resultCode) { - return resultCode == NEED_MORE_MAPS; + return resultCode == ResultCodes.NEED_MORE_MAPS; } public static class ResourcesHolder diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java index faf2b85b2..30b176790 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java @@ -31,19 +31,19 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.sdk.routing.TransitStepInfo; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; import app.organicmaps.util.Graphics; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.widget.recycler.DotDividerItemDecoration; import app.organicmaps.widget.recycler.MultilineLayoutManager; @@ -266,7 +266,7 @@ final class RoutingBottomMenuController implements View.OnClickListener UiUtils.show(mActionFrame); mActionMessage.setText(R.string.routing_add_start_point); mActionMessage.setTag(RouteMarkType.Start); - if (LocationHelper.from(mContext).getMyPosition() != null) + if (MwmApplication.from(mContext).getLocationHelper().getMyPosition() != null) { UiUtils.show(mActionButton); Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair); diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java index 04ee5ca15..f725b9636 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java @@ -11,12 +11,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.util.Pair; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.Router; +import app.organicmaps.sdk.routing.ResultCodes; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutePointInfo; @@ -28,10 +29,10 @@ import app.organicmaps.sdk.routing.RoutingOptions; import app.organicmaps.sdk.routing.RoutingProgressListener; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.widget.placepage.CoordinatesFormat; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.time.LocalTime; import java.util.concurrent.TimeUnit; @@ -118,12 +119,12 @@ public class RoutingController mLastMissingMaps = missingMaps; mContainsCachedResult = true; - if (mLastResultCode == ResultCodesHelper.NO_ERROR + if (mLastResultCode == ResultCodes.NO_ERROR || ResultCodesHelper.isMoreMapsNeeded(mLastResultCode)) { onBuiltRoute(); } - else if (mLastResultCode == ResultCodesHelper.HAS_WARNINGS) + else if (mLastResultCode == ResultCodes.HAS_WARNINGS) { onBuiltRoute(); if (mContainer != null) @@ -172,13 +173,13 @@ public class RoutingController if (isDrivingOptionsBuildError()) mContainer.onDrivingOptionsWarning(); - if (mLastResultCode == ResultCodesHelper.NO_ERROR || mLastResultCode == ResultCodesHelper.HAS_WARNINGS) + if (mLastResultCode == ResultCodes.NO_ERROR || mLastResultCode == ResultCodes.HAS_WARNINGS) { updatePlan(); return; } - if (mLastResultCode == ResultCodesHelper.CANCELLED) + if (mLastResultCode == ResultCodes.CANCELLED) { setBuildState(BuildState.NONE); updatePlan(); @@ -264,7 +265,7 @@ public class RoutingController Framework.nativeSetRouteProgressListener(mRoutingProgressListener); Framework.nativeSetRoutingRecommendationListener(recommendation -> UiThread.run(() -> { if (recommendation == RouteRecommendationType.RebuildAfterPointsLoading) - setStartPoint(LocationHelper.from(context).getMyPosition()); + setStartPoint(MwmApplication.from(context).getLocationHelper().getMyPosition()); })); Framework.nativeSetRoutingLoadPointsListener(mRoutingLoadPointsListener); } diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java index bb5370cbe..6a7005007 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java @@ -17,9 +17,9 @@ import androidx.fragment.app.FragmentFactory; import androidx.fragment.app.FragmentManager; import app.organicmaps.R; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.util.UiUtils; public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java index 976fe7a9d..4cb6f304d 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java @@ -11,10 +11,10 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentFactory; import app.organicmaps.R; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.widget.WheelProgressView; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.HashSet; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java index 418ba01b3..a3c6ef7c7 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java @@ -15,7 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.sdk.Router; @@ -23,7 +23,7 @@ import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.RoutingOptions; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.settings.DrivingOptionsActivity; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.widget.RoutingToolbarButton; import app.organicmaps.widget.ToolbarController; diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java index d71c97332..7ae606f64 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import app.organicmaps.MwmActivity; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class RoutingPlanInplaceController extends RoutingPlanController { diff --git a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java new file mode 100644 index 000000000..58c2558c2 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java @@ -0,0 +1,30 @@ +package app.organicmaps.sdk; + +import androidx.annotation.Keep; + +public class DownloadResourcesLegacyActivity +{ + // Error codes, should match the same codes in JNI + public static final int ERR_DOWNLOAD_SUCCESS = 0; + public static final int ERR_DISK_ERROR = -1; + public static final int ERR_NOT_ENOUGH_FREE_SPACE = -2; + public static final int ERR_STORAGE_DISCONNECTED = -3; + public static final int ERR_DOWNLOAD_ERROR = -4; + public static final int ERR_NO_MORE_FILES = -5; + public static final int ERR_FILE_IN_PROGRESS = -6; + + public interface Listener + { + // Called by JNI. + @Keep + void onProgress(int percent); + + // Called by JNI. + @Keep + void onFinish(int errorCode); + } + + public static native int nativeGetBytesToDownload(); + public static native int nativeStartNextFileDownload(Listener listener); + public static native void nativeCancelCurrentFile(); +} diff --git a/android/app/src/main/java/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/sdk/Framework.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/Framework.java rename to android/app/src/main/java/app/organicmaps/sdk/Framework.java index fabb98bdd..6724e6f83 100644 --- a/android/app/src/main/java/app/organicmaps/Framework.java +++ b/android/app/src/main/java/app/organicmaps/sdk/Framework.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import android.graphics.Bitmap; @@ -7,24 +7,23 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import app.organicmaps.api.ParsedRoutingData; -import app.organicmaps.api.ParsedSearchRequest; -import app.organicmaps.api.RequestType; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.api.ParsedRoutingData; +import app.organicmaps.sdk.api.ParsedSearchRequest; +import app.organicmaps.sdk.api.RequestType; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.JunctionInfo; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.TransitRouteInfo; -import app.organicmaps.sdk.PlacePageActivationListener; import app.organicmaps.sdk.routing.RoutingListener; import app.organicmaps.sdk.routing.RoutingLoadPointsListener; import app.organicmaps.sdk.routing.RoutingProgressListener; import app.organicmaps.sdk.routing.RoutingRecommendationListener; -import app.organicmaps.settings.SettingsPrefsFragment; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.settings.SpeedCameraMode; +import app.organicmaps.sdk.util.Constants; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -88,7 +87,7 @@ public class Framework return Bitmap.createBitmap(altitudeChartBits, width, height, Bitmap.Config.ARGB_8888); } - public static void setSpeedCamerasMode(@NonNull SettingsPrefsFragment.SpeedCameraMode mode) + public static void setSpeedCamerasMode(@NonNull SpeedCameraMode mode) { nativeSetSpeedCamManagerMode(mode.ordinal()); } diff --git a/android/app/src/main/java/app/organicmaps/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/Map.java rename to android/app/src/main/java/app/organicmaps/sdk/Map.java index 96d4da028..a8821327d 100644 --- a/android/app/src/main/java/app/organicmaps/Map.java +++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import android.content.Context; import android.graphics.Rect; @@ -7,13 +7,16 @@ import android.view.Surface; import androidx.annotation.Nullable; -import app.organicmaps.display.DisplayType; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.util.Config; -import app.organicmaps.util.ROMUtils; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.BuildConfig; +import app.organicmaps.MwmApplication; +import app.organicmaps.R; +import app.organicmaps.sdk.display.DisplayType; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.ROMUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; public final class Map { @@ -168,7 +171,7 @@ public final class Map mRequireResize = false; setupWidgets(context, surfaceFrame.width(), surfaceFrame.height()); - final LocationHelper locationHelper = LocationHelper.from(context); + final LocationHelper locationHelper = MwmApplication.from(context).getLocationHelper(); final boolean firstStart = locationHelper.isInFirstRun(); if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, @@ -267,7 +270,7 @@ public final class Map nativeResumeSurfaceRendering(); } - boolean isContextCreated() + public boolean isContextCreated() { return mSurfaceCreated; } diff --git a/android/app/src/main/java/app/organicmaps/MapRenderingListener.java b/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/MapRenderingListener.java rename to android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java index 779e661db..7ee808eb1 100644 --- a/android/app/src/main/java/app/organicmaps/MapRenderingListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java index a4fdf61b2..36219c8e3 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java +++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java @@ -8,20 +8,22 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.location.SensorHelper; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.routing.RoutingController; +import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.settings.StoragePathManager; -import app.organicmaps.sound.TtsPlayer; -import app.organicmaps.util.Config; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.StorageUtils; -import app.organicmaps.util.ThemeSwitcher; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.sound.TtsPlayer; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.ThemeSwitcher; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.log.Logger; import java.io.IOException; @@ -32,9 +34,43 @@ public final class OrganicMaps implements DefaultLifecycleObserver @NonNull private final Context mContext; + @NonNull + private final IsolinesManager mIsolinesManager; + @NonNull + private final SubwayManager mSubwayManager; + + @NonNull + private final LocationHelper mLocationHelper; + @NonNull + private final SensorHelper mSensorHelper; + private volatile boolean mFrameworkInitialized; private volatile boolean mPlatformInitialized; + @NonNull + public LocationHelper getLocationHelper() + { + return mLocationHelper; + } + + @NonNull + public SensorHelper getSensorHelper() + { + return mSensorHelper; + } + + @NonNull + public SubwayManager getSubwayManager() + { + return mSubwayManager; + } + + @NonNull + public IsolinesManager getIsolinesManager() + { + return mIsolinesManager; + } + public OrganicMaps(@NonNull Context context) { mContext = context.getApplicationContext(); @@ -48,6 +84,11 @@ public final class OrganicMaps implements DefaultLifecycleObserver nativeSetSettingsDir(settingsPath); Config.init(mContext); + + mLocationHelper = new LocationHelper(mContext); + mSensorHelper = new SensorHelper(mContext); + mIsolinesManager = new IsolinesManager(mContext); + mSubwayManager = new SubwayManager(mContext); } /** @@ -128,8 +169,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver ThemeSwitcher.INSTANCE.restart(false); RoutingController.get().initialize(mContext); TrafficManager.INSTANCE.initialize(); - SubwayManager.from(mContext).initialize(); - IsolinesManager.from(mContext).initialize(); + mSubwayManager.initialize(); + mIsolinesManager.initialize(); ProcessLifecycleOwner.get().getLifecycle().addObserver(this); Logger.i(TAG, "Framework initialized"); diff --git a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java b/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java index 0d7779d18..d801500dd 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java @@ -3,7 +3,7 @@ package app.organicmaps.sdk; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; public interface PlacePageActivationListener { diff --git a/android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java rename to android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java index 485ccdb02..c57a4c0dc 100644 --- a/android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java rename to android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java index 2b98aed59..057cbc647 100644 --- a/android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/api/RequestType.java b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/api/RequestType.java rename to android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java index a60f5dc55..d2e9e5a54 100644 --- a/android/app/src/main/java/app/organicmaps/api/RequestType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.IntDef; diff --git a/android/app/src/main/java/app/organicmaps/api/RoutePoint.java b/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/api/RoutePoint.java rename to android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java index 0c6f8876b..cdf4c30a0 100644 --- a/android/app/src/main/java/app/organicmaps/api/RoutePoint.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java index ddb4b22f8..66d44a327 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.annotation.SuppressLint; import android.os.Parcel; @@ -9,10 +9,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.os.ParcelCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.routing.RoutePointInfo; import app.organicmaps.sdk.search.Popularity; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.util.Constants; // TODO consider refactoring to remove hack with MapObject unmarshalling itself and Bookmark at the same time. // Used by JNI. diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java similarity index 88% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java index 3415aca60..401cbda1d 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java index a4cca225d..0b89b2741 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java index e5db93b57..3137b9386 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java @@ -1,12 +1,12 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.IntRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.util.Distance; -import app.organicmaps.util.GeoUtils; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.util.Distance; +import app.organicmaps.sdk.util.GeoUtils; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java index 29fc2e813..b622e06f7 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.content.ContentResolver; import android.database.Cursor; @@ -12,12 +12,12 @@ import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.bookmarks.DataChangedListener; -import app.organicmaps.util.KeyValue; -import app.organicmaps.util.StorageUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.KeyValue; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.io.File; import java.io.IOException; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java index 9727fc4a5..84edd7a59 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.IntDef; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java index dcf2d20bd..064b1c812 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java index 48399dd34..0d142e770 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java @@ -1,9 +1,9 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.content.DataSource; +import app.organicmaps.sdk.content.DataSource; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java index 136769594..8b4513364 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java similarity index 83% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java index a2abb600c..a2b12c47c 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java @@ -1,8 +1,8 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Used by JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java index 8693dfe92..8777ae809 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; @@ -6,7 +6,7 @@ import android.os.Parcelable; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java index b7c2aa9ab..71bb0cc27 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java index cafa66568..448d83c7b 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java index bbb3f356e..e631dfbdd 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java index 0866fb872..2d7df8321 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import com.google.android.material.imageview.ShapeableImageView; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java similarity index 73% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java index 61e7ff31c..08840d0c4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; // Need to be in sync with KmlFileType (map/bookmark_helpers.hpp) public enum KmlFileType { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java index 8da50e0e7..f645137ca 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.net.Uri; import android.os.Parcel; @@ -12,7 +12,7 @@ import androidx.core.os.ParcelCompat; import app.organicmaps.sdk.routing.RoutePointInfo; import app.organicmaps.sdk.search.Popularity; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java index d7f6aa7a6..ed021334f 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java index 36e778b54..33f3b3730 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java index 97095c4b0..363f65197 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java similarity index 62% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java index 23164de84..3dd4d9ab4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; public enum RoadWarningMarkType { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java index be1ed9e25..e51186ce4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java index 8646c700f..4e84c4ac7 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java @@ -1,8 +1,8 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/content/DataSource.java b/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java similarity index 76% rename from android/app/src/main/java/app/organicmaps/content/DataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java index de246bb6b..1cfe996ea 100644 --- a/android/app/src/main/java/app/organicmaps/content/DataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java @@ -1,4 +1,4 @@ -package app.organicmaps.content; +package app.organicmaps.sdk.content; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java similarity index 87% rename from android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java index ba0c656e9..391effdcc 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayManager.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/display/DisplayManager.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java index 14e810e2b..9d8796639 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; import android.content.Context; import android.os.Handler; @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.MwmApplication; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayType.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java similarity index 54% rename from android/app/src/main/java/app/organicmaps/display/DisplayType.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java index 478e90f25..36fb54463 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; public enum DisplayType { diff --git a/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java index 610f41400..c4e01c471 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java @@ -1,14 +1,15 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.os.AsyncTask; import android.util.Base64; import androidx.annotation.Keep; -import app.organicmaps.util.Constants; -import app.organicmaps.util.StringUtils; +import app.organicmaps.downloader.Android7RootCertificateWorkaround; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.io.BufferedInputStream; import java.io.DataOutputStream; diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountryItem.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/downloader/CountryItem.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java index 8f0e27662..822f3bdaf 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/CountryItem.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.text.TextUtils; @@ -6,7 +6,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; /** * Class representing a single item in countries hierarchy. @@ -20,10 +20,10 @@ public final class CountryItem implements Comparable private static String sRootId; // Must correspond to ItemCategory in MapManager.cpp - static final int CATEGORY_NEAR_ME = 0; - static final int CATEGORY_DOWNLOADED = 1; - static final int CATEGORY_AVAILABLE = 2; - static final int CATEGORY__LAST = CATEGORY_AVAILABLE; + public static final int CATEGORY_NEAR_ME = 0; + public static final int CATEGORY_DOWNLOADED = 1; + public static final int CATEGORY_AVAILABLE = 2; + public static final int CATEGORY__LAST = CATEGORY_AVAILABLE; // Must correspond to NodeStatus in storage_defines.hpp public static final int STATUS_UNKNOWN = 0; @@ -71,10 +71,10 @@ public final class CountryItem implements Comparable public long bytesToDownload; // Internal ID for grouping under headers in the list - int headerId; + public int headerId; // Internal field to store search result name @Nullable - String searchResultName; + public String searchResultName; private static void ensureRootIdKnown() { diff --git a/android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java index c931f04be..757547aec 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import androidx.annotation.Nullable; diff --git a/android/app/src/main/java/app/organicmaps/downloader/MapManager.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/downloader/MapManager.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java index 266baa9cd..db1409d34 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/MapManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.app.Activity; import android.app.Application; @@ -12,7 +12,8 @@ import androidx.annotation.UiThread; import androidx.appcompat.app.AlertDialog; import app.organicmaps.R; -import app.organicmaps.util.ConnectionState; +import app.organicmaps.downloader.DownloaderService; +import app.organicmaps.sdk.util.ConnectionState; import app.organicmaps.util.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -180,7 +181,7 @@ public final class MapManager return true; } - static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) + public static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) { //noinspection SimplifiableIfStatement if (TextUtils.isEmpty(countryId) || !notifyNoSpaceToUpdate(activity, countryId)) @@ -189,7 +190,7 @@ public final class MapManager return true; } - static boolean warnOn3g(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) + public static boolean warnOn3g(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) { //noinspection SimplifiableIfStatement if (TextUtils.isEmpty(countryId) || !notifyNoSpace(activity, countryId)) @@ -212,7 +213,7 @@ public final class MapManager }); } - static boolean warn3gAndRetry(Activity activity, final String countryId, @Nullable final Runnable onAcceptListener) + public static boolean warn3gAndRetry(Activity activity, final String countryId, @Nullable final Runnable onAcceptListener) { return warnOn3g(activity, countryId, () -> { if (onAcceptListener != null) diff --git a/android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java index f52d3249b..244a983cd 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/Editor.java b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/editor/Editor.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java index fe84ed490..daa6895ec 100644 --- a/android/app/src/main/java/app/organicmaps/editor/Editor.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import android.content.Context; @@ -8,13 +8,13 @@ import androidx.annotation.Size; import androidx.annotation.WorkerThread; import app.organicmaps.BuildConfig; -import app.organicmaps.Framework; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.editor.data.FeatureCategory; -import app.organicmaps.editor.data.Language; -import app.organicmaps.editor.data.LocalizedName; -import app.organicmaps.editor.data.LocalizedStreet; -import app.organicmaps.editor.data.NamesDataSource; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.editor.data.FeatureCategory; +import app.organicmaps.sdk.editor.data.Language; +import app.organicmaps.sdk.editor.data.LocalizedName; +import app.organicmaps.sdk.editor.data.LocalizedStreet; +import app.organicmaps.sdk.editor.data.NamesDataSource; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/editor/OpeningHours.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java index b196fae91..c2d970773 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java @@ -1,11 +1,11 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; public final class OpeningHours { diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java index 264be509b..afd54de33 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import android.content.Context; import android.content.SharedPreferences; @@ -11,7 +11,7 @@ import androidx.annotation.WorkerThread; import androidx.fragment.app.FragmentManager; import app.organicmaps.MwmApplication; -import app.organicmaps.util.NetworkPolicy; +import app.organicmaps.sdk.util.NetworkPolicy; public final class OsmOAuth { diff --git a/android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java index cb845e6ab..a5742a7fd 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java index ca5a35a29..2e56d921d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.os.Parcel; import android.os.Parcelable; @@ -7,7 +7,7 @@ import androidx.annotation.IntRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Language.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/editor/data/Language.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java index c3a42004e..fd07444f6 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Language.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java index 764301721..555c4553c 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java index 6be310969..31a23a412 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java index afc6f9a90..c1676112d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java index d9a40d894..57823cc88 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.content.res.Resources; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Timespan.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/editor/data/Timespan.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java index bbd6c0ce7..4deae058e 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Timespan.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Timetable.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/editor/data/Timetable.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java index 27e43cd27..f2d6d623d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Timetable.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.IntRange; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java index 2b171b014..d69a5f3b1 100644 --- a/android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java @@ -1,8 +1,8 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static app.organicmaps.util.concurrency.UiThread.runLater; +import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; import android.content.Context; import android.location.Location; @@ -16,8 +16,7 @@ import androidx.core.location.LocationListenerCompat; import androidx.core.location.LocationManagerCompat; import androidx.core.location.LocationRequestCompat; -import app.organicmaps.MwmApplication; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.HashSet; import java.util.Set; @@ -68,7 +67,7 @@ class AndroidNativeProvider extends BaseLocationProvider AndroidNativeProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener) { super(listener); - mLocationManager = (LocationManager) MwmApplication.from(context).getSystemService(Context.LOCATION_SERVICE); + mLocationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); mProviders = new HashSet<>(); // This service is always available on all versions of Android if (mLocationManager == null) diff --git a/android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java index cc996b056..185e6a041 100644 --- a/android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; diff --git a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/location/LocationHelper.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java index 4cb376f38..7f8e6a759 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; @@ -20,17 +20,17 @@ import androidx.core.location.LocationManagerCompat; import org.chromium.base.ObserverList; -import app.organicmaps.Framework; -import app.organicmaps.Map; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.Map; import app.organicmaps.MwmApplication; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.JunctionInfo; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.Config; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.NetworkPolicy; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.NetworkPolicy; +import app.organicmaps.sdk.util.log.Logger; public class LocationHelper implements BaseLocationProvider.Listener { @@ -99,12 +99,6 @@ public class LocationHelper implements BaseLocationProvider.Listener } }; - @NonNull - public static LocationHelper from(@NonNull Context context) - { - return MwmApplication.from(context).getLocationHelper(); - } - public LocationHelper(@NonNull Context context) { mContext = context; @@ -372,7 +366,7 @@ public class LocationHelper implements BaseLocationProvider.Listener checkForAgpsUpdates(); if (LocationUtils.checkFineLocationPermission(mContext)) - SensorHelper.from(mContext).start(); + MwmApplication.from(mContext).getSensorHelper().start(); final long oldInterval = mInterval; mInterval = calcLocationUpdatesInterval(); @@ -398,7 +392,7 @@ public class LocationHelper implements BaseLocationProvider.Listener Logger.i(TAG); mLocationProvider.stop(); unsubscribeFromGnssStatusUpdates(); - SensorHelper.from(mContext).stop(); + MwmApplication.from(mContext).getSensorHelper().stop(); mHandler.removeCallbacks(mLocationTimeoutRunnable); mActive = false; } diff --git a/android/app/src/main/java/app/organicmaps/location/LocationListener.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/location/LocationListener.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java index b05ab8ffb..9a92fba6e 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.app.PendingIntent; import android.location.Location; diff --git a/android/app/src/main/java/app/organicmaps/location/LocationState.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/location/LocationState.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java index 0ee6d3b8d..aa2461a68 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java @@ -1,10 +1,10 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import androidx.annotation.IntDef; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.Map; +import app.organicmaps.sdk.Map; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/location/PlatformSocket.java b/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/location/PlatformSocket.java rename to android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java index 406bff5c0..9642d39f0 100644 --- a/android/app/src/main/java/app/organicmaps/location/PlatformSocket.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.annotation.SuppressLint; import android.net.SSLCertificateSocketFactory; @@ -8,7 +8,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.BuildConfig; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import javax.net.SocketFactory; import javax.net.ssl.SSLSocketFactory; diff --git a/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java similarity index 89% rename from android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java index 037c1abb9..20603bba2 100644 --- a/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import android.location.Location; @@ -7,9 +7,9 @@ import android.os.SystemClock; import androidx.annotation.NonNull; import app.organicmaps.sdk.routing.JunctionInfo; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; class RouteSimulationProvider extends BaseLocationProvider { diff --git a/android/app/src/main/java/app/organicmaps/location/SensorHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/location/SensorHelper.java rename to android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java index 57d11c8ed..7bca12691 100644 --- a/android/app/src/main/java/app/organicmaps/location/SensorHelper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import android.hardware.Sensor; @@ -11,9 +11,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import app.organicmaps.MwmApplication; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; import java.util.LinkedHashSet; import java.util.Set; @@ -37,12 +36,6 @@ public class SensorHelper implements SensorEventListener @NonNull private final Set mListeners = new LinkedHashSet<>(); - @NonNull - public static SensorHelper from(@NonNull Context context) - { - return MwmApplication.from(context).getSensorHelper(); - } - @Override public void onSensorChanged(SensorEvent event) { diff --git a/android/app/src/main/java/app/organicmaps/location/SensorListener.java b/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java similarity index 85% rename from android/app/src/main/java/app/organicmaps/location/SensorListener.java rename to android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java index 92350acd3..712546959 100644 --- a/android/app/src/main/java/app/organicmaps/location/SensorListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; public interface SensorListener { diff --git a/android/app/src/main/java/app/organicmaps/location/TrackRecorder.java b/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/location/TrackRecorder.java rename to android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java index a20847ca8..f12e2fe35 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecorder.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; public class TrackRecorder { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/Mode.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java similarity index 84% rename from android/app/src/main/java/app/organicmaps/maplayer/Mode.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java index 7b69e5ed5..bdd366811 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/Mode.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java @@ -1,14 +1,14 @@ -package app.organicmaps.maplayer; +package app.organicmaps.sdk.maplayer; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; -import app.organicmaps.util.ThemeSwitcher; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.util.ThemeSwitcher; public enum Mode { @@ -70,7 +70,7 @@ public enum Mode ThemeSwitcher.INSTANCE.restart(true); } }; - + public abstract boolean isEnabled(@NonNull Context context); public abstract void setEnabled(@NonNull Context context, boolean isEnabled); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java similarity index 74% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java index 1e77d6ba4..5fb1ea738 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java similarity index 70% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java index 1957bbae0..d7c2269df 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java @@ -1,21 +1,19 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; -import android.app.Application; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.MwmApplication; +import app.organicmaps.sdk.Framework; public class IsolinesManager { @NonNull private final OnIsolinesChangedListener mListener; - public IsolinesManager(@NonNull Application application) + public IsolinesManager(@NonNull Context context) { - mListener = new OnIsolinesChangedListener(application); + mListener = new OnIsolinesChangedListener(context); } static public boolean isEnabled() @@ -41,13 +39,6 @@ public class IsolinesManager registerListener(); } - @NonNull - public static IsolinesManager from(@NonNull Context context) - { - MwmApplication app = (MwmApplication) context.getApplicationContext(); - return app.getIsolinesManager(); - } - private static native void nativeAddListener(@NonNull OnIsolinesChangedListener listener); private static native void nativeRemoveListener(@NonNull OnIsolinesChangedListener listener); private static native boolean nativeShouldShowNotification(); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java index 86b03a514..22e595e7a 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; import android.content.Context; import android.view.View; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java similarity index 72% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java index 54a4fd570..98d1ddf44 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java @@ -1,6 +1,6 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; -import android.app.Application; +import android.content.Context; import androidx.annotation.Keep; import androidx.annotation.NonNull; @@ -8,12 +8,12 @@ import androidx.annotation.NonNull; class OnIsolinesChangedListener { @NonNull - private final Application mApp; + private final Context mContext; private IsolinesErrorDialogListener mListener; - OnIsolinesChangedListener(@NonNull Application app) + OnIsolinesChangedListener(@NonNull Context app) { - mApp = app; + mContext = app; } // Called from JNI. @@ -24,7 +24,7 @@ class OnIsolinesChangedListener IsolinesState state = IsolinesState.values()[type]; if (mListener == null) { - state.activate(mApp, null, null); + state.activate(mContext, null, null); return; } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java index 35de4534f..a5e06f6f3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java @@ -1,6 +1,6 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; -import android.app.Application; +import android.content.Context; import androidx.annotation.Keep; import androidx.annotation.MainThread; @@ -17,9 +17,9 @@ interface OnTransitSchemeChangedListener class Default implements OnTransitSchemeChangedListener { @NonNull - private final Application mContext; + private final Context mContext; - Default(@NonNull Application context) + Default(@NonNull Context context) { mContext = context; } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java similarity index 68% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java index e2f506261..312e2a011 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java @@ -1,20 +1,18 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; -import android.app.Application; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.MwmApplication; +import app.organicmaps.sdk.Framework; public class SubwayManager { @NonNull private final OnTransitSchemeChangedListener mSchemeChangedListener; - public SubwayManager(@NonNull Application application) { - mSchemeChangedListener = new OnTransitSchemeChangedListener.Default(application); + public SubwayManager(@NonNull Context context) { + mSchemeChangedListener = new OnTransitSchemeChangedListener.Default(context); } static public void setEnabled(boolean isEnabled) @@ -41,12 +39,6 @@ public class SubwayManager nativeAddListener(mSchemeChangedListener); } - @NonNull - public static SubwayManager from(@NonNull Context context) - { - MwmApplication app = (MwmApplication) context.getApplicationContext(); - return app.getSubwayManager(); - } private static native void nativeAddListener(@NonNull OnTransitSchemeChangedListener listener); private static native void nativeRemoveListener(@NonNull OnTransitSchemeChangedListener listener); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java index 705b2af16..13dae9be3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; import android.content.Context; import android.widget.Toast; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java index 9ef1d9fe7..c2899c7a9 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java @@ -1,9 +1,9 @@ -package app.organicmaps.maplayer.traffic; +package app.organicmaps.sdk.maplayer.traffic; import androidx.annotation.MainThread; import androidx.annotation.NonNull; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java index b0ced15f8..36617a9c1 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.traffic; +package app.organicmaps.sdk.maplayer.traffic; import androidx.annotation.Keep; import androidx.annotation.MainThread; diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java b/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java new file mode 100644 index 000000000..266edcec7 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java @@ -0,0 +1,23 @@ +package app.organicmaps.sdk.routing; + +public interface ResultCodes +{ + // Codes correspond to native routing::RouterResultCode in routing/routing_callbacks.hpp + int NO_ERROR = 0; + int CANCELLED = 1; + int NO_POSITION = 2; + int INCONSISTENT_MWM_ROUTE = 3; + int ROUTING_FILE_NOT_EXIST = 4; + int START_POINT_NOT_FOUND = 5; + int END_POINT_NOT_FOUND = 6; + int DIFFERENT_MWM = 7; + int ROUTE_NOT_FOUND = 8; + int NEED_MORE_MAPS = 9; + int INTERNAL_ERROR = 10; + int FILE_TOO_OLD = 11; + int INTERMEDIATE_POINT_NOT_FOUND = 12; + int TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK = 13; + int TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN = 14; + int ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR = 15; + int HAS_WARNINGS = 16; +} diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java index 842c1c421..c0b40f91c 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java @@ -2,7 +2,7 @@ package app.organicmaps.sdk.routing; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java index 57d58a97b..0634583ef 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java @@ -2,7 +2,7 @@ package app.organicmaps.sdk.routing; import androidx.annotation.NonNull; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import java.util.HashSet; import java.util.Set; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java index 582e5a2ca..8e8ee4f60 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java @@ -8,9 +8,9 @@ import androidx.annotation.Nullable; import org.chromium.base.ObserverList; -import app.organicmaps.Framework; -import app.organicmaps.util.Language; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.util.Language; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.nio.charset.StandardCharsets; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java index e11e528e7..938dfde83 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java @@ -5,7 +5,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java index 2fdcf6861..5729a674b 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java @@ -11,8 +11,8 @@ import android.text.style.StyleSpan; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.util.Distance; /** * Class instances are created from native code. diff --git a/android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java b/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java similarity index 79% rename from android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java index 385d6d8dd..a712790b7 100644 --- a/android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; public class MapLanguageCode { diff --git a/android/app/src/main/java/app/organicmaps/settings/RoadType.java b/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java similarity index 65% rename from android/app/src/main/java/app/organicmaps/settings/RoadType.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java index ebe4a69a6..e74f08aed 100644 --- a/android/app/src/main/java/app/organicmaps/settings/RoadType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; public enum RoadType { diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java b/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java new file mode 100644 index 000000000..badf5e6d8 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java @@ -0,0 +1,8 @@ +package app.organicmaps.sdk.settings; + +public enum SpeedCameraMode +{ + AUTO, + ALWAYS, + NEVER +} diff --git a/android/app/src/main/java/app/organicmaps/settings/UnitLocale.java b/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/settings/UnitLocale.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java index caeb9407d..c1c298f35 100644 --- a/android/app/src/main/java/app/organicmaps/settings/UnitLocale.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; import java.util.Locale; diff --git a/android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java b/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java index babffb24d..b8ddd7ee2 100644 --- a/android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.media.AudioAttributes; diff --git a/android/app/src/main/java/app/organicmaps/sound/LanguageData.java b/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/LanguageData.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java index 6cf8b6281..65f15533f 100644 --- a/android/app/src/main/java/app/organicmaps/sound/LanguageData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.speech.tts.TextToSpeech; diff --git a/android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java b/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java index 224309589..9633bfdbb 100644 --- a/android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.media.MediaPlayer; diff --git a/android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java index b6eb5b3f9..be5a89581 100644 --- a/android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.content.res.Resources; @@ -13,11 +13,10 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.Config; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.util.ArrayList; import java.util.List; @@ -286,7 +285,7 @@ public enum TtsPlayer private boolean getUsableLanguages(List outList) { - Resources resources = MwmApplication.from(mContext).getResources(); + Resources resources = mContext.getResources(); String[] codes = resources.getStringArray(R.array.tts_languages_supported); String[] names = resources.getStringArray(R.array.tts_language_names); diff --git a/android/app/src/main/java/app/organicmaps/util/BatteryState.java b/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/BatteryState.java rename to android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java index e1d819988..f277af4af 100644 --- a/android/app/src/main/java/app/organicmaps/util/BatteryState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.Intent; diff --git a/android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java b/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java index 43abb72c0..fcc9fc5db 100644 --- a/android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java @@ -1,8 +1,10 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import app.organicmaps.util.Utils; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.KeyStore; diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/Config.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Config.java index f9378334b..ce34decbc 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.SharedPreferences; @@ -9,6 +9,7 @@ import androidx.preference.PreferenceManager; import app.organicmaps.BuildConfig; import app.organicmaps.MwmApplication; import app.organicmaps.R; +import app.organicmaps.util.ThemeUtils; public final class Config { diff --git a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java b/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/util/ConnectionState.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java index 07af068c1..d4c8a2d03 100644 --- a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java @@ -1,6 +1,6 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; -import static app.organicmaps.util.ConnectionState.Type.NONE; +import static app.organicmaps.sdk.util.ConnectionState.Type.NONE; import android.content.Context; import android.net.ConnectivityManager; diff --git a/android/app/src/main/java/app/organicmaps/util/Constants.java b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/Constants.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Constants.java index 2efb04472..d8d49111f 100644 --- a/android/app/src/main/java/app/organicmaps/util/Constants.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import app.organicmaps.BuildConfig; diff --git a/android/app/src/main/java/app/organicmaps/util/DateUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/DateUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java index 82a8c4775..f086e5676 100644 --- a/android/app/src/main/java/app/organicmaps/util/DateUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; diff --git a/android/app/src/main/java/app/organicmaps/util/Distance.java b/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/Distance.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Distance.java index 0848fb9bf..0ba798381 100644 --- a/android/app/src/main/java/app/organicmaps/util/Distance.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; diff --git a/android/app/src/main/java/app/organicmaps/util/GeoUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java similarity index 75% rename from android/app/src/main/java/app/organicmaps/util/GeoUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java index 8155ec9ae..93f905d51 100644 --- a/android/app/src/main/java/app/organicmaps/util/GeoUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java @@ -1,8 +1,8 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.NonNull; -import app.organicmaps.bookmarks.data.ParcelablePointD; +import app.organicmaps.sdk.bookmarks.data.ParcelablePointD; public class GeoUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/HttpClient.java rename to android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java index 256f76d41..f66dcf80d 100644 --- a/android/app/src/main/java/app/organicmaps/util/HttpClient.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java @@ -22,7 +22,7 @@ * SOFTWARE. *******************************************************************************/ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.text.TextUtils; @@ -30,7 +30,8 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import app.organicmaps.downloader.Android7RootCertificateWorkaround; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.sdk.util.Utils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/android/app/src/main/java/app/organicmaps/util/KeyValue.java b/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java similarity index 89% rename from android/app/src/main/java/app/organicmaps/util/KeyValue.java rename to android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java index 50cf3859e..534518efe 100644 --- a/android/app/src/main/java/app/organicmaps/util/KeyValue.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java @@ -1,8 +1,9 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.Keep; import androidx.annotation.NonNull; +import java.io.Serial; import java.io.Serializable; // Used from JNI. @@ -10,6 +11,7 @@ import java.io.Serializable; @SuppressWarnings("unused") public final class KeyValue implements Serializable { + @Serial private static final long serialVersionUID = -3079360274128509979L; @NonNull private final String mKey; diff --git a/android/app/src/main/java/app/organicmaps/util/Language.java b/android/app/src/main/java/app/organicmaps/sdk/util/Language.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/Language.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Language.java index 4a367ded7..0bdfa6ed1 100644 --- a/android/app/src/main/java/app/organicmaps/util/Language.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Language.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.text.TextUtils; diff --git a/android/app/src/main/java/app/organicmaps/util/LocationUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/LocationUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java index 735b427ef..412c738c6 100644 --- a/android/app/src/main/java/app/organicmaps/util/LocationUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; diff --git a/android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java rename to android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java index 8583fb320..dba1da0cc 100644 --- a/android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/util/PowerManagment.java b/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/util/PowerManagment.java rename to android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java index 2a443d8b5..325e06c52 100644 --- a/android/app/src/main/java/app/organicmaps/util/PowerManagment.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.ComponentName; import android.content.Context; @@ -11,13 +11,14 @@ import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.util.Utils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import static app.organicmaps.util.Constants.Vendor.HUAWEI; -import static app.organicmaps.util.Constants.Vendor.XIAOMI; +import static app.organicmaps.sdk.util.Constants.Vendor.HUAWEI; +import static app.organicmaps.sdk.util.Constants.Vendor.XIAOMI; public final class PowerManagment { diff --git a/android/app/src/main/java/app/organicmaps/util/ROMUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/ROMUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java index 7a0ac7ba8..7297d4062 100644 --- a/android/app/src/main/java/app/organicmaps/util/ROMUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.util.Log; diff --git a/android/app/src/main/java/app/organicmaps/util/SecureStorage.java b/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/SecureStorage.java rename to android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java index 426002008..adf642673 100644 --- a/android/app/src/main/java/app/organicmaps/util/SecureStorage.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.SharedPreferences; @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public final class SecureStorage { diff --git a/android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java index 12ad4059a..5908f06f1 100644 --- a/android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java @@ -1,6 +1,6 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; -import static app.organicmaps.util.Config.KEY_PREF_STATISTICS; +import static app.organicmaps.sdk.util.Config.KEY_PREF_STATISTICS; import android.content.Context; import android.content.SharedPreferences; @@ -10,7 +10,7 @@ import androidx.preference.PreferenceManager; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.maplayer.Mode; +import app.organicmaps.sdk.maplayer.Mode; import java.io.IOException; import java.util.Locale; diff --git a/android/app/src/main/java/app/organicmaps/util/StorageUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/StorageUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java index 7c40483e9..cad055e8b 100644 --- a/android/app/src/main/java/app/organicmaps/util/StorageUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.app.Activity; import android.content.ContentResolver; @@ -14,7 +14,8 @@ import androidx.core.content.FileProvider; import androidx.documentfile.provider.DocumentFile; import app.organicmaps.BuildConfig; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.util.Utils; import java.io.File; import java.io.FileInputStream; diff --git a/android/app/src/main/java/app/organicmaps/util/StringUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/StringUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java index 00129f810..24eaf3254 100644 --- a/android/app/src/main/java/app/organicmaps/util/StringUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.text.Editable; diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java index b90dddc03..9bbe825dc 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.app.Activity; import android.app.UiModeManager; @@ -11,15 +11,15 @@ import androidx.appcompat.app.AppCompatDelegate; import java.util.Calendar; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayManager; import app.organicmaps.downloader.DownloaderStatusIcon; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.MapStyle; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.util.ThemeUtils; public enum ThemeSwitcher { @@ -151,13 +151,14 @@ public enum ThemeSwitcher /** * Determine light/dark theme based on time and location, * or fall back to time-based (06:00-18:00) when there's no location fix + * * @return theme_light/dark string */ private String calcAutoTheme() { String defaultTheme = mContext.getResources().getString(R.string.theme_default); String nightTheme = mContext.getResources().getString(R.string.theme_night); - Location last = LocationHelper.from(mContext).getSavedLocation(); + Location last = MwmApplication.from(mContext).getLocationHelper().getSavedLocation(); boolean day; if (last != null) diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/UiUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java index 97c985990..394f73772 100644 --- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.animation.Animator; import android.app.Activity; @@ -34,8 +34,9 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.MwmApplication; import app.organicmaps.R; +import app.organicmaps.util.ThemeUtils; +import app.organicmaps.util.WindowInsetUtils; import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.textfield.TextInputLayout; @@ -201,7 +202,7 @@ public final class UiUtils public static boolean isTablet(@NonNull Context context) { - return MwmApplication.from(context).getResources().getBoolean(R.bool.tabletLayout); + return context.getResources().getBoolean(R.bool.tabletLayout); } public static int dimen(@NonNull Context context, @DimenRes int id) @@ -228,7 +229,7 @@ public final class UiUtils { setInputError(layout, error == 0 ? null : layout.getContext().getString(error)); } - + public static void setInputError(@NonNull TextInputLayout layout, String error) { layout.getEditText().setError(error); diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java new file mode 100644 index 000000000..5747b7869 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java @@ -0,0 +1,274 @@ +package app.organicmaps.sdk.util; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.res.Resources; +import android.os.Build; +import android.text.TextUtils; +import android.text.format.DateUtils; +import android.view.View; +import android.widget.Toast; + +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + +import app.organicmaps.BuildConfig; +import app.organicmaps.sdk.util.log.Logger; + +import java.text.DecimalFormatSymbols; +import java.util.Currency; +import java.util.Locale; + +@Keep +public class Utils +{ + private static final String TAG = Utils.class.getSimpleName(); + + @StringRes + private static final int INVALID_ID = 0; + + static String makeUrlSafe(@NonNull final String url) + { + return url.replaceAll("(token|password|key)=([^&]+)", "***"); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @Nullable + public static String getCurrencyCode() + { + Locale[] locales = { Locale.getDefault(), Locale.US }; + for (Locale locale : locales) + { + Currency currency = getCurrencyForLocale(locale); + if (currency != null) + return currency.getCurrencyCode(); + } + return null; + } + + @Nullable + private static Currency getCurrencyForLocale(@NonNull Locale locale) + { + try + { + return Currency.getInstance(locale); + } + catch (Throwable e) + { + Logger.e(TAG, "Failed to obtain a currency for locale: " + locale, e); + return null; + } + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getCountryCode() + { + return Locale.getDefault().getCountry(); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLanguageCode() + { + return Locale.getDefault().getLanguage(); + } + + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getDecimalSeparator() + { + return String.valueOf(DecimalFormatSymbols.getInstance().getDecimalSeparator()); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getGroupingSeparator() + { + return String.valueOf(DecimalFormatSymbols.getInstance().getGroupingSeparator()); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getCurrencySymbol(@NonNull String currencyCode) + { + try + { + return Currency.getInstance(currencyCode).getSymbol(Locale.getDefault()); + } + catch (Throwable e) + { + Logger.e(TAG, "Failed to obtain currency symbol by currency code = " + currencyCode, e); + } + + return currencyCode; + } + + /** + * Returns a string value for the specified key. If the value is not found then its key will be + * returned. + * + * @return string value or its key if there is no string for the specified key. + */ + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getStringValueByKey(@NonNull Context context, @NonNull String key) + { + try + { + return context.getString(getStringIdByKey(context, key)); + } + catch (Resources.NotFoundException e) + { + Logger.e(TAG, "Failed to get value for string '" + key + "'", e); + } + return key; + } + + @StringRes + @SuppressLint("DiscouragedApi") + public static int getStringIdByKey(@NonNull Context context, @NonNull String key) + { + try + { + Resources res = context.getResources(); + @StringRes + int nameId = res.getIdentifier(key, "string", context.getPackageName()); + if (nameId == INVALID_ID || nameId == View.NO_ID) + throw new Resources.NotFoundException("String id '" + key + "' is not found"); + return nameId; + } + catch (RuntimeException e) + { + Logger.e(TAG, "Failed to get string with id '" + key + "'", e); + if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta")) + { + Toast.makeText(context, "Add string id for '" + key + "'!", Toast.LENGTH_LONG).show(); + } + } + return INVALID_ID; + } + + /** + * Returns a name for a new bookmark created off the current GPS location. + * The name includes current time and date in locale-specific format. + * + * @return bookmark name with time and date. + */ + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getMyPositionBookmarkName(@NonNull Context context) + { + return DateUtils.formatDateTime(context, System.currentTimeMillis(), + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR); + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getDeviceName() + { + return Build.MANUFACTURER; + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getDeviceModel() + { + return Build.MODEL; + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getVersion() + { + return BuildConfig.VERSION_NAME; + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + public static int getIntVersion() + { + // Please sync with getVersion() in build.gradle + // - % 100000000 removes prefix for special markets, e.g Huawei. + // - / 100 removes the number of commits in the current day. + return (BuildConfig.VERSION_CODE % 1_00_00_00_00) / 100; + } + + @NonNull + public static String getTagValueLocalized(@NonNull Context context, @Nullable String tagKey, @Nullable String value) + { + if (TextUtils.isEmpty(tagKey) || TextUtils.isEmpty(value)) + return ""; + + return getLocalizedFeatureType(context, tagKey + "-" + value); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type) + { + if (TextUtils.isEmpty(type)) + return ""; + + String key = "type." + type.replace('-', '.') + .replace(':', '_'); + return getLocalizedFeatureByKey(context, key); + } + + @NonNull + private static String getLocalizedFeatureByKey(@NonNull Context context, @NonNull String key) + { + return getStringValueByKey(context, key); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLocalizedBrand(@NonNull Context context, @Nullable String brand) + { + if (TextUtils.isEmpty(brand)) + return ""; + + try + { + @StringRes + int nameId = context.getResources().getIdentifier("brand." + brand, "string", context.getPackageName()); + if (nameId == INVALID_ID || nameId == View.NO_ID) + return brand; + return context.getString(nameId); + } + catch (Resources.NotFoundException e) + { + } + return brand; + } +} diff --git a/android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java rename to android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java index 216310432..c37383ca3 100644 --- a/android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.concurrency; +package app.organicmaps.sdk.util.concurrency; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; diff --git a/android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java rename to android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java index 21177b1d0..ed461b755 100644 --- a/android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.concurrency; +package app.organicmaps.sdk.util.concurrency; import android.os.Handler; import android.os.Looper; diff --git a/android/app/src/main/java/app/organicmaps/util/log/Logger.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/log/Logger.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java index ebe6b90f7..e48e77526 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/Logger.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import android.util.Log; diff --git a/android/app/src/main/java/app/organicmaps/util/log/LogsManager.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/log/LogsManager.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java index 1fa9907c0..473ff02b8 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/LogsManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import android.Manifest; import android.app.ActivityManager; @@ -22,8 +22,8 @@ import androidx.core.content.ContextCompat; import app.organicmaps.BuildConfig; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.ROMUtils; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.ROMUtils; +import app.organicmaps.sdk.util.StringUtils; import net.jcip.annotations.ThreadSafe; diff --git a/android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java index 6a51dd40d..af7f02e35 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java new file mode 100644 index 000000000..59069ebc1 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java @@ -0,0 +1,6 @@ +package app.organicmaps.sdk.widget.placepage; + +public class PlacePageButtonFactory +{ + public native static boolean nativeHasRecentlyDeletedBookmark(); +} diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java rename to android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java index 002c0126f..065283897 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java @@ -1,4 +1,4 @@ -package app.organicmaps.widget.placepage; +package app.organicmaps.sdk.widget.placepage; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java index b6fccbd98..d15299a59 100644 --- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; import app.organicmaps.sdk.search.DisplayedCategories; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; import app.organicmaps.util.ThemeUtils; import java.lang.annotation.Retention; diff --git a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java index 85dd55fca..f87d1a4d3 100644 --- a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java @@ -10,7 +10,7 @@ import androidx.core.view.ViewCompat; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.widget.SearchToolbarController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class FloatingSearchToolbarController extends SearchToolbarController { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java index 261d86c44..920838fb5 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java @@ -16,7 +16,7 @@ import app.organicmaps.R; import app.organicmaps.sdk.search.SearchResult; import app.organicmaps.util.Graphics; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; class SearchAdapter extends RecyclerView.Adapter { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java index 0fab74c08..6b256d62c 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java @@ -22,25 +22,25 @@ import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.downloader.CountrySuggestFragment; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.location.LocationListener; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.sdk.search.SearchListener; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.sdk.search.SearchResult; -import app.organicmaps.util.Config; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.Language; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.PlaceholderView; @@ -330,7 +330,7 @@ public class SearchFragment extends BaseMwmFragment public void onResume() { super.onResume(); - LocationHelper.from(requireContext()).addListener(mLocationListener); + MwmApplication.from(requireContext()).getLocationHelper().addListener(mLocationListener); if (mInitialQuery != null) { setQuery(mInitialQuery, false); mInitialQuery = null; @@ -340,7 +340,7 @@ public class SearchFragment extends BaseMwmFragment @Override public void onPause() { - LocationHelper.from(requireContext()).removeListener(mLocationListener); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(mLocationListener); super.onPause(); } @@ -444,7 +444,7 @@ public class SearchFragment extends BaseMwmFragment SearchEngine.INSTANCE.searchInteractive( query, isCategory(), !TextUtils.isEmpty(mInitialLocale) - ? mInitialLocale : app.organicmaps.util.Language.getKeyboardLocale(requireContext()), + ? mInitialLocale : Language.getKeyboardLocale(requireContext()), mLastQueryTimestamp, false /* isMapAndTable */); SearchEngine.INSTANCE.setQuery(query); @@ -504,8 +504,6 @@ public class SearchFragment extends BaseMwmFragment updateFrames(); } - // Called from JNI. - @SuppressWarnings("unused") @Override public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp) { @@ -515,8 +513,6 @@ public class SearchFragment extends BaseMwmFragment refreshSearchResults(results); } - // Called from JNI. - @SuppressWarnings("unused") @Override public void onResultsEnd(long timestamp) { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java index b405b66ae..5925a6844 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.widget.SearchToolbarController; @@ -67,7 +67,7 @@ class SearchHistoryAdapter extends RecyclerView.Adapter { - RoutingController.get().onPoiSelected(LocationHelper.from(viewGroup.getContext()).getMyPosition()); + RoutingController.get().onPoiSelected(MwmApplication.from(viewGroup.getContext()).getLocationHelper().getMyPosition()); mSearchToolbarController.onUpClick(); }); break; diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java index b1ea928de..4281cbe03 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java @@ -9,13 +9,13 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.widget.PlaceholderView; import app.organicmaps.widget.SearchToolbarController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class SearchHistoryFragment extends BaseMwmRecyclerFragment { @@ -32,7 +32,7 @@ public class SearchHistoryFragment extends BaseMwmRecyclerFragment { final String speedCamModeValue = (String) newValue; - final SettingsPrefsFragment.SpeedCameraMode newCamMode = SettingsPrefsFragment.SpeedCameraMode.valueOf(speedCamModeValue); + final SpeedCameraMode newCamMode = SpeedCameraMode.valueOf(speedCamModeValue); final CharSequence summary = pref.getEntries()[newCamMode.ordinal()]; pref.setSummary(summary); if (pref.getValue().equals(newValue)) @@ -354,7 +355,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment }); } - private void onSpeedCamerasPrefChanged(@NonNull SettingsPrefsFragment.SpeedCameraMode newCamMode) + private void onSpeedCamerasPrefChanged(@NonNull SpeedCameraMode newCamMode) { Framework.setSpeedCamerasMode(newCamMode); } diff --git a/android/app/src/main/java/app/organicmaps/util/InputUtils.java b/android/app/src/main/java/app/organicmaps/util/InputUtils.java index 6ca34a74c..89e7d4c50 100644 --- a/android/app/src/main/java/app/organicmaps/util/InputUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/InputUtils.java @@ -9,7 +9,7 @@ import android.widget.EditText; import androidx.annotation.NonNull; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java index 076890872..1a457570a 100644 --- a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java @@ -22,12 +22,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.SplashActivity; -import app.organicmaps.bookmarks.data.BookmarkInfo; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.bookmarks.data.BookmarkInfo; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.log.Logger; public class SharingUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java index c121c8d31..45f761554 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import app.organicmaps.R; +import app.organicmaps.sdk.util.Config; public final class ThemeUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java index aadb5c76e..4cd3f5afc 100644 --- a/android/app/src/main/java/app/organicmaps/util/Utils.java +++ b/android/app/src/main/java/app/organicmaps/util/Utils.java @@ -1,6 +1,5 @@ package app.organicmaps.util; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ClipData; @@ -10,7 +9,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.res.Resources; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -19,7 +17,6 @@ import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; -import android.text.format.DateUtils; import android.text.style.AbsoluteSizeSpan; import android.util.AndroidRuntimeException; import android.view.View; @@ -42,17 +39,17 @@ import app.organicmaps.BuildConfig; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; -import app.organicmaps.util.log.LogsManager; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.Distance; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.sdk.util.log.LogsManager; import com.google.android.material.snackbar.Snackbar; import java.io.Closeable; import java.io.IOException; import java.lang.ref.WeakReference; -import java.text.DecimalFormatSymbols; -import java.util.Currency; -import java.util.Locale; import java.util.Map; @Keep @@ -389,197 +386,6 @@ public class Utils } } - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @Nullable - public static String getCurrencyCode() - { - Locale[] locales = { Locale.getDefault(), Locale.US }; - for (Locale locale : locales) - { - Currency currency = getCurrencyForLocale(locale); - if (currency != null) - return currency.getCurrencyCode(); - } - return null; - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getCountryCode() - { - return Locale.getDefault().getCountry(); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLanguageCode() - { - return Locale.getDefault().getLanguage(); - } - - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getDecimalSeparator() - { - return String.valueOf(DecimalFormatSymbols.getInstance().getDecimalSeparator()); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getGroupingSeparator() - { - return String.valueOf(DecimalFormatSymbols.getInstance().getGroupingSeparator()); - } - - @Nullable - public static Currency getCurrencyForLocale(@NonNull Locale locale) - { - try - { - return Currency.getInstance(locale); - } - catch (Throwable e) - { - Logger.e(TAG, "Failed to obtain a currency for locale: " + locale, e); - return null; - } - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getCurrencySymbol(@NonNull String currencyCode) - { - try - { - return Currency.getInstance(currencyCode).getSymbol(Locale.getDefault()); - } - catch (Throwable e) - { - Logger.e(TAG, "Failed to obtain currency symbol by currency code = " + currencyCode, e); - } - - return currencyCode; - } - - static String makeUrlSafe(@NonNull final String url) - { - return url.replaceAll("(token|password|key)=([^&]+)", "***"); - } - - @StringRes - @SuppressLint("DiscouragedApi") - public static int getStringIdByKey(@NonNull Context context, @NonNull String key) - { - try - { - Resources res = context.getResources(); - @StringRes - int nameId = res.getIdentifier(key, "string", context.getPackageName()); - if (nameId == INVALID_ID || nameId == View.NO_ID) - throw new Resources.NotFoundException("String id '" + key + "' is not found"); - return nameId; - } - catch (RuntimeException e) - { - Logger.e(TAG, "Failed to get string with id '" + key + "'", e); - if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta")) - { - Toast.makeText(context, "Add string id for '" + key + "'!", Toast.LENGTH_LONG).show(); - } - } - return INVALID_ID; - } - - /** - * Returns a string value for the specified key. If the value is not found then its key will be - * returned. - * - * @return string value or its key if there is no string for the specified key. - */ - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getStringValueByKey(@NonNull Context context, @NonNull String key) - { - try - { - return context.getString(getStringIdByKey(context, key)); - } - catch (Resources.NotFoundException e) - { - Logger.e(TAG, "Failed to get value for string '" + key + "'", e); - } - return key; - } - - /** - * Returns a name for a new bookmark created off the current GPS location. - * The name includes current time and date in locale-specific format. - * - * @return bookmark name with time and date. - */ - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getMyPositionBookmarkName(@NonNull Context context) - { - return DateUtils.formatDateTime(context, System.currentTimeMillis(), - DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR); - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getDeviceName() - { - return Build.MANUFACTURER; - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getDeviceModel() - { - return Build.MODEL; - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getVersion() - { - return BuildConfig.VERSION_NAME; - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - public static int getIntVersion() - { - // Please sync with getVersion() in build.gradle - // - % 100000000 removes prefix for special markets, e.g Huawei. - // - / 100 removes the number of commits in the current day. - return (BuildConfig.VERSION_CODE % 1_00_00_00_00) / 100; - } - public static void detachFragmentIfCoreNotInitialized(@NonNull Context context, @NonNull Fragment fragment) { @@ -620,59 +426,6 @@ public class Utils void invoke(@NonNull T param); } - @NonNull - private static String getLocalizedFeatureByKey(@NonNull Context context, @NonNull String key) - { - return getStringValueByKey(context, key); - } - - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getTagValueLocalized(@NonNull Context context, @Nullable String tagKey, @Nullable String value) - { - if (TextUtils.isEmpty(tagKey) || TextUtils.isEmpty(value)) - return ""; - - return getLocalizedFeatureType(context, tagKey + "-" + value); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type) - { - if (TextUtils.isEmpty(type)) - return ""; - - String key = "type." + type.replace('-', '.') - .replace(':', '_'); - return getLocalizedFeatureByKey(context, key); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLocalizedBrand(@NonNull Context context, @Nullable String brand) - { - if (TextUtils.isEmpty(brand)) - return ""; - - try - { - @StringRes - int nameId = context.getResources().getIdentifier("brand." + brand, "string", context.getPackageName()); - if (nameId == INVALID_ID || nameId == View.NO_ID) - return brand; - return context.getString(nameId); - } - catch (Resources.NotFoundException e) - { - } - return brand; - } public static String getLocalizedLevel(@NonNull Context context, @Nullable String level) { diff --git a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java index f36656222..5f66eaf46 100644 --- a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java @@ -9,6 +9,7 @@ import androidx.core.graphics.Insets; import androidx.core.view.OnApplyWindowInsetsListener; import androidx.core.view.WindowInsetsCompat; import app.organicmaps.R; +import app.organicmaps.sdk.util.UiUtils; public final class WindowInsetUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java index 8f9cdeac5..23f5358e9 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java @@ -13,7 +13,8 @@ import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.location.TrackRecorder; +import app.organicmaps.sdk.util.Config; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java index 56c5626e7..a3a508dd0 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Objects; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MenuBottomSheetFragment extends BottomSheetDialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java index 0c3c9fe97..e10894654 100644 --- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java +++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class PlaceholderView extends LinearLayout { diff --git a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java index 434d71438..d3f680955 100644 --- a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java @@ -17,8 +17,8 @@ import androidx.annotation.StringRes; import app.organicmaps.R; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.textfield.TextInputEditText; public class SearchToolbarController extends ToolbarController implements View.OnClickListener diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java index 33c7178ba..6e1580264 100644 --- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java @@ -10,8 +10,8 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import app.organicmaps.R; -import app.organicmaps.util.Config; -import app.organicmaps.util.NetworkPolicy; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.NetworkPolicy; public class StackedButtonDialogFragment extends DialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java index 0aed8e974..505770cc2 100644 --- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java +++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java @@ -12,7 +12,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatDialog; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class StackedButtonsDialog extends AppCompatDialog implements View.OnClickListener { diff --git a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java index c93362b4e..f261fb572 100644 --- a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java @@ -14,7 +14,7 @@ import androidx.core.view.ViewCompat; import com.google.android.material.appbar.MaterialToolbar; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java index 5213c5c1b..3ceb8895f 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java @@ -2,7 +2,7 @@ package app.organicmaps.widget.menu; import android.view.View; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MainMenu { diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java index 42ede08cd..b897c541e 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java @@ -18,11 +18,11 @@ import androidx.core.content.res.ResourcesCompat; import androidx.core.widget.ImageViewCompat; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import app.organicmaps.Map; +import app.organicmaps.sdk.Map; import app.organicmaps.R; -import app.organicmaps.location.LocationState; +import app.organicmaps.sdk.location.LocationState; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MyPositionButton { diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java index 855f364cd..a7ac779d7 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java @@ -12,14 +12,15 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; import com.google.android.material.bottomsheet.BottomSheetBehavior; + +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.sound.TtsPlayer; +import app.organicmaps.sdk.sound.TtsPlayer; import app.organicmaps.util.Graphics; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.progressindicator.LinearProgressIndicator; import java.time.LocalTime; @@ -208,7 +209,7 @@ public class NavMenu private void updateSpeedView(@NonNull RoutingInfo info) { - final Location last = LocationHelper.from(mActivity).getSavedLocation(); + final Location last = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation(); if (last == null) return; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java index a96706f51..a5adb67ba 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import com.github.mikephil.charting.charts.BarLineChartBase; import com.github.mikephil.charting.formatter.DefaultValueFormatter; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; public class AxisValueFormatter extends DefaultValueFormatter { diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java index f9e1c0028..9a97db669 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java @@ -12,8 +12,8 @@ import androidx.annotation.NonNull; import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.bookmarks.IconsAdapter; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.Icon; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.Icon; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java index 28af2112b..36580a9af 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java @@ -10,18 +10,17 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.SensorListener; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.SensorListener; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.ArrowView; @@ -102,8 +101,8 @@ public class DirectionFragment extends BaseMwmDialogFragment public void onResume() { super.onResume(); - LocationHelper.from(requireContext()).addListener(this); - SensorHelper.from(requireContext()).addListener(this); + MwmApplication.from(requireContext()).getLocationHelper().addListener(this); + MwmApplication.from(requireContext()).getSensorHelper().addListener(this); ((MwmActivity) requireActivity()).hideOrShowUIWithoutClosingPlacePage(true); refreshViews(); } @@ -112,8 +111,8 @@ public class DirectionFragment extends BaseMwmDialogFragment public void onPause() { super.onPause(); - LocationHelper.from(requireContext()).removeListener(this); - SensorHelper.from(requireContext()).removeListener(this); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(this); + MwmApplication.from(requireContext()).getSensorHelper().removeListener(this); } @Override @@ -138,7 +137,7 @@ public class DirectionFragment extends BaseMwmDialogFragment @Override public void onCompassUpdated(double north) { - final Location last = LocationHelper.from(requireContext()).getSavedLocation(); + final Location last = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (last == null || mMapObject == null) return; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java index 35a925ca2..6f3f6eb86 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java @@ -21,14 +21,14 @@ import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment; import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment.Listener; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkInfo; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.Icon; -import app.organicmaps.bookmarks.data.Track; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkInfo; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.Icon; +import app.organicmaps.sdk.bookmarks.data.Track; import app.organicmaps.util.Graphics; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import com.google.android.material.appbar.MaterialToolbar; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java index 7a7fba5fd..768984fac 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java @@ -11,11 +11,12 @@ import androidx.annotation.Nullable; import androidx.core.widget.NestedScrollView; import app.organicmaps.ChartController; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.ElevationInfo; +import app.organicmaps.sdk.bookmarks.data.ElevationInfo; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java index b965b17d4..a4b820841 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java @@ -18,9 +18,9 @@ import com.github.mikephil.charting.components.IMarker; import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.utils.MPPointF; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; @SuppressLint("ViewConstructor") public class FloatingMarkerView extends RelativeLayout implements IMarker diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java index 5168ad5df..e39c478aa 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java @@ -1,10 +1,13 @@ package app.organicmaps.widget.placepage; +import static app.organicmaps.sdk.widget.placepage.PlacePageButtonFactory.nativeHasRecentlyDeletedBookmark; + import android.content.Context; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; + import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.util.ThemeUtils; @@ -74,6 +77,4 @@ public class PlacePageButtonFactory }; return new PlacePageButton(titleId, iconId, buttonType); } - - private native static boolean nativeHasRecentlyDeletedBookmark(); } diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java index cbd1fe347..93522c10a 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java @@ -22,21 +22,21 @@ import androidx.fragment.app.FragmentManager; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.R; import app.organicmaps.api.Const; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.RoadWarningMarkType; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType; import app.organicmaps.intent.Factory; import app.organicmaps.routing.RoutingController; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.util.bottomsheet.MenuBottomSheetItem; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.shape.MaterialShapeDrawable; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java index 0073d6275..3e1020ba8 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java @@ -8,10 +8,10 @@ import android.view.View; import android.widget.PopupMenu; import androidx.annotation.NonNull; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.util.Utils; -import app.organicmaps.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayManager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index 14e8db52a..5c5e623f2 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -22,32 +22,30 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.downloader.CountryItem; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.downloader.CountryItem; import app.organicmaps.downloader.DownloaderStatusIcon; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.editor.Editor; -import app.organicmaps.editor.OhState; -import app.organicmaps.editor.OpeningHours; -import app.organicmaps.editor.data.HoursMinutes; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.SensorListener; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.editor.OhState; //pastk: move? +import app.organicmaps.sdk.editor.OpeningHours; //pastk: a part of Editor? +import app.organicmaps.sdk.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.Timetable; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.SensorListener; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.DateUtils; +import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.util.SharingUtils; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; import app.organicmaps.widget.ArrowView; import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment; import app.organicmaps.widget.placepage.sections.PlacePageLinksFragment; @@ -69,6 +67,9 @@ import java.util.List; import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType; +import static app.organicmaps.sdk.util.Utils.getTagValueLocalized; + public class PlacePageView extends Fragment implements View.OnClickListener, View.OnLongClickListener, LocationListener, @@ -312,8 +313,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { super.onStart(); mViewModel.getMapObject().observe(requireActivity(), this); - LocationHelper.from(requireContext()).addListener(this); - SensorHelper.from(requireContext()).addListener(this); + MwmApplication.from(requireContext()).getLocationHelper().addListener(this); + MwmApplication.from(requireContext()).getSensorHelper().addListener(this); } @Override @@ -321,8 +322,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { super.onStop(); mViewModel.getMapObject().removeObserver(this); - LocationHelper.from(requireContext()).removeListener(this); - SensorHelper.from(requireContext()).removeListener(this); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(this); + MwmApplication.from(requireContext()).getSensorHelper().removeListener(this); UiThread.cancelDelayedTasks(updateOpenState); detachCountry(); } @@ -340,7 +341,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { refreshPreview(); refreshDetails(); - final Location loc = LocationHelper.from(requireContext()).getSavedLocation(); + final Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (mMapObject.isMyPosition()) refreshMyPosition(loc); else @@ -455,14 +456,14 @@ public class PlacePageView extends Fragment implements View.OnClickListener, refreshMetadataOrHide(mMapObject.hasAtm() ? getString(R.string.type_amenity_atm) : "", mAtm, mTvAtm); - final String wheelchair = Utils.getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR)); + final String wheelchair = getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR)); refreshMetadataOrHide(wheelchair, mWheelchair, mTvWheelchair); final String driveThrough = mMapObject.getMetadata(Metadata.MetadataType.FMD_DRIVE_THROUGH); refreshMetadataOrHide(driveThrough.equals("yes") ? getString(R.string.drive_through) : "", mDriveThrough, mTvDriveThrough); final String selfService = mMapObject.getMetadata(Metadata.MetadataType.FMD_SELF_SERVICE); - refreshMetadataOrHide(Utils.getTagValueLocalized(getContext(), "self_service", selfService), mSelfService, mTvSelfService); + refreshMetadataOrHide(getTagValueLocalized(getContext(), "self_service", selfService), mSelfService, mTvSelfService); final String outdoorSeating = mMapObject.getMetadata(Metadata.MetadataType.FMD_OUTDOOR_SEATING); refreshMetadataOrHide(outdoorSeating.equals("yes") ? getString(R.string.outdoor_seating) : "", mOutdoorSeating, mTvOutdoorSeating); @@ -821,7 +822,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, if (mMapObject == null || mMapObject.isMyPosition()) return; - final Location location = LocationHelper.from(requireContext()).getSavedLocation(); + final Location location = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (location == null) { UiUtils.hide(mAvDirection); diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java index fa8ed2f3d..25b6d5667 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java @@ -3,7 +3,7 @@ package app.organicmaps.widget.placepage; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java index f4df69956..c64c55490 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java @@ -7,9 +7,9 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; +import app.organicmaps.sdk.util.UiUtils; import java.util.ArrayList; import java.util.Arrays; @@ -17,8 +17,8 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; -import static app.organicmaps.editor.data.TimeFormatUtils.formatNonBusinessTime; -import static app.organicmaps.editor.data.TimeFormatUtils.formatWeekdaysRange; +import static app.organicmaps.sdk.editor.data.TimeFormatUtils.formatNonBusinessTime; +import static app.organicmaps.sdk.editor.data.TimeFormatUtils.formatWeekdaysRange; import com.google.android.material.textview.MaterialTextView; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java index 146efd757..5405be434 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java @@ -24,11 +24,11 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.Bookmark; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.bookmarks.data.Bookmark; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.EditBookmarkFragment; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java index 796e0f3ee..45c401389 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java @@ -12,10 +12,10 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java index 8842fea8b..d29798e8b 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java @@ -18,14 +18,14 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.editor.OpeningHours; -import app.organicmaps.editor.data.TimeFormatUtils; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.editor.OpeningHours; +import app.organicmaps.sdk.editor.data.TimeFormatUtils; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java index fe4dacc56..07a658e28 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java @@ -12,8 +12,8 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; import app.organicmaps.widget.placepage.PlacePageViewModel; public class PlacePagePhoneFragment extends Fragment implements Observer diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java index b86c395ed..dd0b778c4 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java @@ -17,10 +17,10 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; import app.organicmaps.util.Utils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.widget.placepage.PlaceDescriptionActivity; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java b/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java index b1a28f4f1..3ae0b45a4 100644 --- a/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java +++ b/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java @@ -1,8 +1,8 @@ package app.organicmaps.widget.placepage.sections; -import app.organicmaps.editor.data.HoursMinutes; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; import app.organicmaps.widget.placepage.sections.PlaceOpeningHoursAdapter.WeekScheduleData; import org.junit.Before; import org.junit.Test; diff --git a/android/app/src/web/java/app/organicmaps/location b/android/app/src/web/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/web/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/web/java/app/organicmaps/sdk/location b/android/app/src/web/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/web/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/drape/gl_includes.hpp b/drape/gl_includes.hpp index 308138b30..0be148247 100644 --- a/drape/gl_includes.hpp +++ b/drape/gl_includes.hpp @@ -19,7 +19,7 @@ #define GL_GLEXT_PROTOTYPES #include #include - #include "android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h" + #include "android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h" #include #elif defined(OMIM_OS_LINUX) #define GL_GLEXT_PROTOTYPES From d8cdfb8080eb19d733ca216d54c7e0655c68ae3f Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 24 Jul 2025 20:08:39 +0700 Subject: [PATCH 054/222] [android] Fix additional SDK merge issues Signed-off-by: Konstantin Pastbin --- .../cpp/app/organicmaps/sdk/TrackRecorder.cpp | 2 +- .../organicmaps/sdk/editor/OpeningHours.cpp | 2 +- .../app/organicmaps/sdk/platform/GuiThread.cpp | 2 +- .../organicmaps/sdk/routing/RoutingInfo.hpp | 2 +- .../sdk/settings/MapLanguageCode.cpp | 2 +- .../app/organicmaps/backup/BackupUtils.java | 6 +++--- .../organicmaps/backup/LocalBackupManager.java | 18 +++++++++--------- .../backup/PeriodicBackupRunner.java | 4 ++-- .../organicmaps/sdk/editor/OpeningHours.java | 1 + .../settings/BackupSettingsFragment.java | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp index 66c2bcbe2..5a9df5298 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp @@ -2,7 +2,7 @@ #include "map/gps_tracker.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp index 7802dde29..ec16b2abc 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp @@ -324,7 +324,7 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts) { TimeTableSet tts = NativeTimetableSet(env, jTts); time_t const now = time(nullptr); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp index ae39ea14e..6b8f16f6d 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp @@ -10,7 +10,7 @@ GuiThread::GuiThread() { JNIEnv * env = jni::GetEnv(); - m_class = GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread"); + m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread"); ASSERT(m_class, ()); m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp index 6f4fe6371..d200d93bf 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp @@ -2,7 +2,7 @@ #include "app/organicmaps/sdk/core/jni_helper.hpp" #include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "map/routing_manager.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp index fd3cf07d7..f384c6cd7 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp @@ -2,7 +2,7 @@ #include "platform/settings.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" extern "C" { diff --git a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java index 74d88e65f..20a2c6713 100644 --- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java +++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java @@ -2,7 +2,7 @@ package app.organicmaps.backup; import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT; import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY; -import static app.organicmaps.util.StorageUtils.isFolderWritable; +import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; import android.app.Activity; import android.content.Context; @@ -29,8 +29,8 @@ import java.util.List; import java.util.Locale; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.log.Logger; public class BackupUtils { diff --git a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java index 628b951a7..f560fe946 100644 --- a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java +++ b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java @@ -2,8 +2,8 @@ package app.organicmaps.backup; import static app.organicmaps.backup.BackupUtils.getBackupName; import static app.organicmaps.backup.BackupUtils.getBackupFolders; -import static app.organicmaps.util.StorageUtils.copyFileToDocumentFile; -import static app.organicmaps.util.StorageUtils.deleteDirectoryRecursive; +import static app.organicmaps.sdk.util.StorageUtils.copyFileToDocumentFile; +import static app.organicmaps.sdk.util.StorageUtils.deleteDirectoryRecursive; import android.app.Activity; import android.net.Uri; @@ -17,13 +17,13 @@ import java.util.Arrays; import java.util.Comparator; import java.util.List; -import app.organicmaps.bookmarks.data.BookmarkCategory; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.BookmarkSharingResult; -import app.organicmaps.bookmarks.data.KmlFileType; -import app.organicmaps.util.concurrency.ThreadPool; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult; +import app.organicmaps.sdk.bookmarks.data.KmlFileType; +import app.organicmaps.sdk.util.concurrency.ThreadPool; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; public class LocalBackupManager implements BookmarkManager.BookmarksSharingListener { diff --git a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java index a2d95198f..0f0be9af8 100644 --- a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java +++ b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java @@ -5,14 +5,14 @@ import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable; import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY; import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY; import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY; -import static app.organicmaps.util.StorageUtils.isFolderWritable; +import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; import android.app.Activity; import android.content.SharedPreferences; import androidx.preference.PreferenceManager; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public class PeriodicBackupRunner { diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java index c2d970773..cbc5579a0 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java @@ -4,6 +4,7 @@ import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import app.organicmaps.editor.OhState; import app.organicmaps.sdk.editor.data.Timespan; import app.organicmaps.sdk.editor.data.Timetable; diff --git a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java index a544db49b..1716a4d08 100644 --- a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java @@ -3,7 +3,7 @@ package app.organicmaps.settings; import static app.organicmaps.backup.BackupUtils.formatReadableFolderPath; import static app.organicmaps.backup.BackupUtils.getMaxBackups; import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable; -import static app.organicmaps.util.StorageUtils.isFolderWritable; +import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; import android.app.Activity; import android.content.Intent; @@ -27,7 +27,7 @@ import java.text.DateFormat; import app.organicmaps.R; import app.organicmaps.backup.LocalBackupManager; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public class BackupSettingsFragment From 088a2bfd22e5b586848bd51a823db9ef9a6a5394 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Fri, 25 Jul 2025 16:22:24 +0000 Subject: [PATCH 055/222] [strings] Update from Codeberg Translate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cayenne79 Co-authored-by: Codeberg Translate Co-authored-by: Edison_Lu Co-authored-by: Fjuro Co-authored-by: Juno Takano Co-authored-by: Lenny Angst Co-authored-by: N4ta Co-authored-by: Prefill add-on Co-authored-by: Priit Jõerüüt Co-authored-by: Supaplextw Co-authored-by: Weblate Co-authored-by: Weblate Translation Memory Co-authored-by: ZeljkoBG Co-authored-by: alexgabi Co-authored-by: hosara Co-authored-by: ldmpub Co-authored-by: maklein Co-authored-by: phama Co-authored-by: rimas Co-authored-by: sunsand Co-authored-by: x7z4w Co-authored-by: yannikbloscheck Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings --- data/countries-strings/de.json/localize.json | 8 ++++---- iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/countries-strings/de.json/localize.json b/data/countries-strings/de.json/localize.json index 389039e79..5b7133b7b 100644 --- a/data/countries-strings/de.json/localize.json +++ b/data/countries-strings/de.json/localize.json @@ -1782,10 +1782,10 @@ "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", "India_Karnataka_South Description":"Bangalore", "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", +"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti", "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", "India_Maharashtra Description":"Mumbai", -"India_Manipur Description":"Imphal, Imphal, Jiribam", +"India_Manipur Description":"Imphal, Jiribam", "India_Meghalaya Description":"Shillong, Garobandha, Betasing", "India_Mizoram Description":"Aizawl, Lunglei, Mamit", "India_Nagaland Description":"Kohima, Peren", @@ -1798,14 +1798,14 @@ "India_Tripura Description":"Agartala, Bisramganj, Belonia", "India_Uttar Pradesh Description":"Allahabad, Lucknow, Varanasi", "India_Uttarakhand Description":"Dehradun, Roorkee, Haridwār", -"India_West Bengal Description":"Kalkutta", +"India_West Bengal Description":"Kalkutta, Siliguri, Asansol", "Indonesia_Central Description":"Makassar, Samarinda, Pontianak", "Indonesia_East Description":"Sorong, Timika, Manokwari", "Indonesia_Jawa Barat Description":"Jakarta", "Indonesia_Jawa Tengah Description":"Semarang, Yogyakarta, Surakarta", "Indonesia_Jawa Timur Description":"Sumenep, Tulungagung, Batu", "Indonesia_Nusa Tenggara Description":"Denpasar, Semarapura, Tambolaka", -"Indonesia_West Description":"Medan, SIak Sri Indrapura, Lampung Town", +"Indonesia_West Description":"Medan, SIak Sri Indrapura, Lampung-Stadt", "Iran_East Description":"Maschhad, Zahedan, Yazd", "Iran_North Description":"Teheran, Karadsch, Täbris", "Iran_South Description":"Isfahan, Schiras, Ahvaz", diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index c940b9322..bfcc3d796 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1098,6 +1098,6 @@ "track_recording_toast_nothing_to_save" = "Route ist leer - nichts zu speichern"; "edit_track" = "Track bearbeiten"; "pref_mapappearance_title" = "Kartendarstellung"; -"pref_maplanguage_title" = "Map Language"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Sprache auf der Karte"; +"transliteration_title_disabled_summary" = "Ausgeschaltet wenn immer die lokale Sprache auf der Karte benutzt wird"; +"pref_maplanguage_local" = "Lokale Sprache"; From 115dbbea79c3e77598f44dc6e105c0fa754f2b56 Mon Sep 17 00:00:00 2001 From: maklein Date: Fri, 25 Jul 2025 17:00:07 +0000 Subject: [PATCH 056/222] Translated using Weblate (German) Currently translated at 100.0% (106 of 106 strings) Translation: CoMaps/Voice announcements for navigation (TTS) --- data/sound-strings/de.json/localize.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sound-strings/de.json/localize.json b/data/sound-strings/de.json/localize.json index 95d1db868..7675697ac 100644 --- a/data/sound-strings/de.json/localize.json +++ b/data/sound-strings/de.json/localize.json @@ -9,7 +9,7 @@ "enter_the_roundabout":"Fahren Sie in den Kreisverkehr ein.", "enter_the_roundabout_street":"NULL", "enter_the_roundabout_street_verb":"NULL", -"leave_the_roundabout":"Fahren Sie aus dem Kreisverkehr ab.", +"leave_the_roundabout":"Fahren Sie aus dem Kreisverkehr aus.", "leave_the_roundabout_street":"NULL", "leave_the_roundabout_street_verb":"NULL", "make_a_slight_left_turn":"Halten Sie sich links.", From 47741282cf106076432b0cee7f5ee778793c658b Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sun, 13 Jul 2025 17:10:00 +0200 Subject: [PATCH 057/222] [styles] Add amenity-bicycle_parking-covered Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- android/app/src/main/res/values/types_strings.xml | 1 + data/mapcss-mapping.csv | 1 + .../default/dark/symbols/bicycle-parking-covered-m.svg | 6 ++++++ data/styles/default/include/Icons.mapcss | 4 ++++ data/styles/default/include/priorities_4_overlays.prio.txt | 2 ++ .../default/light/symbols/bicycle-parking-covered-m.svg | 6 ++++++ data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++ .../Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 1 + 8 files changed, 23 insertions(+) create mode 100644 data/styles/default/dark/symbols/bicycle-parking-covered-m.svg create mode 100644 data/styles/default/light/symbols/bicycle-parking-covered-m.svg diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 96474e4cd..83bfe993d 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -28,6 +28,7 @@ Barbecue Grill Bench Bicycle Parking + Covered Bicycle Parking Bicycle Rental Bicycle Repair Station Biergarten diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index bd90284a5..1f85a324a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1746,3 +1746,4 @@ railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name; shop|hearing_aids;1622; railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623; railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; +amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; diff --git a/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg b/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg new file mode 100644 index 000000000..fc8e11840 --- /dev/null +++ b/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 51ac3d969..88aada9d4 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -2026,6 +2026,10 @@ node|z19-[amenity=parking][parking=lane][access=private], node|z17-[amenity=bicycle_parking], {icon-image: bicycle-parking-m.svg;} +node|z17-[amenity=bicycle_parking][covered=yes], +area|z17-[amenity=bicycle_parking][covered=yes], +{icon-image: bicycle-parking-covered-m.svg;} + node|z17-[amenity=motorcycle_parking], {icon-image: motorcycle-parking-m.svg;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8ac6abad0..ae03f0788 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1205,6 +1205,7 @@ amenity-parking-underground-fee # icon z16- (also has captio === 300 amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) @@ -2134,6 +2135,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9700 # amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) # amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) diff --git a/data/styles/default/light/symbols/bicycle-parking-covered-m.svg b/data/styles/default/light/symbols/bicycle-parking-covered-m.svg new file mode 100644 index 000000000..8b24bf740 --- /dev/null +++ b/data/styles/default/light/symbols/bicycle-parking-covered-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 826dccf4e..a2cfb93cd 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1206,6 +1206,7 @@ amenity-parking-underground-fee # icon z16- (also has captio === 300 amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) @@ -2139,6 +2140,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9700 # amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) # amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 7ce532875..83e766ac8 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -29,6 +29,7 @@ "type.amenity.bbq" = "Barbecue Grill"; "type.amenity.bench" = "Bench"; "type.amenity.bicycle_parking" = "Bicycle Parking"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; "type.amenity.bicycle_rental" = "Bicycle Rental"; "type.amenity.bicycle_repair_station" = "Bicycle Repair Station"; "type.amenity.biergarten" = "Biergarten"; From 8f11eb876efc77aab9eadfdd39241f1297527f12 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 14:57:50 +0700 Subject: [PATCH 058/222] [editor] Add amenity-bicycle_parking-covered Signed-off-by: Konstantin Pastbin --- data/editor.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/editor.config b/data/editor.config index e5dd2a35b..4438810e3 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1109,6 +1109,11 @@ + + + + + From 161123245ea4cbfd3d9dc3a74768ab145660720d Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 10 Jul 2025 23:55:02 -0300 Subject: [PATCH 059/222] [styles] Set the office=diplomatic priority near the post_office. Signed-off-by: Viktor Govako --- data/styles/default/include/priorities_4_overlays.prio.txt | 2 +- data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index ae03f0788..e84c3b282 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -804,6 +804,7 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) +office-diplomatic attraction-amusement_ride # icon z17- (also has caption(optional) z17-) attraction-animal # icon z17- (also has caption(optional) z17-) attraction-big_wheel # icon z17- (also has caption(optional) z17-) @@ -1149,7 +1150,6 @@ healthcare-speech_therapist # icon z17- (also has captio leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) office-company # icon z18- (also has caption(optional) z18-) -office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) office-ngo # icon z18- (also has caption(optional) z18-) office-telecommunication # icon z18- (also has caption(optional) z18-) shop-agrarian # icon z18- (also has caption(optional) z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index a2cfb93cd..4e400d5d6 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -804,6 +804,7 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) +office-diplomatic attraction-amusement_ride # icon z17- (also has caption(optional) z17-) attraction-animal # icon z17- (also has caption(optional) z17-) attraction-big_wheel # icon z17- (also has caption(optional) z17-) @@ -1150,7 +1151,6 @@ healthcare-speech_therapist # icon z17- (also has captio leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) office-company # icon z18- (also has caption(optional) z18-) -office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) office-ngo # icon z18- (also has caption(optional) z18-) office-telecommunication # icon z18- (also has caption(optional) z18-) shop-agrarian # icon z18- (also has caption(optional) z18-) From 4e9efa63ff2247e63eab115dbe32bb722f0b4974 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 11 Jul 2025 00:27:16 -0300 Subject: [PATCH 060/222] [classifier] Added post_office=post_partner. Signed-off-by: Viktor Govako --- android/app/src/main/res/values/types_strings.xml | 1 + data/categories.txt | 2 +- data/mapcss-mapping.csv | 1 + data/styles/default/include/Icons.mapcss | 3 +++ data/styles/default/include/priorities_4_overlays.prio.txt | 1 + data/styles/outdoors/include/priorities_4_overlays.prio.txt | 1 + data/styles/vehicle/include/Icons.mapcss | 6 ++++++ data/styles/vehicle/include/priorities_4_overlays.prio.txt | 3 ++- .../Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 1 + 9 files changed, 17 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 83bfe993d..bac0e256e 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -129,6 +129,7 @@ Police Mailbox Post Office + Post Partner Prison Pub Book Exchange diff --git a/data/categories.txt b/data/categories.txt index f00f5310f..6b49373ee 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -6606,7 +6606,7 @@ sk:3Poštová schránka|3schránka sw:Sanduku la posta fa:صندوق پست -amenity-post_office|@category_post +amenity-post_office|post_office-post_partner|@category_post en:3Post Office|U+2709|U+1F3E3|U+1F4E8|U+1F4E9|U+1F3E4|U+1F4EF ru:3Почтовое отделение be:3Паштовае аддзяленне diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 1f85a324a..f761d44cf 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1747,3 +1747,4 @@ shop|hearing_aids;1622; railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623; railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; +post_office|post_partner;1626; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 88aada9d4..3de83e846 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -800,6 +800,7 @@ node|z17-[amenity=motorcycle_rental], node|z17-[amenity=bicycle_rental], node|z17-[amenity=bicycle_repair_station], node|z17-[amenity=post_office], +node|z18-[post_office=post_partner], node|z17-[man_made=works], node|z17-[amenity=parcel_locker], node|z17-[amenity=public_bath], @@ -1292,8 +1293,10 @@ node|z18-[amenity=bicycle_repair_station], {font-size: 11;} node|z17-[amenity=post_office], +node|z18-[post_office=post_partner], {icon-image: mail-m.svg;} node|z18-[amenity=post_office], +node|z18-[post_office=post_partner], {font-size: 11;} node|z18-[amenity=post_box], {icon-image: postbox-m.svg;font-size: 11;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index e84c3b282..85326a153 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1176,6 +1176,7 @@ shop-watches # icon z18- (also has captio shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 +post_office-post_partner amenity-shower # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z18- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 4e400d5d6..3f1e1d094 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1177,6 +1177,7 @@ shop-watches # icon z18- (also has captio shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 +post_office-post_partner amenity-shower # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z15- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index e3748e820..218788083 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -530,6 +530,8 @@ node|z17-[amenity=parcel_locker], area|z17-[amenity=parcel_locker], node|z17-[amenity=post_office], area|z17-[amenity=post_office], +node|z18-[post_office=post_partner], +area|z18-[post_office=post_partner], {text: name;text-color: @poi_label;text-offset: 1;font-size: 11;} /* POI */ @@ -678,9 +680,13 @@ area|z17-[amenity=parcel_locker], node|z17-[amenity=post_office], area|z17-[amenity=post_office], +node|z18-[post_office=post_partner], +area|z18-[post_office=post_partner], {icon-image: mail-m.svg;} node|z18-[amenity=post_office], area|z18-[amenity=post_office], +node|z18-[post_office=post_partner], +area|z18-[post_office=post_partner], {font-size: 11;} /* 6. SHOP */ diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 582060cb4..27c86230f 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -723,7 +723,8 @@ amenity-parcel_locker # icon z17- (also has captio amenity-police # icon z17- amenity-post_office # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z17- (also has caption(optional) z17-) -shop-motorcycle # icon z17- +shop-motorcycle +post_office-post_partner === 200 highway-traffic_signals # icon z15- diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 83e766ac8..a6c700320 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -132,6 +132,7 @@ "type.amenity.police" = "Police"; "type.amenity.post_box" = "Mailbox"; "type.amenity.post_office" = "Post Office"; +"type.post_office.post_partner" = "Post Partner"; "type.amenity.prison" = "Prison"; "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Book Exchange"; From 11ee2b121b04f3d46457c86ecc381f457bfd40d0 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 15 Jul 2025 00:00:37 -0300 Subject: [PATCH 061/222] Added ftype::Trunc. Signed-off-by: Viktor Govako --- feature_list/feature_list.cpp | 7 +++---- indexer/classificator.hpp | 5 +++++ indexer/feature_data.cpp | 8 ++------ indexer/ftypes_mapping.hpp | 5 +---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp index 50a7da03c..77afd7cd6 100644 --- a/feature_list/feature_list.cpp +++ b/feature_list/feature_list.cpp @@ -95,10 +95,9 @@ string GetWheelchairType(FeatureType & f) { static const uint32_t wheelchair = classif().GetTypeByPath({"wheelchair"}); string result; - f.ForEachType([&result](uint32_t type) { - uint32_t truncated = type; - ftype::TruncValue(truncated, 1); - if (truncated == wheelchair) + f.ForEachType([&result](uint32_t type) + { + if (ftype::Trunc(type, 1) == wheelchair) { string fullName = classif().GetReadableObjectName(type); auto pos = fullName.find("-"); diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp index 7322156f3..c86f182e1 100644 --- a/indexer/classificator.hpp +++ b/indexer/classificator.hpp @@ -24,6 +24,11 @@ namespace ftype uint8_t GetValue(uint32_t type, uint8_t level); void PopValue(uint32_t & type); void TruncValue(uint32_t & type, uint8_t level); + inline uint32_t Trunc(uint32_t type, uint8_t level) + { + TruncValue(type, level); + return type; + } uint8_t GetLevel(uint32_t type); } diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index ef2a16646..914008267 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -417,9 +417,7 @@ void FeatureParams::SetRwSubwayType(char const * cityName) for (size_t i = 0; i < m_types.size(); ++i) { - uint32_t t = m_types[i]; - ftype::TruncValue(t, 2); - if (t == src) + if (ftype::Trunc(m_types[i], 2) == src) { m_types[i] = dest; break; @@ -492,9 +490,7 @@ uint32_t FeatureParams::FindType(uint32_t comp, uint8_t level) const { for (uint32_t const type : m_types) { - uint32_t t = type; - ftype::TruncValue(t, level); - if (t == comp) + if (ftype::Trunc(type, level) == comp) return type; } return ftype::GetEmptyValue(); diff --git a/indexer/ftypes_mapping.hpp b/indexer/ftypes_mapping.hpp index 4abdf31cd..abf3023b1 100644 --- a/indexer/ftypes_mapping.hpp +++ b/indexer/ftypes_mapping.hpp @@ -23,10 +23,7 @@ public: { for (auto level = ftype::GetLevel(t); level; --level) { - auto truncatedType = t; - ftype::TruncValue(truncatedType, level); - auto const it = m_mapping.find(truncatedType); - + auto const it = m_mapping.find(ftype::Trunc(t, level)); if (it != m_mapping.cend()) return it; } From 4588703f712e5ae6e0a8730eb7395689022e3353 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 11 Jul 2025 15:38:03 -0300 Subject: [PATCH 062/222] [classifier] Added amenity=ranger_station. Signed-off-by: Viktor Govako --- android/app/src/main/res/values/types_strings.xml | 1 + data/categories.txt | 4 ++-- data/mapcss-mapping.csv | 1 + .../styles/default/dark/symbols/ranger-station-m.svg | 4 ++++ data/styles/default/include/Icons.mapcss | 4 ++++ .../default/include/priorities_4_overlays.prio.txt | 2 ++ .../default/light/symbols/ranger-station-m.svg | 4 ++++ data/styles/outdoors/include/Icons.mapcss | 4 ++++ .../outdoors/include/priorities_4_overlays.prio.txt | 2 ++ indexer/indexer_tests/checker_test.cpp | 12 +++++++----- .../en.lproj/LocalizableTypes.strings | 1 + 11 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 data/styles/default/dark/symbols/ranger-station-m.svg create mode 100644 data/styles/default/light/symbols/ranger-station-m.svg diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index bac0e256e..cbadf0b85 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -1337,6 +1337,7 @@ Tourist Map Tourist Office Visitor Centre + Ranger Station Motel Museum Picnic Site diff --git a/data/categories.txt b/data/categories.txt index 6b49373ee..85e257496 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -13463,7 +13463,7 @@ vi:Bao vây động vật zh-Hans:动物围栏 zh-Hant:動物圍欄 -tourism-information-office|@category_tourism +tourism-information-office|amenity-ranger_station|@category_tourism en:4Tourist Office ru:3Туристический офис|туристическая информация bg:3Туристически офис|туризъм|информация @@ -13501,7 +13501,7 @@ sk:3Turistické informačné centrum fa:دفتر گردشگری mr:पर्यटन कार्यालय -tourism-information-visitor_centre|@category_tourism +tourism-information-visitor_centre|amenity-ranger_station|@category_tourism en:3Visitor Centre ar:مركز الزوار be:Цэнтр для наведвальнікаў diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index f761d44cf..b3480e558 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1748,3 +1748,4 @@ railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao] railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; post_office|post_partner;1626; +amenity|ranger_station;1627; diff --git a/data/styles/default/dark/symbols/ranger-station-m.svg b/data/styles/default/dark/symbols/ranger-station-m.svg new file mode 100644 index 000000000..21396fc7a --- /dev/null +++ b/data/styles/default/dark/symbols/ranger-station-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 3de83e846..03f9fcbba 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -395,6 +395,7 @@ node|z15-[historic=ship], node|z16-[tourism=information], node|z15-[tourism=information][information=office], node|z15-[tourism=information][information=visitor_centre], +node|z15-[amenity=ranger_station], node|z16-[historic=aircraft], node|z16-[historic=tank], node|z16-[historic=wreck], @@ -549,6 +550,9 @@ node|z16-[tourism=information][information=guidepost] node|z16-[tourism=information][information=map] {icon-image: map.svg;text-offset: 1;icon-min-distance: 10;} +node|z15-[amenity=ranger_station], +{icon-image: ranger-station-m.svg; icon-min-distance: 10;} + node|z16-[historic=boundary_stone], node|z16-[historic=gallows], node|z16-[historic=pillory], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 85326a153..ba922e010 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -360,6 +360,7 @@ railway-subway_entrance-spb # icon z15- (also has captio historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z15- (also has caption(optional) z15-) tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-) +amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1515,6 +1516,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z15- (also has icon z15-) # tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-) +# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) diff --git a/data/styles/default/light/symbols/ranger-station-m.svg b/data/styles/default/light/symbols/ranger-station-m.svg new file mode 100644 index 000000000..e061beae6 --- /dev/null +++ b/data/styles/default/light/symbols/ranger-station-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index dc4ae7c19..e148a774c 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -25,6 +25,7 @@ area|z14-[man_made=water_well], node|z15-[tourism=information], node|z14-[tourism=information][information=office], node|z14-[tourism=information][information=visitor_centre], +node|z14-[amenity=ranger_station], node|z14-[man_made=flagpole], node|z14-[man_made=mast], node|z14-[man_made=silo], @@ -334,6 +335,9 @@ node|z15-[tourism=information][information=guidepost], node|z15-[tourism=information][information=map], {icon-image: map.svg;} +node|z14-[amenity=ranger_station], +{icon-image: ranger-station-m.svg; icon-min-distance: 10;} + node|z14-[man_made=survey_point], {icon-image: survey_point-m.svg; font-size: 11;} node|z16-[man_made=survey_point], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3f1e1d094..e4d28b82c 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -360,6 +360,7 @@ railway-subway_entrance-spb # icon z15- (also has captio historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z13- (also has caption(optional) z14-) tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-) +amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1518,6 +1519,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z14- (also has icon z13-) # tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-) +# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp index 44c3e6c79..5d3331f1e 100644 --- a/indexer/indexer_tests/checker_test.cpp +++ b/indexer/indexer_tests/checker_test.cpp @@ -137,15 +137,17 @@ UNIT_TEST(IsAttractionsChecker) Classificator const & c = classif(); auto const & checker = ftypes::AttractionsChecker::Instance(); - auto const isTourismInfo = [ethalon = c.GetTypeByPath({"tourism", "information"})](uint32_t t) - { - ftype::TruncValue(t, 2); - return t == ethalon; + base::StringIL arrExceptions[] = { + {"tourism", "information"}, + {"amenity", "ranger_station"}, }; + std::vector exceptions; + for (auto e : arrExceptions) + exceptions.push_back(c.GetTypeByPath(e)); for (uint32_t const t : search::GetCategoryTypes("sights", "en", GetDefaultCategories())) { - if (!isTourismInfo(t)) + if (!base::IsExist(exceptions, ftype::Trunc(t, 2))) TEST(checker(t), (c.GetFullObjectName(t))); } } diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index a6c700320..816d9e04a 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1436,6 +1436,7 @@ "type.tourism.information.map" = "Tourist Map"; "type.tourism.information.office" = "Tourist Office"; "type.tourism.information.visitor_centre" = "Visitor Centre"; +"type.amenity.ranger_station" = "Ranger Station"; "type.tourism.motel" = "Motel"; "type.tourism.museum" = "Museum"; "type.tourism.picnic_site" = "Picnic Site"; From 20e0b0ff95ab74bad395d4893e5ff719f708fe72 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 15:24:43 +0700 Subject: [PATCH 063/222] [styles] Fix ranger station icons color Signed-off-by: Konstantin Pastbin --- data/styles/default/dark/symbols/ranger-station-m.svg | 2 +- data/styles/default/light/symbols/ranger-station-m.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/styles/default/dark/symbols/ranger-station-m.svg b/data/styles/default/dark/symbols/ranger-station-m.svg index 21396fc7a..609a8f99e 100644 --- a/data/styles/default/dark/symbols/ranger-station-m.svg +++ b/data/styles/default/dark/symbols/ranger-station-m.svg @@ -1,4 +1,4 @@ - + diff --git a/data/styles/default/light/symbols/ranger-station-m.svg b/data/styles/default/light/symbols/ranger-station-m.svg index e061beae6..299b38716 100644 --- a/data/styles/default/light/symbols/ranger-station-m.svg +++ b/data/styles/default/light/symbols/ranger-station-m.svg @@ -1,4 +1,4 @@ - + From 10f154858c5c5ee1ac9c20c2b52314f784cee9f8 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 15:27:16 +0700 Subject: [PATCH 064/222] [editor] Add ranger station Signed-off-by: Konstantin Pastbin --- data/editor.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/editor.config b/data/editor.config index 4438810e3..b5ea552c5 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1068,6 +1068,9 @@ + + + From 2b173cebe60d6fba210f2a4ba7a73cbc8cbe35d6 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 16:12:46 +0700 Subject: [PATCH 065/222] [search] Added synonyms to amenity-cinema Signed-off-by: Konstantin Pastbin --- data/categories.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 85e257496..90517efd0 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -5159,8 +5159,9 @@ zh-Hans:摩托车租赁 zh-Hant:摩托車租賃 amenity-cinema|@category_entertainment -en:3Cinema|U+1F3A6|U+1F3AC -ru:Кинотеатр|3кино +en:3Cinema|Film|U+1F3A6|U+1F3AC| +en-US:Movies|4Movie Theater +ru:Кинотеатр|3кино|фильм bg:3Кино|кинотеатър|филм|прожекция ar:سينما cs:3Kino|biograf From 57f543a0dd20b2f88b6c76ee94e6f64d9860cf02 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 15:39:02 +0700 Subject: [PATCH 066/222] [classif] Change escape_game type id to match OM Signed-off-by: Konstantin Pastbin --- data/mapcss-mapping.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b3480e558..e4703a517 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -608,7 +608,7 @@ boundary|protected_area|6;[boundary=protected_area][protect_class=6];;name;int_n leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487; highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488; highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489; -leisure|escape_game;490; +deprecated|deprecated;490;x deprecated|deprecated;491;x deprecated|deprecated;492;x highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493; @@ -1749,3 +1749,4 @@ railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;in amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; post_office|post_partner;1626; amenity|ranger_station;1627; +leisure|escape_game;1628; From 1fda5190325210b441eba3a40c6085417200de75 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Wed, 23 Jul 2025 17:26:31 +0200 Subject: [PATCH 067/222] [styles] Add amenity=luggage_locker Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- .../app/src/main/res/values/types_strings.xml | 1 + data/categories.txt | 83 ++++++++++++++++++- data/editor.config | 1 + data/mapcss-mapping.csv | 1 + data/replaced_tags.txt | 2 + .../default/dark/symbols/luggage_locker-m.svg | 4 + data/styles/default/include/Icons.mapcss | 3 + .../include/priorities_4_overlays.prio.txt | 2 + .../light/symbols/luggage_locker-m.svg | 4 + .../include/priorities_4_overlays.prio.txt | 2 + .../en.lproj/LocalizableTypes.strings | 1 + 11 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 data/styles/default/dark/symbols/luggage_locker-m.svg create mode 100644 data/styles/default/light/symbols/luggage_locker-m.svg diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index cbadf0b85..eaa3ea1c4 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -85,6 +85,7 @@ Kindergarten Library Loading Dock + Luggage Locker Marketplace Motorcycle Parking Nightclub diff --git a/data/categories.txt b/data/categories.txt index 90517efd0..2b934af99 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -8956,7 +8956,46 @@ uk:Мінігольф zh-Hans:迷你高尔夫 leisure-escape_game -en:4Escape Room|Escape Game +en:4Escape Room|Escape Game|quest +ar:غرفة الهروب +be:4Квест-пакой +bg:Ескейп стая +ca:Escape room +cs:Úniková místnost +da:Escape room +de:Escape room +el:Δωμάτιο απόδρασης +es:Escape room +et:Põgenemistuba +eu:Ihes gela +fa:اتاق فرار +fi:Pakohuone +fr:Salle d'évasion +he:חדר בריחה +hi:एस्केप रूम +hu:Szabadulószoba +id:Ruang petualangan +it:Escape room +ja:脱出ゲーム +ko:방탈출 +lv:Kvestu istaba +mr:एस्केप रूम +nb:Escape room +nl:Escaperoom +pl:Pokój zagadek +pt:Sala de fuga +pt-BR:Sala de fuga +ro:Cameră de evadare +ru:4Квест-комната +sk:Úniková miestnosť +sv:Escaperoom +sw:Chumba cha kutoroka +th:ห้องเกมปริศนา +tr:Kaçış odası +uk:4Квест-кімната +vi:Phòng giải đố +zh-Hans:密室逃脱 +zh-Hant:密室逃脫 leisure-hackerspace en:4Hackerspace @@ -18955,3 +18994,45 @@ zh-Hant:義大利麵 attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children en:Attraction ru:Аттракцион + +amenity-luggage_locker +en:Luggage|locker|storage +ar:خزانة الأمتعة +be:5Камера захоўвання|шафка|4багаж +bg:Багажно шкафче +ca:Armari d'equipatge +cs:Skříňka na zavazadla +da:Bagageskab +de:Gepäckschließfach +el:Θυρίδα αποσκευών +es:Consigna de equipajes +et:Pagasiruum +eu:Ekipajearen aldagela +fa:قفل چمدان +fi:Matkatavaralokero +fr:Consigne à bagages +he:ארון המזוודות +hi:सामान लॉकर +hu:Poggyászmegőrző +id:Loker Bagasi +it:Armadietto per i bagagli +ja:荷物ロッカー +ko:수하물 보관함 +lv:Bagāžas skapītis +mr:सामान लॉकर +nb:Bagasjeskap +nl:Bagagekluis +pl:Schowek na bagaż +pt:Cacifo para bagagens +pt-BR:Armário de bagagem +ro:Dulap pentru bagaje +ru:5Камера хранения|4багаж +sk:Skrinka na batožinu +sv:Bagageförvaring +sw:Locker ya mizigo +th:ตู้เก็บกระเป๋า +tr:Bagaj Dolabı +uk:5Камера схову|4багаж +vi:Tủ khóa hành lý +zh-Hans:行李寄存柜 +zh-Hant:行李寄存櫃 diff --git a/data/editor.config b/data/editor.config index b5ea552c5..3a1da5727 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1090,6 +1090,7 @@ + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index e4703a517..f5a7c5c11 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1750,3 +1750,4 @@ amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; post_office|post_partner;1626; amenity|ranger_station;1627; leisure|escape_game;1628; +amenity|luggage_locker;1629; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 0b085b5e2..01e3a2f15 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -196,3 +196,5 @@ attraction=train : attraction=amusement_ride attraction=swing_carousel : attraction=amusement_ride attraction=drop_tower : attraction=amusement_ride attraction=dark_ride : attraction=amusement_ride + +amenity=left_luggage : amenity=luggage_locker diff --git a/data/styles/default/dark/symbols/luggage_locker-m.svg b/data/styles/default/dark/symbols/luggage_locker-m.svg new file mode 100644 index 000000000..8eae1e0ef --- /dev/null +++ b/data/styles/default/dark/symbols/luggage_locker-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 03f9fcbba..19bfb437f 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1433,6 +1433,9 @@ node|z18-[amenity=public_bookcase], node|z17-[amenity=public_bath], {icon-image: public_bath-m.svg;font-size: 11;} +node|z17-[amenity=luggage_locker], +{icon-image: luggage_locker-m.svg;font-size: 11;} + /* 6. SHOP */ node|z16-[amenity=marketplace], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index ba922e010..873f5e691 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1186,6 +1186,7 @@ shop # icon z18- (also has captio === 470 amenity-bbq # icon z18- (also has caption(optional) z18-) +amenity-luggage_locker # icon z17- (also has caption(optional) z19-) amenity-public_bookcase # icon z18- (also has caption(optional) z18-) cemetery-grave # icon z17- (also has caption(optional) z17-) leisure-firepit # icon z18- (also has caption(optional) z18-) @@ -2120,6 +2121,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9530 # amenity-bbq # caption(optional) z18- (also has icon z18-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) # cemetery-grave # caption(optional) z17- (also has icon z17-) # leisure-firepit # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/default/light/symbols/luggage_locker-m.svg b/data/styles/default/light/symbols/luggage_locker-m.svg new file mode 100644 index 000000000..3391e3b32 --- /dev/null +++ b/data/styles/default/light/symbols/luggage_locker-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index e4d28b82c..3d81a6343 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1187,6 +1187,7 @@ shop # icon z18- (also has captio === 470 amenity-bbq # icon z16- (also has caption(optional) z17-) +amenity-luggage_locker # icon z17- (also has caption(optional) z19-) amenity-public_bookcase # icon z18- (also has caption(optional) z18-) cemetery-grave # icon z17- (also has caption(optional) z17-) leisure-firepit # icon z16- (also has caption(optional) z17-) @@ -2124,6 +2125,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9530 # amenity-bbq # caption(optional) z17- (also has icon z16-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) # cemetery-grave # caption(optional) z17- (also has icon z17-) # leisure-firepit # caption(optional) z17- (also has icon z16-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 816d9e04a..3724684fa 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -88,6 +88,7 @@ "type.amenity.kindergarten" = "Kindergarten"; "type.amenity.library" = "Library"; "type.amenity.loading_dock" = "Loading Dock"; +"type.amenity.luggage_locker" = "Luggage Locker"; "type.amenity.marketplace" = "Marketplace"; "type.amenity.motorcycle_parking" = "Motorcycle Parking"; "type.amenity.nightclub" = "Nightclub"; From e80679eeb092f02caa21af4a0ba6734984411dea Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 15:51:05 +0700 Subject: [PATCH 068/222] [styles] Fix luggage_locker icons color Signed-off-by: Konstantin Pastbin --- data/styles/default/dark/symbols/luggage_locker-m.svg | 2 +- data/styles/default/light/symbols/luggage_locker-m.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/styles/default/dark/symbols/luggage_locker-m.svg b/data/styles/default/dark/symbols/luggage_locker-m.svg index 8eae1e0ef..953a4de16 100644 --- a/data/styles/default/dark/symbols/luggage_locker-m.svg +++ b/data/styles/default/dark/symbols/luggage_locker-m.svg @@ -1,4 +1,4 @@ - + diff --git a/data/styles/default/light/symbols/luggage_locker-m.svg b/data/styles/default/light/symbols/luggage_locker-m.svg index 3391e3b32..731043454 100644 --- a/data/styles/default/light/symbols/luggage_locker-m.svg +++ b/data/styles/default/light/symbols/luggage_locker-m.svg @@ -1,4 +1,4 @@ - + From c6c758d7af00f920c8c78a0549eef1b087f9c7bc Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 15:51:42 +0700 Subject: [PATCH 069/222] [styles] Regenerate Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 9 +- data/drules_proto.bin | Bin 443670 -> 444711 bytes data/drules_proto.txt | 305 +++++++++++++++++- data/drules_proto_default_dark.bin | Bin 423312 -> 424298 bytes data/drules_proto_default_dark.txt | 288 ++++++++++++++++- data/drules_proto_default_light.bin | Bin 426352 -> 427338 bytes data/drules_proto_default_light.txt | 288 ++++++++++++++++- data/drules_proto_outdoors_dark.bin | Bin 443866 -> 444907 bytes data/drules_proto_outdoors_dark.txt | 305 +++++++++++++++++- data/drules_proto_outdoors_light.bin | Bin 447093 -> 448134 bytes data/drules_proto_outdoors_light.txt | 305 +++++++++++++++++- data/drules_proto_vehicle_dark.bin | Bin 284308 -> 284466 bytes data/drules_proto_vehicle_dark.txt | 51 +++ data/drules_proto_vehicle_light.bin | Bin 284581 -> 284739 bytes data/drules_proto_vehicle_light.txt | 51 +++ .../include/priorities_4_overlays.prio.txt | 11 +- .../include/priorities_4_overlays.prio.txt | 11 +- .../include/priorities_4_overlays.prio.txt | 5 +- data/types.txt | 7 +- data/visibility.txt | 9 +- 20 files changed, 1590 insertions(+), 55 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index a3747cf1a..2dd4cff2d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -34,7 +34,9 @@ world + bar - bbq - bench - - bicycle_parking - + bicycle_parking + + covered - + {} bicycle_rental - bicycle_repair_station - biergarten - @@ -84,6 +86,7 @@ world + library - loading_dock - love_hotel - + luggage_locker - marketplace - money_transfer - motorcycle_parking - @@ -145,6 +148,7 @@ world + pub - public_bath - public_bookcase - + ranger_station - recycling + centre - container - @@ -883,6 +887,9 @@ world + town - village - {} + post_office + + post_partner - + {} power + generator + gas - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 4ab1b7e11e5da51b0a5923dda5b4e18b0eca6226..85749ed9b5af902bb4516c9e3c5f8c9dbdfeb3ca 100644 GIT binary patch delta 695 zcmbQ%CB1x-^oCG9r>B$Xg3UW3aLWGqF6ILREUy1zY5WOPPv>l9GVlYSNl%}UArl-c|0h)NWv73SVOE~LL=?y} hkA<Is;F+R#35#&ln^c{V-8_#Qqw1{VUiOy<`BV@oE)#CuvstB*2>@!6T&e? ziFxU%Me)TYi6xo&c|xWf{7T|n0uWJMsOWTiZ#E@SQw{;#Qi8apgm6m<1)HskiJ*-Rhnrn^Ql$xg43VwRh1k|sNSGmK$5iAi{RfD|+LC3(O&&;$lFHy2xOVrI_tj}puZ+?v4PMHZNxHJxwz X7YSyW_NaVjAZ7t#*6mUGY-Vf#lxxd1 delta 96 zcmaF$Npiw#$qkHpn`QNNjW@F<+gdd*pVz*89^>}q^O!!=O)r*Vl%2jsmRWB46gD8s sYATcPbXz%QZU|RP4k)1_%PhM+RgT#xq}{Zb8Hibcn032pF`FqH0Ij_rH2?qr diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index b24701c75..3014def41 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -3572,6 +3572,73 @@ cont { } } } +cont { + name: "amenity-bicycle_parking-covered" + element { + scale: 17 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 18 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 19 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 20 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } +} cont { name: "amenity-bicycle_rental" element { @@ -7581,6 +7648,55 @@ cont { } } } +cont { + name: "amenity-luggage_locker" + element { + scale: 17 + symbol { + name: "luggage_locker-m" + priority: 450 + } + } + element { + scale: 18 + symbol { + name: "luggage_locker-m" + priority: 450 + } + } + element { + scale: 19 + symbol { + name: "luggage_locker-m" + priority: 450 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9550 + } + } + element { + scale: 20 + symbol { + name: "luggage_locker-m" + priority: 450 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9550 + } + } +} cont { name: "amenity-marketplace" element { @@ -11956,6 +12072,111 @@ cont { } } } +cont { + name: "amenity-ranger_station" + element { + scale: 15 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 16 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 17 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 18 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 19 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 20 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } +} cont { name: "amenity-recycling" element { @@ -63599,7 +63820,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -63608,7 +63829,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -63618,7 +63839,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -63627,7 +63848,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -63637,7 +63858,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -63646,7 +63867,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -63656,7 +63877,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -63665,7 +63886,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } } @@ -71428,6 +71649,57 @@ cont { } } } +cont { + name: "post_office-post_partner" + element { + scale: 18 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } + element { + scale: 19 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } + element { + scale: 20 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } +} cont { name: "power-generator" element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 57fa600213df6ef0c801ddc5ba9f277515197a98..e3641662b79725d3842ad0a767c616ea9c3d228e 100644 GIT binary patch delta 639 zcmey+Bz3AwY6GJl%S9D+)6T#`wd$(6}Dsk#M;McJ8o z=`iWZ4|V0`fog<^P$Nu)8WB8dHb2z;ZJf4)kxMKwH#IM_q*6DhG(9~rJvBZjKRG+K zNJtXsR8cMgR8ieri9^glDIr`^#vH zqWI#H#FEVXJRwsKekE}(0f?wBRCIcO7@Lx)DTe@VDM8#)Lb#=baZ8C{mr`ujn%Ay1 zk8!)!Jf@p1(@Ue6WTz`AGb>Mjnge7dz*!5RESc^1m6`8{YRqQjk|@Y8E{V@iOUq0K zrUnojm?TQ_fWfZ`3}bFCw%o+boXHp0D{yN90~U!tS!)*GBdrwvXf6u;GWDG#LdOW z#hIF$lvrF`Iej7*qx@vfi9FM9i7{eIcmgG)#W5rlw#%q9-wSP@QOgX(EI`b=}Bqw@<1g*gp~*rRw9B|iNa=Uz3nDxI~cjdU~bMSO;1luPmRyXPtHy) z5|RWuRg_BrRa7@u;t(@XN(h&fF^4dw)Z~qG6hw_VM6k-pZ~mBMXJtN<8R3$m#Ju#> zqWI#H#FEVXJRwsKJ|%H30f?wBR21lv4N3}J(;wO~Ny!40@Do-dKv;<&VI@L@l?W47 zB7#?mbhG~4cKx}G+x6!%P2M}joFM` z5(W9iCGq)bX_?8Xx?naig_Yz1V^b3tW!zkBxrv!MlRs>f=K%@`qYH>22`IGRT*VB; OEI`b<{pKn*Mri=Xh3`)Q delta 91 zcmaDoS^8GD^ag9a&EfjnO*WrQv9)Smw4i;_0>)05j0ndmeyZ`_I diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index e62f197d8..1b745ce8a 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -3595,6 +3595,73 @@ cont { } } } +cont { + name: "amenity-bicycle_parking-covered" + element { + scale: 17 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 18 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 19 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } + element { + scale: 20 + symbol { + name: "bicycle-parking-covered-m" + priority: 250 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9750 + } + } +} cont { name: "amenity-bicycle_rental" element { @@ -7723,6 +7790,55 @@ cont { } } } +cont { + name: "amenity-luggage_locker" + element { + scale: 17 + symbol { + name: "luggage_locker-m" + priority: 450 + } + } + element { + scale: 18 + symbol { + name: "luggage_locker-m" + priority: 450 + } + } + element { + scale: 19 + symbol { + name: "luggage_locker-m" + priority: 450 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9550 + } + } + element { + scale: 20 + symbol { + name: "luggage_locker-m" + priority: 450 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9550 + } + } +} cont { name: "amenity-marketplace" element { @@ -12098,6 +12214,128 @@ cont { } } } +cont { + name: "amenity-ranger_station" + element { + scale: 14 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 15 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 16 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 17 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 18 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 19 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } + element { + scale: 20 + symbol { + name: "ranger-station-m" + priority: 4400 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -5600 + } + } +} cont { name: "amenity-recycling" element { @@ -67944,7 +68182,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -67953,7 +68191,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -67963,7 +68201,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -67972,7 +68210,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -67982,7 +68220,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -67991,7 +68229,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } element { @@ -68001,7 +68239,7 @@ cont { } symbol { name: "embassy-m" - priority: 500 + priority: 2450 } caption { primary { @@ -68010,7 +68248,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9500 + priority: -7550 } } } @@ -76471,6 +76709,57 @@ cont { } } } +cont { + name: "post_office-post_partner" + element { + scale: 18 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } + element { + scale: 19 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } + element { + scale: 20 + symbol { + name: "mail-m" + priority: 470 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9530 + } + } +} cont { name: "power-generator" element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 7aa70c66689e9b5e4db31f8e43f6d58fddda1591..d2affef3437538bfe3cb3d508b4aca3e50abe38a 100644 GIT binary patch delta 730 zcmeymM7nLQ^ag7^r>B)*|3UW3aLWGqF6ILREUy1x?E4?(+$y`1>Q8}gQ>51v7@j3a)*{MZB zl0Y|#atWY{>gGxuVg^bH;gT}u5XO|6TsU7r)R;pAtBm~S`N;t`<};bO#9+Zzl$e*E zS`=Sgl30?NpC@F>!KWn7B>)lCg^B`QvO!6KYx+f7CTST{4t|0v1PH1SB&b4&pbBAv zDn#(AkZOK6zx~~O#_jLsGfmw-xyW92`hsv~<;h1fWT!uXF%%+zA}yJ++Y=&~zs6|H zX5^A6$S*F5&reIsOitAWvw>-iD%*>fQVT%H{CNP3f`65Vs`Sy^l R%s|Wn#H`yxwz4V80s!R`>%ss4 delta 87 zcmZo$EB$qe^ag9a&Efi~rkl%C{cW0)7PluYX55~%m}$!P$(v`(P8W`5R-SAUEIU0I h#+VFZv}~5$emR=?YfO9EPG%rx0b(lV1%b;0a{#G;bC)S}7j9h=%~l$n5- Ld3%jAi-a)%ux}O8 delta 27 hcmdnAPH@Uv!G;#bElf4a?NTaCK+L>dN`*zj7yyVn2k`&^ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 88e561f53..35962ce9f 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -44083,6 +44083,57 @@ cont { } } } +cont { + name: "post_office-post_partner" + element { + scale: 18 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } + element { + scale: 19 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } + element { + scale: 20 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } +} cont { name: "power-generator" element { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 105b6d45f4e9b3d662b0aa475f75291a01660e6c..4fb1af8b9a083f84398df6310d024e66b03bd9b5 100644 GIT binary patch delta 68 zcmZ3wUhwb+!G;#bElicl3bPrxBntA2OXBm>(lV1%b;0a{#G;bC)FL5G4x!0+ozy3< Ta|&;-RAvHV=IxcrEIK9tWtSKT delta 27 hcmX@SL2&7M!G;#bElicl?cyp-K+L>dT!lr)1OSVu2p|9e diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index d24e3eb5b..1e66199eb 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -43587,6 +43587,57 @@ cont { } } } +cont { + name: "post_office-post_partner" + element { + scale: 18 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } + element { + scale: 19 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } + element { + scale: 20 + symbol { + name: "mail-m" + priority: 200 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9800 + } + } +} cont { name: "power-generator" element { diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 873f5e691..93c501aa2 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 +amenity-ranger_station # icon z15- (also has caption(optional) z15-) historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z15- (also has caption(optional) z15-) tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-) -amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -805,7 +805,6 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) -office-diplomatic attraction-amusement_ride # icon z17- (also has caption(optional) z17-) attraction-animal # icon z17- (also has caption(optional) z17-) attraction-big_wheel # icon z17- (also has caption(optional) z17-) @@ -822,6 +821,7 @@ landuse-plant_nursery # icon z17- (also has captio leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450 @@ -1177,11 +1177,11 @@ shop-watches # icon z18- (also has captio shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 -post_office-post_partner amenity-shower # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z18- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) +post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1514,10 +1514,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 +# amenity-ranger_station # caption(optional) z15- (also has icon z15-) # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z15- (also has icon z15-) # tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-) -# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -1800,6 +1800,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) # leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) # === -7550 @@ -2087,7 +2088,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) # leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) # office-company # caption(optional) z18- (also has icon z18-) -# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # office-ngo # caption(optional) z18- (also has icon z18-) # office-telecommunication # caption(optional) z18- (also has icon z18-) # shop-agrarian # caption(optional) z18- (also has icon z18-) @@ -2117,6 +2117,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shower # caption(optional) z17- (also has icon z17-) # amenity-toilets # caption(optional) z18- (also has icon z18-) # office # caption(optional) z18- (also has icon z18-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) # shop # caption(optional) z18- (also has icon z18-) # === -9530 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3d81a6343..43f7c7e77 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 +amenity-ranger_station # icon z14- (also has caption(optional) z14-) historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z13- (also has caption(optional) z14-) tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-) -amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -805,7 +805,6 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) -office-diplomatic attraction-amusement_ride # icon z17- (also has caption(optional) z17-) attraction-animal # icon z17- (also has caption(optional) z17-) attraction-big_wheel # icon z17- (also has caption(optional) z17-) @@ -822,6 +821,7 @@ landuse-plant_nursery # icon z17- (also has captio leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450 @@ -1178,11 +1178,11 @@ shop-watches # icon z18- (also has captio shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 -post_office-post_partner amenity-shower # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z15- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) +post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1517,10 +1517,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 +# amenity-ranger_station # caption(optional) z14- (also has icon z14-) # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z14- (also has icon z13-) # tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-) -# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -1803,6 +1803,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) # leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) # === -7550 @@ -2091,7 +2092,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) # leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) # office-company # caption(optional) z18- (also has icon z18-) -# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # office-ngo # caption(optional) z18- (also has icon z18-) # office-telecommunication # caption(optional) z18- (also has icon z18-) # shop-agrarian # caption(optional) z18- (also has icon z18-) @@ -2121,6 +2121,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shower # caption(optional) z17- (also has icon z17-) # amenity-toilets # caption(optional) z18- (also has icon z15-) # office # caption(optional) z18- (also has icon z18-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) # shop # caption(optional) z18- (also has icon z18-) # === -9530 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 27c86230f..76e0f2c0c 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -723,8 +723,8 @@ amenity-parcel_locker # icon z17- (also has captio amenity-police # icon z17- amenity-post_office # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z17- (also has caption(optional) z17-) -shop-motorcycle -post_office-post_partner +post_office-post_partner # icon z18- (also has caption(optional) z18-) +shop-motorcycle # icon z17- === 200 highway-traffic_signals # icon z15- @@ -1205,6 +1205,7 @@ entrance-main # icon z18- (also has captio # amenity-parcel_locker # caption(optional) z17- (also has icon z17-) # amenity-post_office # caption(optional) z17- (also has icon z17-) # amenity-toilets # caption(optional) z17- (also has icon z17-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) # === -9800 # leisure-park-no-access # caption(optional) z14- (also has icon z14-, area z10-) diff --git a/data/types.txt b/data/types.txt index 4f3ba3bfc..5505a3cae 100644 --- a/data/types.txt +++ b/data/types.txt @@ -487,7 +487,7 @@ mapswithme *leisure|park|permissive *highway|bridleway|tunnel *highway|motorway_link|tunnel -*leisure|escape_game +mapswithme mapswithme mapswithme *highway|tertiary_link|bridge @@ -1622,3 +1622,8 @@ amenity|recycling|container *shop|hearing_aids *railway|station|subway|qingdao *railway|subway_entrance|qingdao +*amenity|bicycle_parking|covered +*post_office|post_partner +*amenity|ranger_station +*leisure|escape_game +*amenity|luggage_locker diff --git a/data/visibility.txt b/data/visibility.txt index 413d3aa5e..505978c60 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -34,7 +34,9 @@ world 000000000000000000000 + bar 000000000000000000000 - bbq 000000000000000000000 - bench 000000000000000000000 - - bicycle_parking 000000000000000000000 - + bicycle_parking 000000000000000000000 + + covered 000000000000000000000 - + {} bicycle_rental 000000000000000000000 - bicycle_repair_station 000000000000000000000 - biergarten 000000000000000000000 - @@ -84,6 +86,7 @@ world 000000000000000000000 + library 000000000000000000000 - loading_dock 000000000000000000011 - love_hotel 000000000000000000000 - + luggage_locker 000000000000000000000 - marketplace 000000000000000000000 - money_transfer 000000000000000000000 - motorcycle_parking 000000000000000001111 - @@ -145,6 +148,7 @@ world 000000000000000000000 + pub 000000000000000011111 - public_bath 000000000000000000000 - public_bookcase 000000000000000000000 - + ranger_station 000000000000000000000 - recycling 000000000000000000000 + centre 000000000000000000000 - container 000000000000000000000 - @@ -883,6 +887,9 @@ world 000000000000000000000 + town 000000001111111111111 - village 000000000001111111111 - {} + post_office 000000000000000000000 + + post_partner 000000000000000000111 - + {} power 000000000000000000000 + generator 000000000000000111111 + gas 000000000000000111111 - From 084357a68e663221bbfb03d5dc7431d9c2b561cb Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Sat, 26 Jul 2025 10:44:37 +0000 Subject: [PATCH 070/222] [strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate Co-authored-by: Prefill add-on Co-authored-by: yannikbloscheck Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings --- .../Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings | 4 ++++ iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings | 4 ++-- .../Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings | 4 ++++ .../LocalizedStrings/en-GB.lproj/LocalizableTypes.strings | 4 ++++ .../LocalizedStrings/es-MX.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings | 4 ++++ .../LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings | 4 ++++ .../Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings | 4 ++++ .../LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings | 4 ++++ .../LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings | 4 ++++ 57 files changed, 226 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings index 58bfc96f6..a2bf56831 100644 --- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings index bc3a19d85..fca14d632 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings index 0aa86c82d..835256ffc 100644 --- a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.amenity.parking_entrance.permissive" = "Parking Entrance"; "type.cuisine.italian_pizza" = "Italian, Pizza"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings index 4825011ba..7902aea21 100644 --- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings index 71699d264..6d48f3b66 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings index 19a8bdc72..fc8a0c703 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Приливни солени блато"; "type.landuse.plant_nursery" = "Посадъчен материал"; "type.leisure.escape_game" = "Escape Room"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings index a604b44f8..3b70809fe 100644 --- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.highway.service.parking_aisle" = "Parking Aisle"; "type.cuisine.japanese" = "Japanese"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings index e27bb94c0..28dc43e32 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings index 3d27d40d5..0fb7543b6 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrovy"; "type.natural.wetland.tidalflat" = "Wattové pobřeží"; "type.leisure.escape_game" = "Úniková hra"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings index 9b713199e..5db165ae3 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index bfcc3d796..5c0b8cae5 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1098,6 +1098,6 @@ "track_recording_toast_nothing_to_save" = "Route ist leer - nichts zu speichern"; "edit_track" = "Track bearbeiten"; "pref_mapappearance_title" = "Kartendarstellung"; -"pref_maplanguage_title" = "Sprache auf der Karte"; -"transliteration_title_disabled_summary" = "Ausgeschaltet wenn immer die lokale Sprache auf der Karte benutzt wird"; +"pref_maplanguage_title" = "Kartensprache"; +"transliteration_title_disabled_summary" = "Bei der Nutzung der lokalen Sprache für die Karte ausgeschaltet"; "pref_maplanguage_local" = "Lokale Sprache"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index 9f3b90fab..ec498d62b 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrove"; "type.natural.wetland.tidalflat" = "Watt"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings index 2d82f2c66..066dbe775 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index fe6d79cd5..f0c064e16 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.landuse.plant_nursery" = "Plant Nursery"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings index 97c49187b..624983811 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings index 2b7d0a5ae..8792529e4 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrove"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings index 676c323a9..e4b1af190 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh" = "Sooldunud padur"; "type.natural.wetland.saltmarsh.tidal" = "Loodete mõjutatud sooldunud padur"; "type.leisure.escape_game" = "Põgenemistuba"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings index 6a758dee1..d86e29bfc 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings index a61bfa518..c5ea1779c 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings index c8b2f60f7..fdd0496bb 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrove"; "type.natural.wetland.tidalflat" = "Vuorovesitasanko"; "type.leisure.escape_game" = "Pakohuonepeli"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings index 523c579dd..eb5454d18 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Roselière"; "type.natural.wetland.saltmarsh" = "Marais salant"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings index 5a5e44976..d5d9724e7 100644 --- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings index ddd163522..449033c1a 100644 --- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.natural.wetland.mangrove" = "Mangrove"; "type.natural.wetland.tidalflat" = "Watt"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings index f8ff9b6ed..089bac6f2 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings index a2ecfbe65..3be983cd0 100644 --- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.railway.station.subway.qingdao" = "Subway Station"; "type.landuse.plant_nursery" = "Plant Nursery"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings index add80f31f..0ea83fead 100644 --- a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.natural.wetland.bog" = "Bog"; "type.natural.spring.drinking_water_no" = "Natural Spring"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings index 67bce66d0..9553418d9 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings @@ -1496,3 +1496,7 @@ "type.railway.station.subway.qingdao" = "Subway Station"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings index 23d832d6e..c181d8d77 100644 --- a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.amenity.parking_entrance.permissive" = "Parking Entrance"; "type.cuisine.italian_pizza" = "Italian, Pizza"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings index e69ce0b11..4280c649d 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings index 95349a20d..0a2ba09c4 100644 --- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.railway.station.subway.qingdao" = "Subway Station"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings index d74889c90..814a602e9 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings index 3274c6696..1cdb33a68 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings index 6fa6d8380..3a46f2d12 100644 --- a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.place.suburb" = "Suburb"; "type.power" = "Power"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings index 579542941..90ea392e6 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings index bdfebd900..c9a1c1c4d 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.railway.station.subway.qingdao" = "Subway Station"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings index 2e903cc5c..09954a512 100644 --- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings index 871768d7c..048dec259 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.leisure.sports_hall" = "Sports hall"; "type.amenity.dojo" = "Dojo"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings index 7e835e53a..1477c516d 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.railway.station.subway.qingdao" = "Subway Station"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings index 12a61db11..b871f5739 100644 --- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings index c5f203746..9287b17f6 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings index dfc6f9e59..5c90970b6 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Kwelder"; "type.natural.wetland.tidalflat" = "Wad"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings index 954ed086a..554c1189a 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.amenity.studio" = "Studio"; "type.barrier.guard_rail" = "Barierka ochronna"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings index 2cc2d80f3..ffe2b7800 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.tidalflat" = "Planície de maré"; "type.natural.wetland.saltmarsh" = "Sapal"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings index 9045a9432..b62513068 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Marisma"; "type.natural.wetland.reedbed" = "Caniçal"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings index 225fdb0ba..70b099ca9 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings index f0523057c..19b813f05 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.man_made.crane" = "Кран"; "type.railway.station.subway.qingdao" = "Станция метро"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings index 9c73fa43e..f8246254b 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.post_office.post_partner" = "Post Partner"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.luggage_locker" = "Luggage Locker"; diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings index 92111d0d3..77b56e903 100644 --- a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings @@ -1314,3 +1314,7 @@ "type.place.suburb" = "Suburb"; "type.power" = "Power"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings index f0c174f6e..a87f60e5b 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh" = "Приморска слана мочвара"; "type.railway.station.subway.qingdao" = "Метро станица"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings index fa5fb14fa..ca692b8c8 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.amenity.studio" = "Studio"; "type.landuse.plant_nursery" = "Plant Nursery"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings index 04bdd66d5..0650ce407 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.reedbed" = "Reed Bed"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings index 3ad5d6b37..402339bbf 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings index dc31b03b4..9ae8d385e 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrove"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings index a076b413f..8b7dca145 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings index 2b6e7e1c5..5615f4a7e 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.landuse.plant_nursery" = "Plant Nursery"; "type.amenity.love_hotel" = "Love Hotel"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings index da4d1efd8..c55d7e80f 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "Escape Room"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings index 2f556bb34..c7eba8169 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings @@ -1500,3 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "潮間鹽沼"; "type.natural.wetland.reedbed" = "Reed Bed"; "type.leisure.escape_game" = "密室脫逃"; +"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.ranger_station" = "Ranger Station"; +"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.post_office.post_partner" = "Post Partner"; From 5014b4018dda9251974305a677aa20211900e70b Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 17:11:10 +0700 Subject: [PATCH 071/222] [styles] Add captions to landuse-garages Signed-off-by: Konstantin Pastbin --- data/styles/default/include/Icons.mapcss | 4 ++++ .../styles/default/include/priorities_4_overlays.prio.txt | 1 + .../outdoors/include/priorities_4_overlays.prio.txt | 1 + data/styles/vehicle/include/Icons.mapcss | 8 ++++++++ .../styles/vehicle/include/priorities_4_overlays.prio.txt | 1 + 5 files changed, 15 insertions(+) diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 19bfb437f..c0f9f2a6a 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1916,6 +1916,7 @@ node|z14-[amenity=fuel], node|z14-[amenity=charging_station][motorcar?], area|z14-[highway=services], area|z15-[highway=rest_area], +area|z15-[landuse=garages], node|z15-[amenity=sanitary_dump_station], node|z16-[amenity=charging_station], node|z17-[amenity=bicycle_parking], @@ -1926,6 +1927,9 @@ node|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} +area|z18-[landuse=garages], +{font-size: 11;} + node|z14[amenity=fuel], {icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} node|z15[amenity=fuel], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 93c501aa2..1e5ce9dda 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1098,6 +1098,7 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z17- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) +landuse-garages landuse-farmland # caption z15- (also has area z10-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 43f7c7e77..12bc74445 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1099,6 +1099,7 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z16- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) +landuse-garages landuse-farmland # caption z15- (also has area z10-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 218788083..0110dcf9e 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -804,6 +804,7 @@ node|z16-[amenity=charging_station], area|z16-[amenity=charging_station], node|z16-[amenity=parking], area|z16-[amenity=parking], +area|z16-[landuse=garages], node|z17-[amenity=car_wash], area|z17-[amenity=car_wash], node|z17-[amenity=toilets], @@ -915,6 +916,13 @@ node|z18-[amenity=sanitary_dump_station], area|z18-[amenity=sanitary_dump_station] {font-size: 14.5; icon-min-distance: 10;} +area|z16[landuse=garages], +{font-size: 12.5;} +area|z17[landuse=garages], +{font-size: 13.75;} +area|z18-[landuse=garages], +{font-size: 14.5;} + node|z18-[amenity=compressed_air], area|z18-[amenity=compressed_air], {icon-image: compressed_air-m.svg;} diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 76e0f2c0c..e67834ddb 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -242,6 +242,7 @@ amenity-parking-underground-fee # icon z15- (also has captio amenity-motorcycle_parking # icon z17- amenity-parking_entrance # icon z16- amenity-parking_entrance-permissive # icon z16- +landuse-garages === 2530 amenity-parking-lane # icon z17- (also has area z15-) From 886938c0dc1cab6d9a93bd8b2eb7dfe6016a5860 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 17:20:28 +0700 Subject: [PATCH 072/222] [styles] Add captions to landuse-retail Signed-off-by: Konstantin Pastbin --- data/styles/default/include/Basemap_label.mapcss | 3 ++- data/styles/default/include/priorities_4_overlays.prio.txt | 1 + data/styles/outdoors/include/priorities_4_overlays.prio.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 1c0498209..c439da5ba 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -659,7 +659,8 @@ node|z17-[landuse=military] /* 7.7 Commercial */ -area|z17-[landuse=commercial] +area|z16-[landuse=retail], +area|z16-[landuse=commercial], {text: name;font-size: 10;text-color: @poi_label;text-position: center;} /* 8.BUILDINGS */ diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 1e5ce9dda..8be3f19a4 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1260,6 +1260,7 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) +landuse-retail landuse-residential # caption z17- leisure-common # caption z17- leisure-slipway # caption z17- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 12bc74445..370a7759e 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1263,6 +1263,7 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) +landuse-retail landuse-residential # caption z17- leisure-common # caption z17- leisure-slipway # caption z17- From feddb98a81d1c870a06b3aa90267443580989f37 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 17:37:34 +0700 Subject: [PATCH 073/222] [styles] Add areas to bici, moto parkings, visitor centers and ranger stations Signed-off-by: Konstantin Pastbin --- data/styles/default/include/Basemap.mapcss | 5 +++++ .../styles/default/include/priorities_1_BG-by-size.prio.txt | 6 ++++++ data/styles/outdoors/include/Icons.mapcss | 4 ++-- .../outdoors/include/priorities_1_BG-by-size.prio.txt | 6 ++++++ data/styles/vehicle/include/Basemap.mapcss | 1 + .../styles/vehicle/include/priorities_1_BG-by-size.prio.txt | 1 + 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 0070e95a8..9f490f5f8 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -497,7 +497,10 @@ area|z13-[leisure=resort], area|z13-[highway=services], area|z13-[highway=rest_area], area|z13-[landuse=garages], +area|z13-[amenity=ranger_station], +area|z13-[tourism=information][information=visitor_centre], +area|z15-[tourism=information][information=office], area|z15-[leisure=dog_park], area|z15-[amenity=police], area|z15-[amenity=courthouse], @@ -510,6 +513,8 @@ area|z15-[amenity=vehicle_inspection], area|z15-[amenity=car_wash], area|z15-[amenity=charging_station][motorcar?], area|z15-[amenity=fuel], +area|z15-[amenity=motorcycle_parking], +area|z15-[amenity=bicycle_parking], {fill-opacity: 1; fill-color: @general_area;} diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 29811332f..2d32ee8f0 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -60,6 +60,7 @@ amenity-marketplace # area z15- (also has icon z amenity-police # area z15- (also has icon z17-, caption(optional) z17-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) @@ -71,6 +72,8 @@ leisure-resort # area z13- (also has icon z leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) +tourism-information-office +tourism-information-visitor_centre === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) @@ -114,6 +117,9 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +amenity-bicycle_parking +amenity-bicycle_parking-covered +amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index e148a774c..934d9d80f 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -335,8 +335,8 @@ node|z15-[tourism=information][information=guidepost], node|z15-[tourism=information][information=map], {icon-image: map.svg;} -node|z14-[amenity=ranger_station], -{icon-image: ranger-station-m.svg; icon-min-distance: 10;} +node|z13-[amenity=ranger_station], +{icon-image: ranger-station-m.svg;} node|z14-[man_made=survey_point], {icon-image: survey_point-m.svg; font-size: 11;} diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 658fd2e93..3976c68d3 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -60,6 +60,7 @@ amenity-marketplace # area z15- (also has icon z amenity-police # area z15- (also has icon z17-, caption(optional) z17-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) @@ -71,6 +72,8 @@ leisure-resort # area z13- (also has icon z leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) +tourism-information-office +tourism-information-visitor_centre === 170 highway-footway-area # area z14- (also has line z11-, pathtext z13-) @@ -114,6 +117,9 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +amenity-bicycle_parking +amenity-bicycle_parking-covered +amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 400524b5a..1d008da37 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -350,6 +350,7 @@ area|z15-[amenity=charging_station][motorcar?], area|z15-[amenity=fuel], area|z17-[amenity=vehicle_inspection], area|z17-[amenity=car_wash], +area|z17-[amenity=motorcycle_parking], {fill-opacity: 1; fill-color: @general_area;} /* 7.6 Airports */ diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 4b6ad4ee1..e0a1b5761 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -28,6 +28,7 @@ amenity-parking-private # area z15- (also has icon z amenity-parking-street_side # area z15- (also has icon z17-) amenity-parking-street_side-fee # area z15- (also has icon z15-) amenity-parking-street_side-private # area z15- (also has icon z17-, caption(optional) z17-) +amenity-motorcycle_parking === 160 amenity-car_wash # area z17- (also has icon z17-, caption(optional) z17-) From f4dd133872c45dd46a301efa683f9bad33794a31 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 26 Jul 2025 17:49:53 +0700 Subject: [PATCH 074/222] [styles] Regenerate for generic amenities areas Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 444711 -> 445512 bytes data/drules_proto.txt | 318 +++++++++++++++--- data/drules_proto_default_dark.bin | Bin 424298 -> 425036 bytes data/drules_proto_default_dark.txt | 243 +++++++++++++ data/drules_proto_default_light.bin | Bin 427338 -> 428276 bytes data/drules_proto_default_light.txt | 283 ++++++++++++++++ data/drules_proto_outdoors_dark.bin | Bin 444907 -> 445654 bytes data/drules_proto_outdoors_dark.txt | 241 ++++++++++++- data/drules_proto_outdoors_light.bin | Bin 448134 -> 449081 bytes data/drules_proto_outdoors_light.txt | 281 +++++++++++++++- data/drules_proto_vehicle_dark.bin | Bin 284466 -> 284598 bytes data/drules_proto_vehicle_dark.txt | 52 +++ data/drules_proto_vehicle_light.bin | Bin 284739 -> 284891 bytes data/drules_proto_vehicle_light.txt | 56 +++ .../include/priorities_1_BG-by-size.prio.txt | 16 +- .../include/priorities_4_overlays.prio.txt | 30 +- .../include/priorities_1_BG-by-size.prio.txt | 16 +- .../include/priorities_4_overlays.prio.txt | 30 +- .../include/priorities_1_BG-by-size.prio.txt | 4 +- .../include/priorities_4_overlays.prio.txt | 4 +- 20 files changed, 1481 insertions(+), 93 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 85749ed9b5af902bb4516c9e3c5f8c9dbdfeb3ca..59af042146e5d50e535c8d31379dbe735c454607 100644 GIT binary patch delta 1020 zcmZ2JN&3VL=?#gx8c&(H#1nH<^D;{+b(1oaE0c3l;|mgtvNQA2g+w^`r35%0-ha(5 zF=cYTyC~z7$qHLUxu$&l4*`sm8+46D-8h8cs!(Jm@7ltRsaOQ7Vk2g*UgpW+dP+R# zmMS2u6Y}E_#G<=K&sx+Et0N#X!Z`I{b4!h$)#d{IG7H8plb@%{;dPEDR_8con2CB~ zbq+)Zn{yyC*qq~-VY>N6#&0XBU(8%$u!t&3%u7!#iZ3onEXmBzo31;JO_$MqdgDz- z(aB6pjDgI;X>3sD0Myjpt)}8_PV8vFZZcsatY-m=B1Pt zr|Kr>=jNssC1)n)2=Q|WXmN9~b8rb9>6pkQQL()yg=wuA(?X`{+SN>Uj4B{oMW#o6 zV&Y@D#3rNyvKfgBv>k~zeZe6n5g{!;E=~?^uyGoU5+F^J6+EyBPggk1BqD&WeEXYf zCOJ{2MyBaJ6Pbb;6{jamWD=QvJ%dSr8_{95Zcw2sE_$ufI$@J>D$Bs|?{Ih#47_wi}3r4#EpZ;)ybI&10E9 Wc^RAPbiHY8I@C3Ld;bcy843WcaGNp! delta 597 zcmcJHIZFdU7>1ddbzIhCv$KNHx{yurBpz90-A?i1w9IhsRla= zL{Us7lBOgTY(v^6WS2od>JodwkS$0gO-Z`%3zyo#3cH^0p@dk|GjW9^#GViyY6U7Y zGm+1R?(3Pb4K`WtmKVjgtP z`rPmY@JK)24;a+@2~~;LrHZn;q5Sy%^?+#2KU?~{U9)pg1c@jj zRgRs*WdffOuPNXr)S=e#xgu^CQeP3hBCd)U6(OJE=XXVHi3{_`M879D(q0kI?%Y$;;Q$wO2mDPn6%=wocL7us%?VIZR5xt?o9b#Vb%~ivEHO7VFSDdlwp$bk;wiTY7JlAmYatIAn1abwc zBA_715h#Mj&CBL(Up9|1e~wxvmrzb(UP@_ks%~bFp)93G~d| z#3E6#UCWxuLyYm~^x{A!Q+9cX1E(+8%_PosiA_iz;x;5cDE-_5^Hag{pp=7fffgSZ zCkHp!XbnaQumV(fV^M(W2XqD7d4re=M1bzAOJfS;Q2@G!pJU<-ABl4xrf;xk5(A0| zVu%P~hzMhdh@gmwwwtFj0WmWWvurm{XU%`kbcT8Q3O_bk0XMWrn;sazW&spMjWw|7 z_ F9RScuDForOUA+oto-_MM(Ve;KnIc9U9%KvGmEJEf$l|aUH8zDxH z$;|17AQ6$x|I=K}J}yDrKc9f7ndZKWaj4ynR4(?o;c5h*_1;7 zN((}1At)^jrA2_WakIpN?Gg(Z^XG_0a0%rk=B1Ptrve?Fo10pcoSB%jeXR|XhZy6` z>ED8wOsC&n#3VTRfra2?gCId8ehwiiZi!nT|3d(y5I=`7x_}6Z!1fQpOa&s0JEkXQ zFa>4^a|lTBb4;A!BXRBn+zeq3L2QCT*aU^K35s9{wnt|&0WmWWvuuyfWX*rh^p9!! znE*CfW=jtK>5hSH7C?poj3EeP2u;5TkrIY6M5ZSOu~{&-O`jFSrbeFT?UO>-cBumZ D#(dIC diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 3014def41..fca34e2cf 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -3507,8 +3507,23 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3525,6 +3540,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3541,6 +3559,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3557,6 +3578,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3574,8 +3598,23 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3592,6 +3631,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3608,6 +3650,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3624,6 +3669,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -7866,8 +7914,23 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7884,6 +7947,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7900,6 +7966,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7916,6 +7985,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12074,8 +12146,23 @@ cont { } cont { name: "amenity-ranger_station" + element { + scale: 13 + area { + priority: -1830 + } + } + element { + scale: 14 + area { + priority: -1830 + } + } element { scale: 15 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12093,6 +12180,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12110,6 +12200,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12127,6 +12220,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12144,6 +12240,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12161,6 +12260,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -45842,6 +45944,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } + } element { scale: 17 caption { @@ -47576,36 +47688,84 @@ cont { area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -49336,6 +49496,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 17 @@ -49343,6 +49510,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 18 @@ -49350,6 +49524,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 19 @@ -49357,6 +49538,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 20 @@ -49364,6 +49552,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } } cont { @@ -127565,6 +127760,9 @@ cont { name: "tourism-information-office" element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127582,6 +127780,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127599,6 +127800,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127616,6 +127820,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127633,6 +127840,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127650,6 +127860,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127668,8 +127881,23 @@ cont { } cont { name: "tourism-information-visitor_centre" + element { + scale: 13 + area { + priority: -1830 + } + } + element { + scale: 14 + area { + priority: -1830 + } + } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127687,6 +127915,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127704,6 +127935,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127721,6 +127955,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127738,6 +127975,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127755,6 +127995,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e3641662b79725d3842ad0a767c616ea9c3d228e..98f5c142284ffc95212ba48e3489e6d4d6efba3b 100644 GIT binary patch delta 1005 zcmX@rCG};Z)COK%rl(Ak`E{juL^$}R1UMevf6Xp2WwO47DC3mLhVG(VQ$GHO0LIDZ zbdAJ>+&F~b$}psaaZ8C{l`>}OW#*EfET}6!Sw@c&!wm`u+lBl%1hE*Qp=T}Xht)|C z8Eh_s$Y67jhMv`C8T|)lj9(`IO_jrN4%3v6lLLE1ki%p`nwh94R{J3`*zAYMV6%Th zn(5|$X)KmfznHni5_41YGD|9TixTtFQ;Xt@OA<>m^Yf-(T+F1)=sx|UDznIBg#{*z z?vovDMJFpRFb1*$EWoVES8OFFD=#nvD!U-Y2oXxN0|^;4r!Cx`wvaJ;rdlSKP)=fA zN@;PbZgPHZZfa3-W@3&IKZk%8Hy1kxm%x#ZiA)j|+pk$MtrcTh$TYn*kjaiw1#Ith z&HYS#ESK1XRDgDiAn^h$AUrLQ93oV1!4rxW9~UPFH`r_qMhTEAkPAhGu!swaGl~eH zi*I)eVv-YOYGj(8md+H+tH>b$OcS>c?`M}d_hEXzJ(I-ri|I_l)64Cd1h_%z6j_QJ z6cSpGp7WUC>O4Bz)v57HygJNR3Lo}Nrm_K>_cFF0^(QI-s+5drHS@X%BJHQeqlczx# e#>`yvSf+1@W>cMhX)%)yBNa{FZWYTWpaB4ehlm*f delta 547 zcmew|QR-Be)COK%rjLx1`E{k3O*jN6XXzRPX(1>r45dYYv=J-UOeQY*$%4A#lPBnL zGTQ)E-_o-N(n3&L7)pz5KBX^ZuGGN9C6$<)nwMEpshgW$l3$cunVgdvUyxXootc*| zWDeBdpKiu%4%82!g`un(i0RCI;jQpzs7yctRka1yGSNj3EMIm@{*=F;71h$EHdZ)23^L Nv+-{Kn83!Y0RXn3qsssQ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 65dc98463..9997f8deb 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -3507,8 +3507,26 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3525,6 +3543,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3541,6 +3563,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3557,6 +3583,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3574,8 +3604,26 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3592,6 +3640,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3608,6 +3660,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3624,6 +3680,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -7902,8 +7962,26 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + color: 16445409 + priority: -1900 + } + } + element { + scale: 16 + area { + color: 16445409 + priority: -1900 + } + } element { scale: 17 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7920,6 +7998,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7936,6 +8018,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -7952,6 +8038,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12196,8 +12286,26 @@ cont { } cont { name: "amenity-ranger_station" + element { + scale: 13 + area { + color: 16445409 + priority: -1830 + } + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 + } + } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12215,6 +12323,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12232,6 +12344,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12249,6 +12365,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12266,6 +12386,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12283,6 +12407,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -45736,6 +45864,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } + } element { scale: 17 caption { @@ -47473,6 +47611,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 @@ -47480,6 +47626,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 @@ -47487,6 +47641,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 @@ -47494,6 +47656,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 @@ -47501,6 +47671,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 @@ -47508,6 +47686,14 @@ cont { color: 16445409 priority: -1830 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -49246,6 +49432,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 17 @@ -49253,6 +49446,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 18 @@ -49260,6 +49460,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 19 @@ -49267,6 +49474,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } element { scale: 20 @@ -49274,6 +49488,13 @@ cont { color: 15720923 priority: -1970 } + caption { + primary { + height: 10 + color: 4473924 + } + priority: 120 + } } } cont { @@ -127641,6 +127862,10 @@ cont { name: "tourism-information-office" element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127658,6 +127883,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127675,6 +127904,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127692,6 +127925,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127709,6 +127946,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127726,6 +127967,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127744,8 +127989,26 @@ cont { } cont { name: "tourism-information-visitor_centre" + element { + scale: 13 + area { + color: 16445409 + priority: -1830 + } + } + element { + scale: 14 + area { + color: 16445409 + priority: -1830 + } + } element { scale: 15 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127763,6 +128026,10 @@ cont { } element { scale: 16 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127780,6 +128047,10 @@ cont { } element { scale: 17 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127797,6 +128068,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127814,6 +128089,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -127831,6 +128110,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index bcbf5df286b2f43ad2adef8266ed7c27142148e8..d01721d03d45a3a0839484df84960584304fc897 100644 GIT binary patch delta 1197 zcmaDoS^C;c=?(6>EXSF+#3$S9i5m;?bMQ-XOHBFr9|9PG0s^Q4jvRt00+Z+H8Vfjb z2w@Wx#wI9&E@;HW^?tIAp0W{P%RSL8U!Z3#;E8TIL=eq#h#;Ef3-qiuhw0BV54^_2 zC6$<)nwMEpshgW$l3$cunVgdvUyxXootc+TM6kG^yX;`Psi2Sxy3?SdXl{dwqB?H# z!E{%1-B~PLVlamlCFZ547R48rB$j06=LxBC@B)MK7Cf$$L?;(45ET}3;NZg|J~?24 zw15*hdJ$SCEieI!fnpe43>3*IVv`@*3QuNUU^rRT4nk*wX@lm43$`y@z^J#2F?0Hb zC?;_}0WEGWb`CCqo|&6iBr3K)iDFtK&iHfs#3CkBc6o^X(;HtiiE~|I6OxD6jl>7r z3+AVSH6soutY}YPkDi8s>Z%#W?AddpjJ^UOK zXZT2*`!Jm`o=FTSB8VX(gdrk~AtHhzBHA9>!34z2K+FQftlL97*yac^En%7dc@|r# zfE!x8On*3=O=)`GTsASF6l(NYH{(ml;q%bhyqNO2-#B{y6Y|?ag?e@*f$w#1nH<^D;{+b(1oaE0c3l;|mgtvNQA2g-kdEC&%d-u>cuD zForOUAp&F=GtQhmNl%&C2B@%B-x^2@L1|$qEdr#iHZvK_GiPj=yf9sk*&L|!W4alT z7J|~kAbR>)X-4+RU(*dY|Hu$9mz&AVB?fa@&rIU3m`)f#t?!rgkcPk>2V9$EST;w gPxqhCrpheK!8?7!d^YLn$#dDP$TM&|(7+090HoUHZvX%Q diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 1b745ce8a..a14de9d24 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -3530,8 +3530,23 @@ cont { } cont { name: "amenity-bicycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3548,6 +3563,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3564,6 +3582,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3580,6 +3601,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-m" priority: 250 @@ -3597,8 +3621,23 @@ cont { } cont { name: "amenity-bicycle_parking-covered" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3615,6 +3654,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3631,6 +3673,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -3647,6 +3692,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "bicycle-parking-covered-m" priority: 250 @@ -8008,8 +8056,23 @@ cont { } cont { name: "amenity-motorcycle_parking" + element { + scale: 15 + area { + priority: -1900 + } + } + element { + scale: 16 + area { + priority: -1900 + } + } element { scale: 17 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8026,6 +8089,9 @@ cont { } element { scale: 18 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8042,6 +8108,9 @@ cont { } element { scale: 19 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -8058,6 +8127,9 @@ cont { } element { scale: 20 + area { + priority: -1900 + } symbol { name: "motorcycle-parking-m" priority: 250 @@ -12217,11 +12289,23 @@ cont { cont { name: "amenity-ranger_station" element { - scale: 14 + scale: 13 + area { + priority: -1830 + } + symbol { + name: "ranger-station-m" + priority: 4400 + } + } + element { + scale: 14 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 - min_distance: 10 } caption { primary { @@ -12235,6 +12319,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12252,6 +12339,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12269,6 +12359,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12286,6 +12379,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12303,6 +12399,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -12320,6 +12419,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "ranger-station-m" priority: 4400 @@ -48539,6 +48641,16 @@ cont { } cont { name: "landuse-commercial" + element { + scale: 16 + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } + } element { scale: 17 caption { @@ -50365,36 +50477,84 @@ cont { area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 16 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 17 area { priority: -1830 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 18 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 19 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } element { scale: 20 area { priority: -1830 } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + } + priority: 850 + } } } cont { @@ -52125,6 +52285,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 17 @@ -52132,6 +52299,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 18 @@ -52139,6 +52313,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 19 @@ -52146,6 +52327,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } element { scale: 20 @@ -52153,6 +52341,13 @@ cont { color: 1248273 priority: -1970 } + caption { + primary { + height: 10 + color: 9211020 + } + priority: 120 + } } } cont { @@ -133925,6 +134120,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133942,6 +134140,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133959,6 +134160,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133976,6 +134180,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -133993,6 +134200,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134010,6 +134220,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134030,6 +134243,9 @@ cont { name: "tourism-information-visitor_centre" element { scale: 13 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134037,6 +134253,9 @@ cont { } element { scale: 14 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134053,6 +134272,9 @@ cont { } element { scale: 15 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134070,6 +134292,9 @@ cont { } element { scale: 16 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134087,6 +134312,9 @@ cont { } element { scale: 17 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134104,6 +134332,9 @@ cont { } element { scale: 18 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134121,6 +134352,9 @@ cont { } element { scale: 19 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 @@ -134138,6 +134372,9 @@ cont { } element { scale: 20 + area { + priority: -1830 + } symbol { name: "information-office-m" priority: 4400 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index d2affef3437538bfe3cb3d508b4aca3e50abe38a..78b2c865ea8daf48f2902f113ec65879917f5fb1 100644 GIT binary patch delta 987 zcmZo$E4_1z^agibmZwZy;*;(5#Ce58IQXRmI3C`A%`P!za^Y-I#wn98ZWQI3^6@_e zFixJMYb@%2E+dRnMg*&j5i?gW^JH5+B_4FU6%e)x`Edwh(Y-*=TGS7#TOcyn z+yaro=9UF|R-420vn&|DOg@+{hv6KiDIX_KXcs{ai{1>=$r*h-XhLE_o*dY02C1&> zKvuoEH^b6W<`4^)SYmE!US>(9Zc$=hdTLR8aYh~I}rhN<=ZogndC&78kwedbT9?;Dsl(_lfv!8``IPVeVBeA zj!A|ci6g-cN}4DFptwL007X8MfM~l%Cle4e12GE_vu^k3WJ{H0I>a)4{W7*vMsH9c zPd8Y_rZ`<|C7T$dH#n$40%nsh?U9;pyo$|uvix2MgGtC6JbQlbZf&1)DU5)@=v6CRhgmawv|f delta 575 zcmdnFMY?UR^agib`HzfT;)%Jbd6^}Zx=ESImB~4&@db%R*_nCiLM9x7li%nXGn;S- zL1|$qEi$=A&zNZ@)8vhMO3XGuWg`04Kw1b&3qxs<%`65>EEpRmugs8RHU}!3muUv1 zg`l)BlokQfrkmxmSS;mcGINQ+oKuvTm!4V_UtE${l9`_;WXi!edEpWhW>XG+C@lb` z1);PMlop24B0$=>Ic@3ow55zv+ZiLKH^wlDZ(kY1BqYIfka7Cn5+=Lpb51acO}1Gk zHu+w#7_$h6(DcMuX3@z-TZEZ}M5aHy!YH!+UMZ8DDANJP>HoTzg1tpJ1f&EwZXe#y zE^+R|e+Xa{65$ZUDk_9kR2U*UeIqNgFh816?f<)(fS4JGS%8>z`~PmXR9U8L%+u3W zvXwGha_~=2T*GDoWC%eXzj)0Y=gMK` V0TC2|_LwY2AZFSglf@kM76552PAmWb diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 35962ce9f..f13b2b94f 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -2125,6 +2125,9 @@ cont { name: "amenity-motorcycle_parking" element { scale: 17 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2132,6 +2135,9 @@ cont { } element { scale: 18 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2139,6 +2145,9 @@ cont { } element { scale: 19 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2146,6 +2155,9 @@ cont { } element { scale: 20 + area { + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -28861,30 +28873,70 @@ cont { area { priority: -1850 } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 17 area { priority: -1850 } + caption { + primary { + height: 13 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 18 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 19 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } element { scale: 20 area { priority: -1850 } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + } + priority: 2530 + } } } cont { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 4fb1af8b9a083f84398df6310d024e66b03bd9b5..08cb5cd6032d0fad38f9651cffcc64c1af1925a9 100644 GIT binary patch delta 305 zcmX@SLGboQ!3{~$EDspDq$V@U2+I~E7G-DVr3>kE2ucZXJiPy!UE;#W{}8}9`JuG5 z7*I+Gx0En$DG^Mm=7-YTA4)TRaAlgvH2rcSV~DQ`hX733F}S^2d|aFyJOW2LCNgO- zN<0!4QbD*5O%*S)s>v64M1;Va`A~!fd9ey#^cE37SKU4(i4lmIwogf7UjG#UQu}(! delta 153 zcmcb;QSk5v!3{~$N;4R_q!M#e^D;{+b#wDe@{5uylXFtz3lfX6GxO4gWH|&UYsyHo z02x9shA@mF(yS@7T~mhfgDcZP#_7^Yj3JC7(+iRqMOcJHI0UB~Br%FkzQ`lYBqTCf lkXJ+uC@3N&!13_@Yj%laAOAxDW4lf=2s3ThNoHRE6#%6RFSY;x diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 1e66199eb..43fdc515e 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -2141,6 +2141,10 @@ cont { name: "amenity-motorcycle_parking" element { scale: 17 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2148,6 +2152,10 @@ cont { } element { scale: 18 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2155,6 +2163,10 @@ cont { } element { scale: 19 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -2162,6 +2174,10 @@ cont { } element { scale: 20 + area { + color: 16445409 + priority: -1840 + } symbol { name: "motorcycle-parking-m" priority: 2530 @@ -28361,6 +28377,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 17 @@ -28368,6 +28392,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 13 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 18 @@ -28375,6 +28407,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 19 @@ -28382,6 +28422,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } element { scale: 20 @@ -28389,6 +28437,14 @@ cont { color: 16445409 priority: -1850 } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + } + priority: 2530 + } } } cont { diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 2d32ee8f0..b16c5c5dd 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -58,22 +58,22 @@ amenity-fire_station # area z15- (also has icon z amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) -amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z15-) leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) -tourism-information-office -tourism-information-visitor_centre +tourism-information-office # area z15- (also has icon z15-, caption(optional) z15-) +tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) @@ -103,6 +103,9 @@ public_transport-platform # area z16- (also has captio railway-platform # area z16- (also has caption z16-) === 110 +amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) @@ -117,9 +120,6 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) -amenity-bicycle_parking -amenity-bicycle_parking-covered -amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) @@ -199,7 +199,7 @@ amenity-university # area z13- (also has icon z aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) landuse-education # area z13- -landuse-retail # area z13- +landuse-retail # area z13- (also has caption z16-) leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) natural-beach # area z10- (also has caption z15-) natural-beach-gravel # area z10- (also has caption z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8be3f19a4..1894b6352 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 -amenity-ranger_station # icon z15- (also has caption(optional) z15-) +amenity-ranger_station # icon z15- (also has caption(optional) z15-, area z13-) historic-monument # icon z13- (also has caption(optional) z13-) -tourism-information-office # icon z15- (also has caption(optional) z15-) -tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-) +tourism-information-office # icon z15- (also has caption(optional) z15-, area z15-) +tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-, area z13-) === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1098,8 +1098,8 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z17- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) -landuse-garages landuse-farmland # caption z15- (also has area z10-) +landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) leisure-ice_rink # icon z17- (also has caption(optional) z17-) @@ -1208,9 +1208,9 @@ amenity-parking-underground # icon z16- (also has captio amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) === 300 -amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) -amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) -amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) @@ -1252,7 +1252,7 @@ amenity-parking-street_side # icon z18- (also has captio amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) === 150 -landuse-commercial # caption z17- +landuse-commercial # caption z16- landuse-construction # caption z15- (also has area z13-) landuse-farmyard # caption z15- (also has area z10-) landuse-industrial # caption z15- (also has area z13-) @@ -1260,8 +1260,8 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) -landuse-retail landuse-residential # caption z17- +landuse-retail # caption z16- (also has area z13-) leisure-common # caption z17- leisure-slipway # caption z17- leisure-track # caption z16- (also has line z15-) @@ -1516,10 +1516,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 -# amenity-ranger_station # caption(optional) z15- (also has icon z15-) +# amenity-ranger_station # caption(optional) z15- (also has icon z15-, area z13-) # historic-monument # caption(optional) z13- (also has icon z13-) -# tourism-information-office # caption(optional) z15- (also has icon z15-) -# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-) +# tourism-information-office # caption(optional) z15- (also has icon z15-, area z15-) +# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-, area z13-) # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -2142,9 +2142,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) # === -9700 -# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) -# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) -# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 3976c68d3..390e15000 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -58,22 +58,22 @@ amenity-fire_station # area z15- (also has icon z amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) -amenity-ranger_station amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) highway-rest_area # area z13- (also has icon z14-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z15-) leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) -tourism-information-office -tourism-information-visitor_centre +tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +tourism-information-visitor_centre # area z13- (also has icon z13-, caption(optional) z14-) === 170 highway-footway-area # area z14- (also has line z11-, pathtext z13-) @@ -103,6 +103,9 @@ public_transport-platform # area z16- (also has captio railway-platform # area z16- (also has caption z16-) === 110 +amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) @@ -117,9 +120,6 @@ amenity-parking-private # area z17- (also has icon z amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) -amenity-bicycle_parking -amenity-bicycle_parking-covered -amenity-motorcycle_parking === 100 natural-wetland # area z11- (also has caption z16-) @@ -199,7 +199,7 @@ amenity-university # area z13- (also has icon z aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) landuse-education # area z13- -landuse-retail # area z13- +landuse-retail # area z13- (also has caption z16-) leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) natural-beach # area z10- (also has caption z14-) natural-beach-gravel # area z10- (also has caption z14-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 370a7759e..7765af9d7 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -357,10 +357,10 @@ railway-subway_entrance-moscow # icon z15- (also has captio railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) === 4450 -amenity-ranger_station # icon z14- (also has caption(optional) z14-) +amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) historic-monument # icon z13- (also has caption(optional) z13-) -tourism-information-office # icon z13- (also has caption(optional) z14-) -tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-) +tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1099,8 +1099,8 @@ amenity-social_facility # icon z17- (also has captio amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) highway-ladder # icon z16- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) -landuse-garages landuse-farmland # caption z15- (also has area z10-) +landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-) landuse-vineyard # caption z15- (also has area z12-) leisure-ice_rink # icon z17- (also has caption(optional) z17-) @@ -1209,9 +1209,9 @@ amenity-parking-underground # icon z16- (also has captio amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) === 300 -amenity-bicycle_parking # icon z17- (also has caption(optional) z17-) -amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-) -amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-) +amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) @@ -1255,7 +1255,7 @@ amenity-parking-street_side # icon z18- (also has captio amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) === 150 -landuse-commercial # caption z17- +landuse-commercial # caption z16- landuse-construction # caption z15- (also has area z13-) landuse-farmyard # caption z15- (also has area z10-) landuse-industrial # caption z15- (also has area z13-) @@ -1263,8 +1263,8 @@ landuse-industrial-mine # icon z15- (also has captio landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) landuse-railway # caption z15- (also has area z13-) -landuse-retail landuse-residential # caption z17- +landuse-retail # caption z16- (also has area z13-) leisure-common # caption z17- leisure-slipway # caption z17- leisure-track # caption z16- (also has line z15-) @@ -1519,10 +1519,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) # === -5550 -# amenity-ranger_station # caption(optional) z14- (also has icon z14-) +# amenity-ranger_station # caption(optional) z14- (also has icon z13-, area z13-) # historic-monument # caption(optional) z13- (also has icon z13-) -# tourism-information-office # caption(optional) z14- (also has icon z13-) -# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-) +# tourism-information-office # caption(optional) z14- (also has icon z13-, area z15-) +# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-, area z13-) # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) @@ -2147,9 +2147,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) # === -9700 -# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-) -# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-) -# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-) +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index e0a1b5761..7fad027b4 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -14,6 +14,7 @@ # - BG-top: water (linear and areal) # - BG-by-size: landcover areas sorted by their size +amenity-motorcycle_parking # area z17- (also has icon z17-) amenity-parking # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-fee # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-lane # area z15- (also has icon z17-) @@ -28,7 +29,6 @@ amenity-parking-private # area z15- (also has icon z amenity-parking-street_side # area z15- (also has icon z17-) amenity-parking-street_side-fee # area z15- (also has icon z15-) amenity-parking-street_side-private # area z15- (also has icon z17-, caption(optional) z17-) -amenity-motorcycle_parking === 160 amenity-car_wash # area z17- (also has icon z17-, caption(optional) z17-) @@ -37,7 +37,7 @@ amenity-fuel # area z15- (also has icon z amenity-vehicle_inspection # area z17- (also has icon z17-) highway-rest_area # area z13- (also has icon z14-, caption(optional) z14-) highway-services # area z13- (also has icon z12-, caption(optional) z13-) -landuse-garages # area z13- +landuse-garages # area z13- (also has caption z16-) leisure-stadium # area z15- === 150 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index e67834ddb..e583f20fb 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -239,10 +239,10 @@ amenity-parking-underground # icon z15- (also has captio amenity-parking-underground-fee # icon z15- (also has caption(optional) z16-) === 2550 -amenity-motorcycle_parking # icon z17- +amenity-motorcycle_parking # icon z17- (also has area z17-) amenity-parking_entrance # icon z16- amenity-parking_entrance-permissive # icon z16- -landuse-garages +landuse-garages # caption z16- (also has area z13-) === 2530 amenity-parking-lane # icon z17- (also has area z15-) From 8174eac134e1ed6a29385289b00e7902dc48185a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 26 Jul 2025 13:53:56 +0200 Subject: [PATCH 075/222] [android] Follow Material style guide for translations Signed-off-by: Jean-Baptiste Charron --- .../app/src/main/res/values-fr/strings.xml | 46 +++++++-------- android/app/src/main/res/values/strings.xml | 56 +++++++++---------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 9a994e121..693259051 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -9,7 +9,7 @@ Supprimer Télécharger des cartes - Échec lors du téléchargement. Appuyer pour réessayer. + Échec lors du téléchargement, appuyer pour réessayer. Téléchargement… @@ -32,7 +32,7 @@ Précision limitée - Pour garantir une navigation précise, activez l\'option Position Exacte dans les paramètres. + Pour garantir une navigation précise, activez l\'option Position Exacte dans les paramètres Afficher la carte @@ -184,7 +184,7 @@ Désolé, les paramètres de stockage des cartes sont présentement désactivés. - Le téléchargement de la carte est en cours. + Le téléchargement de la carte est en cours Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://www.comaps.app/download/ @@ -242,7 +242,7 @@ Teste les instructions vocales (TTS, Text-To-Speech) - Vérifie le volume ou les paramètres de synthèse vocale du système si tu n\'entends pas la voix maintenant. + Vérifie le volume ou les paramètres de synthèse vocale du système si tu n\'entends pas la voix maintenant Non disponible Zoom automatique @@ -275,7 +275,7 @@ Déplacez le téléphone en huit pour calibrer la boussole et fixer la direction de la flèche sur la carte. - Appuie à nouveau longuement sur la carte pour voir l\'interface. + Appuie à nouveau longuement sur la carte pour voir l\'interface Tout mettre à jour @@ -290,7 +290,7 @@ Tout télécharger Téléchargement en cours : - Veuillez arrêter la navigation pour supprimer la carte. + Veuillez arrêter la navigation pour supprimer la carte Les itinéraires ne peuvent être créés que s\'ils sont entièrement contenus dans la carte d\'une seule région. @@ -304,7 +304,7 @@ Service de localisation Google Fused - Un service propriétaire qui combine le GPS, le Wi-Fi, les réseaux cellulaires... pour déterminer votre position plus précisément. Il peut se connecter aux serveurs de Google. + Un service propriétaire qui combine le GPS, le Wi-Fi, les réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs de Google. @@ -362,18 +362,18 @@ Activez les services de localisation Impossible d\'identifier les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire. Impossible de localiser l\'itinéraire - Impossible de créer l\'itinéraire. - Modifiez votre point de départ ou votre destination. + Impossible de créer l\'itinéraire + Modifiez votre point de départ ou votre destination Modifiez votre point de départ Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé. - Choisissez un point de départ à proximité d\'une route. + Choisissez un point de départ à proximité d\'une route Ajustez la destination Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé. - Choisissez un lieu de destination à proximité d\'une route. - Impossible de localiser le point intermédiaire. + Choisissez un lieu de destination à proximité d\'une route + Impossible de localiser le point intermédiaire Veuillez modifier votre point intermédiaire Erreur système - Impossible de créer l\'itinéraire à cause d\'une erreur dans l\'application. + Impossible de créer l\'itinéraire à cause d\'une erreur dans l\'application Veuillez réessayer Pas maintenant Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ? @@ -387,11 +387,11 @@ Masquer Catégories Historique - Désolé, je n\'ai rien trouvé. + Désolé, je n\'ai rien trouvé Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche. Historique de recherche - Accédez rapidement aux dernières recherches. + Accédez rapidement aux dernières recherches Effacer l\'historique de recherche Wikipédia @@ -399,7 +399,7 @@ Démarrer Depuis Itinéraire vers - La navigation est uniquement disponible à partir de votre emplacement actuel. + La navigation est uniquement disponible à partir de votre emplacement actuel Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ? Suivant @@ -471,16 +471,16 @@ Étage Niveau : %s - Toutes vos modifications de la carte seront supprimées avec elle. + Toutes vos modifications de la carte seront supprimées avec elle Mettre à jour les cartes Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire. Trouver la carte Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet. Espace insuffisant Veuillez supprimer les données inutiles - Erreur de connexion. + Erreur de connexion Modifications vérifiées - Déplacer la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise. + Déplacer la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise Modification Ajout Nom du lieu @@ -499,7 +499,7 @@ %1$d de %2$d Téléchargement avec une connexion réseau cellulaire ? - Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement. + Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement Saisir un numéro de maison correct Le nombre d\'étages ne doit pas dépasser %d @@ -523,7 +523,7 @@ CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur OpenStreetMap.org. Consulte notre guide pour obtenir des instructions détaillées étape par étape. Vous n\'avez téléchargé aucune carte Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne - L\'emplacement actuel est inconnu. + L\'emplacement actuel est inconnu m @@ -562,7 +562,7 @@ Souhaitez-vous l’envoyer à tous les utilisateurs ? - Assurez-vous de n’avoir pas saisi de données personnelles. + Assurez-vous de n’avoir pas saisi de données personnelles Les contributeurs d\'OpenStreetMap vérifieront vos modifications et vous contacteront s\'ils ont des questions. Enregistreur de traces @@ -589,7 +589,7 @@ Feedback général Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) Pour certaines langues, il vous faudra installer un autre logiciel de synthèse vocale ou un pack de langue supplémentaire depuis l’app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOuvrez les paramètres de votre appareil → Langue et saisie → Reconnaissance vocale → Saisie vocale. \nIci, vous pouvez gérer les paramètres pour la synthèse vocale (par exemple, télécharger un pack de langue pour une utilisation en mode hors ligne) et sélectionner un autre moteur de saisie vocale. - Pour plus d’informations, veuillez consulter ce guide. + Pour plus d’informations, veuillez consulter ce guide Translittératisé en alphabet latin En savoir plus diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index e973176a2..87ceeba7f 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ Delete Download Maps - Download has failed. Tap to try again. + Download has failed, tap to try again Downloading… @@ -35,7 +35,7 @@ Limited Accuracy - To ensure accurate navigation enable Precise Location in settings. + To ensure accurate navigation enable Precise Location in settings Show on the map @@ -96,7 +96,7 @@ Save maps to - Select the folder to download maps to. + Select the folder to download maps to Downloaded maps @@ -197,9 +197,9 @@ Your location hasn\'t been determined yet - Sorry, Map Storage settings are currently disabled. + Sorry, Map Storage settings are currently disabled - Map download is in progress now. + Map download is in progress now Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://www.comaps.app/download/ @@ -261,7 +261,7 @@ Test Voice Directions (TTS, Text-To-Speech) - Check the volume or system Text-To-Speech settings if you don\'t hear the voice now. + Check the volume or system Text-To-Speech settings if you don\'t hear the voice now Not Available Auto zoom @@ -333,7 +333,7 @@ Download All Downloading: - To delete map, please stop navigation. + To delete map, please stop navigation Routes can only be created that are fully contained within a map of a single region. @@ -404,18 +404,18 @@ Enable location services Unable to locate current GPS coordinates. Enable location services to calculate route. Unable to locate route - Unable to create route. + Unable to create route Please adjust your starting point or destination. Adjust starting point Route was not created. Unable to locate starting point. Please select a starting point closer to a road. Adjust destination Route was not created. Unable to locate the destination. - Please select a destination point located closer to a road. - Unable to locate the intermediate point. - Please adjust your intermediate point. + Please select a destination point located closer to a road + Unable to locate the intermediate point + Please adjust your intermediate point System error - Unable to create route due to an application error. + Unable to create route due to an application error Please try again Not Now Would you like to download the map and create a more optimal route spanning more than one map? @@ -430,11 +430,11 @@ Hide Categories History - Oops, no results found. + Oops, no results found Download the region where you are searching or try adding a nearby town/village name. Search History - View your recent searches. + View your recent searches Clear Search History Wikipedia @@ -444,7 +444,7 @@ Start Route from Route to - Navigation is only available from your current location. + Navigation is only available from your current location Do you want to plan a route from your current location? Next @@ -516,14 +516,14 @@ Floor Level: %s - All of your map edits will be deleted with the map. + All of your map edits will be deleted with the map Update Maps To create a route, you need to update all maps and then plan the route again. Find map - Please make sure your device is connected to the Internet. + Please make sure your device is connected to the Internet Not enough space Please delete any unnecessary data - Login error. + Login error Verified Changes Drag the map to place the cross at the location of the place or business. Editing @@ -541,11 +541,11 @@ OpenStreetMap.org (OSM) is a community project to build a free and open map. It\'s the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World. \nJoin the community and help to make a better map for everyone! - Create an OpenStreetMap account or log in to publish your map edits to the world. + Create an OpenStreetMap account or log in to publish your map edits to the world %1$d of %2$d Download over a cellular network connection? - This could be considerably expensive with some plans or if roaming. + This could be considerably expensive with some plans or if roaming Enter a valid building number Floors (inc. ground floor, excl. roof) @@ -569,8 +569,8 @@ Can\'t find a suitable category? CoMaps allows to add simple point categories only, that means no towns, roads, lakes, building outlines, etc. Please add such categories directly to OpenStreetMap.org. Check our guide for detailed step by step instructions. You haven\'t downloaded any maps - Download maps to search and navigate offline. - Current location is unknown. + Download maps to search and navigate offline + Current location is unknown m @@ -613,8 +613,8 @@ Do you want to send it to all users? - Make sure you did not enter any private or personal data. - OpenStreetMap editors will check the changes and contact you if they have any questions. + Make sure you did not enter any private or personal data + OpenStreetMap editors will check the changes and contact you if they have any questions Stop Recording the track @@ -628,10 +628,10 @@ Do Not Use Today Mobile Internet - Mobile internet is required for map update notifications and uploading edits. + Mobile internet is required for map update notifications and uploading edits Never Use Always Ask - To display traffic data, maps must be updated. + To display traffic data, maps must be updated Increase size for map labels Please update CoMaps @@ -643,7 +643,7 @@ For some languages, you will need to install a speech synthesizer or an additional language pack from the app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen your device\'s settings → Language and input → Speech → Text to speech output. \nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine. - For more information please check this guide. + For more information please check this guide Transliterate into Latin alphabet Learn more @@ -723,7 +723,7 @@ Never warn Power saving mode - Try to reduce power usage at the expense of some functionality. + Try to reduce power usage at the expense of some functionality Never When battery is low Always From b96afc6fbb77717aee81cc427043fedae56dfbb1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 26 Jul 2025 18:42:31 +0200 Subject: [PATCH 076/222] [android] Enable animateLayoutChanges in a layout Signed-off-by: Jean-Baptiste Charron --- android/app/src/main/res/layout/localized_name.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/res/layout/localized_name.xml b/android/app/src/main/res/layout/localized_name.xml index 0252ed440..807def05b 100644 --- a/android/app/src/main/res/layout/localized_name.xml +++ b/android/app/src/main/res/layout/localized_name.xml @@ -1,7 +1,4 @@ - + android:paddingStart="@dimen/margin_base" + android:animateLayoutChanges="true"> Date: Sat, 26 Jul 2025 11:05:57 +0000 Subject: [PATCH 077/222] Translated using Weblate (French) Currently translated at 100.0% (631 of 631 strings) Translation: CoMaps/Android UI Strings --- .../app/src/main/res/values-fr/strings.xml | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 693259051..a0f69618b 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -77,7 +77,7 @@ Signets - Signets et parcours + Signets et traces Mes endroits @@ -118,7 +118,7 @@ Un endroit pour manger - Epiceries + Épiceries Transport @@ -165,14 +165,14 @@ Notes - Signets CoMaps partagés + Signets CoMaps partagés avec vous Bonjour ! \n \nVous trouverez ci-joint mes signets de l\'appli CoMaps. Veuillez les ouvrir si vous avez installé CoMaps. Si vous ne l\'avez pas, téléchargez l\'application pour votre appareil iOS ou Android en suivant ce lien : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps ! Chargement des signets Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l\'écran du Gestionnaire de signets. - Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux. + Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux. Le type de fichier n\'est pas reconnu par l\'appli : \n%1$s @@ -186,7 +186,7 @@ Le téléchargement de la carte est en cours - Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://www.comaps.app/download/ + Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Téléchargez-les ici : https://www.comaps.app/download/ Hé, regardez mon signet sur la carte CoMaps ! @@ -206,7 +206,7 @@ Êtes-vous sûr de vouloir vous déconnecter de votre compte OpenStreetMap ? - Parcours + Traces Longueur Partager ma position @@ -216,7 +216,7 @@ Information Navigation Boutons de zoom - Afficher à l\'écran + Afficher sur la carte Mode nuit @@ -236,13 +236,13 @@ Annoncer les noms de rue - Lorsqu\'il est activé, le nom de la rue ou de la sortie vers laquelle tourner sera prononcé à haute voix. + Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix. Langue vocale Teste les instructions vocales (TTS, Text-To-Speech) - Vérifie le volume ou les paramètres de synthèse vocale du système si tu n\'entends pas la voix maintenant + Vérifiez le volume ou les paramètres de synthèse vocale du système si vous n\'entendez pas la voix maintenant Non disponible Zoom automatique @@ -275,7 +275,7 @@ Déplacez le téléphone en huit pour calibrer la boussole et fixer la direction de la flèche sur la carte. - Appuie à nouveau longuement sur la carte pour voir l\'interface + Appuyez à nouveau longuement sur la carte pour voir l\'interface Tout mettre à jour @@ -334,7 +334,7 @@ Rose - Pourpre foncé + Violet foncé Bleu ciel @@ -355,15 +355,15 @@ — La carte peut être imprécise et l\'itinéraire proposé n\'est pas forcément le plus direct pour arriver à destination ; — L\'itinéraire proposé doit être considéré comme une simple recommandation ; — Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir des frontières étatiques dans des zones interdites ; - Restez vigilant et soyez prudent sur la route ! + Restez vigilants et soyez prudents sur la route ! Vérifiez le signal GPS - Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être identifiées. + Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées. Vérifiez le signal GPS. Activez le Wi-Fi pour améliorer la précision de votre localisation. Activez les services de localisation - Impossible d\'identifier les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire. + Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire. Impossible de localiser l\'itinéraire Impossible de créer l\'itinéraire - Modifiez votre point de départ ou votre destination + Veuillez ajuster votre point de départ ou votre destination Modifiez votre point de départ Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé. Choisissez un point de départ à proximité d\'une route @@ -377,7 +377,7 @@ Veuillez réessayer Pas maintenant Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ? - Téléchargez des cartes pour créer un itinéraire plus direct sortant des limites de cette carte. + Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte. Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n\'aurez plus besoin d\'une connexion Internet. Sélectionner la carte @@ -387,11 +387,11 @@ Masquer Catégories Historique - Désolé, je n\'ai rien trouvé + Oups, aucun résultat trouvé - Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche. + Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche Historique de recherche - Accédez rapidement aux dernières recherches + Accédez à vos dernières recherches Effacer l\'historique de recherche Wikipédia @@ -399,8 +399,8 @@ Démarrer Depuis Itinéraire vers - La navigation est uniquement disponible à partir de votre emplacement actuel - Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ? + La navigation est disponible uniquement à partir de votre emplacement actuel + Souhaitez-vous planifier un itinéraire à partir de votre emplacement actuel ? Suivant @@ -420,15 +420,15 @@ Heures de fermeture Exemple de valeurs Corriger l\'erreur - Sélectionnez un lieu - Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de réparer l\'erreur. + Sélectionnez un emplacement + Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de le résoudre. Ou faites-le vous-même sur https://www.openstreetmap.org/ Envoyer Problème - Le lieu n\'existe pas + Ce lieu n\'existe pas Fermé pour cause de maintenance Lieu en doublon - Téléchargement automatique + Téléchargement automatique des cartes Quotidien 24/24 et 7/7 @@ -436,7 +436,7 @@ Fermé Aujourd\'hui Ouvert dans %s - Fermé dans %s + Ferme dans %s Fermé Modifier les heures d\'ouverture Vous n\'avez pas de compte sur OpenStreetMap ? @@ -452,7 +452,7 @@ Ajouter une langue Rue - Numéro de la maison + Numéro du bâtiment Détails Réseaux sociaux Bâtiment @@ -464,7 +464,7 @@ Choisir une rue Code postal Cuisine - Sélectionner une cuisine + Sélectionner un type de cuisine Email ou nom d\'utilisateur Ajouter un numéro de téléphone @@ -474,43 +474,43 @@ Toutes vos modifications de la carte seront supprimées avec elle Mettre à jour les cartes Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire. - Trouver la carte - Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet. + Trouver une carte + Veuillez vérifier que votre appareil est bien connecté à Internet. Espace insuffisant Veuillez supprimer les données inutiles Erreur de connexion Modifications vérifiées - Déplacer la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise + Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise Modification Ajout Nom du lieu - Comme c\'est écrit dans la langue locale + Comme écrit dans la langue locale Catégorie Description détaillée du problème Autre problème Ajouter une entreprise Aucun objet ne peut être localisé ici - Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consulte le site OpenStreetMap.org. + Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde ! Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier. %1$d de %2$d - Téléchargement avec une connexion réseau cellulaire ? - Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement - Saisir un numéro de maison correct + Télécharger avec une connexion réseau cellulaire ? + Cela pourrait coûter cher avec certains abonnements ou si vous êtes en déplacement + Saisir un numéro de bâtiment valide Le nombre d\'étages ne doit pas dépasser %d Code postal - Entrer un code postal correct + Entrer un code postal valide Point sur la carte Note aux volontaires OpenStreetMap (facultatif) - Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec CoMaps. + Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec CoMaps Vos modifications sont téléchargées dans la base de données publique OpenStreetMap. Veuillez ne pas ajouter d\'informations personnelles ou protégées par le droit d\'auteur. En savoir plus sur OpenStreetMap @@ -519,8 +519,8 @@ Opérateur Opérateur : %s - Tu ne trouves pas de catégorie appropriée ? - CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur OpenStreetMap.org. Consulte notre guide pour obtenir des instructions détaillées étape par étape. + Vous ne trouvez pas de catégorie appropriée ? + CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur OpenStreetMap.org. Consultez notre guide pour obtenir des instructions détaillées étape par étape. Vous n\'avez téléchargé aucune carte Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne L\'emplacement actuel est inconnu @@ -540,7 +540,7 @@ j Plus Éditer le signet - Remarques personnelles (texte ou html) + Notes personnelles (texte ou html) Commentaire… Abandonner toutes les modifications locales ? Réinitialiser From 0e7d8a65ccbcc89e3a92eb8172d1f281d63b96ff Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Fri, 25 Jul 2025 15:19:52 +0200 Subject: [PATCH 078/222] [android] Improve layouts in RTL mode with LTR texts Signed-off-by: Jean-Baptiste Charron --- android/app/src/main/res/layout/downloader_item.xml | 3 +++ .../app/src/main/res/layout/edit_bookmark_common.xml | 5 ++++- .../src/main/res/layout/item_bookmark_category.xml | 11 +++++++---- android/app/src/main/res/layout/item_editor_input.xml | 1 + .../app/src/main/res/layout/item_localized_name.xml | 3 ++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/res/layout/downloader_item.xml b/android/app/src/main/res/layout/downloader_item.xml index 09dda8ffd..470033f36 100644 --- a/android/app/src/main/res/layout/downloader_item.xml +++ b/android/app/src/main/res/layout/downloader_item.xml @@ -43,6 +43,7 @@ android:layout_height="wrap_content" android:textAppearance="@style/MwmTextAppearance.Body4" android:maxLines="1" + android:textAlignment="viewStart" tools:text="Крымск" tools:background="#60FF00FF"/> @@ -50,6 +51,7 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textAlignment="viewStart" android:textAppearance="@style/MwmTextAppearance.Body1" tools:text="Донецкая область" tools:background="#40FF0000"/> @@ -58,6 +60,7 @@ android:id="@+id/subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textAlignment="viewStart" android:textAppearance="@style/MwmTextAppearance.Body4" tools:text="Украина" tools:background="#60FFFF00"/> diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml index 782ccab4e..605d74cd9 100644 --- a/android/app/src/main/res/layout/edit_bookmark_common.xml +++ b/android/app/src/main/res/layout/edit_bookmark_common.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" android:hint="@string/name" android:padding="@dimen/margin_half_double_plus" + android:textAlignment="viewStart" android:inputType="textCapSentences" android:singleLine="true" /> @@ -64,6 +65,7 @@ android:paddingTop="@dimen/margin_quarter_plus" android:paddingBottom="@dimen/margin_half_plus" android:padding="@dimen/margin_half_double_plus" + android:textAlignment="viewStart" android:textAppearance="@style/MwmTextAppearance.Body1" app:drawableEndCompat="@drawable/ic_arrow_down" /> + android:inputType="textMultiLine" + android:textAlignment="viewStart" /> diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml index 4d073e647..2777c7989 100644 --- a/android/app/src/main/res/layout/item_bookmark_category.xml +++ b/android/app/src/main/res/layout/item_bookmark_category.xml @@ -10,14 +10,16 @@ android:id="@+id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentTop="true" android:layout_alignBottom="@id/bottom_line_container" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_centerVertical="true" android:layout_margin="@dimen/margin_half" - android:padding="@dimen/margin_half" + android:layout_marginStart="8dp" android:background="@null" android:button="@drawable/visibility_selector" - android:buttonTint="?accentColorSelector" /> + android:buttonTint="?accentColorSelector" + android:padding="@dimen/margin_half" /> diff --git a/android/app/src/main/res/layout/item_localized_name.xml b/android/app/src/main/res/layout/item_localized_name.xml index efcaf3956..66b869bdf 100644 --- a/android/app/src/main/res/layout/item_localized_name.xml +++ b/android/app/src/main/res/layout/item_localized_name.xml @@ -21,7 +21,8 @@ android:hint="@string/editor_edit_place_name_hint" android:inputType="textCapSentences" android:padding="@dimen/margin_base" - android:singleLine="true" /> + android:singleLine="true" + android:textAlignment="viewStart" /> Date: Sat, 26 Jul 2025 13:32:57 +0000 Subject: [PATCH 079/222] [strings] Fixed and squashed - Translated using Codeberg Translate Signed-off-by: Konstantin Pastbin --- .../src/main/res/values-fr/types_strings.xml | 2 + .../app/src/main/res/values-sv/strings.xml | 6 +- .../src/main/res/values-uk/types_strings.xml | 22 +++++++ .../main/res/values-zh-rHK/types_strings.xml | 2 + data/countries-strings/ast.json/localize.json | 4 +- data/countries-strings/be.json/localize.json | 2 +- data/countries-strings/cs.json/localize.json | 2 +- data/countries-strings/da.json/localize.json | 2 +- data/countries-strings/es.json/localize.json | 2 +- data/countries-strings/eu.json/localize.json | 2 +- data/countries-strings/he.json/localize.json | 4 +- data/countries-strings/hu.json/localize.json | 2 +- data/countries-strings/ia.json/localize.json | 4 +- data/countries-strings/id.json/localize.json | 2 +- data/countries-strings/ja.json/localize.json | 4 +- data/countries-strings/kab.json/localize.json | 4 +- data/countries-strings/ko.json/localize.json | 4 +- data/countries-strings/nb.json/localize.json | 2 +- data/countries-strings/sr.json/localize.json | 4 +- data/countries-strings/th.json/localize.json | 4 +- data/countries-strings/uk.json/localize.json | 2 +- data/countries-strings/vi.json/localize.json | 2 +- .../zh-Hans.json/localize.json | 4 +- .../fr.lproj/InfoPlist.strings | 2 +- .../fr.lproj/Localizable.strings | 66 +++++++++---------- .../fr.lproj/LocalizableTypes.strings | 4 +- .../sv.lproj/Localizable.strings | 2 +- .../uk.lproj/LocalizableTypes.strings | 44 ++++++------- iphone/metadata/uk/subtitle.txt | 1 + 29 files changed, 122 insertions(+), 85 deletions(-) create mode 100644 iphone/metadata/uk/subtitle.txt diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml index 3041b1dfc..254500877 100644 --- a/android/app/src/main/res/values-fr/types_strings.xml +++ b/android/app/src/main/res/values-fr/types_strings.xml @@ -1408,4 +1408,6 @@ Estran Roselière Marais salant + Parking vélo couvert + Casier à bagages diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index 3f53872c5..7aa1d2845 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -262,7 +262,7 @@ Kartor Ladda ned alla - Ladda ner: + Laddar ner: Avsluta navigering för att radera kartan. @@ -278,7 +278,7 @@ Google Play platstjänster - Fastställ snabbt din ungefärliga position via Bluetooth, WiFi eller mobilnät + En proprietär tjänst som kombinerar GPS, Wi-Fi, mobilnätverk, etc. för att fastställa din position mer exakt. Den kan ansluta till Googles servrar. @@ -873,4 +873,6 @@ Öppet nu Stängt nu kl. %s + Vid aktivering kommer appen fungera på låsskärmen även när enheten är låst. + Om & Hjälp diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml index b42b07efe..213ffe7f9 100644 --- a/android/app/src/main/res/values-uk/types_strings.xml +++ b/android/app/src/main/res/values-uk/types_strings.xml @@ -1392,4 +1392,26 @@ psurface-unpaved_bad route-shuttle_train psurface-unpaved_good + Студія + Камера схову + Кран + Розсадник + Лісництво + Критий велосипедний паркінг + Поштовий партнер + Драбина + Вогнище + Стрибки у воду з висоти + Любовний готель + Відбійник + Релігійна територія + Очеретяні зарості + Болото + Солоне болото + Припливне солоне болото + Низинне болото + Мангровий ліс + Припливна мілина + Станція метро + Квест-кімната diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/app/src/main/res/values-zh-rHK/types_strings.xml index df7616c4f..b87fe6821 100644 --- a/android/app/src/main/res/values-zh-rHK/types_strings.xml +++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml @@ -1401,4 +1401,6 @@ 減速丘 高台跳水 地下鐵站 + Мангровий ліс + Припливна мілина diff --git a/data/countries-strings/ast.json/localize.json b/data/countries-strings/ast.json/localize.json index 6214b09e2..fbff3d28c 100644 --- a/data/countries-strings/ast.json/localize.json +++ b/data/countries-strings/ast.json/localize.json @@ -127,5 +127,7 @@ "Belarus_Vitebsk Region":"Provincia de Vítebsk", "Belarus_Homiel Region":"Provincia de Gómel", "Belarus_Brest Region":"Provincia de Brest", -"North Korea":"Corea del Norte" +"North Korea":"Corea del Norte", +"Taiwan":"Taiwán", +"People's Republic of China":"China" } diff --git a/data/countries-strings/be.json/localize.json b/data/countries-strings/be.json/localize.json index 505b0f17c..2a367651f 100644 --- a/data/countries-strings/be.json/localize.json +++ b/data/countries-strings/be.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Zurich", "Syria":"Syria", -"Taiwan":"Taiwan", +"Taiwan":"Тайвань", "Tajikistan":"Tajikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/cs.json/localize.json b/data/countries-strings/cs.json/localize.json index fe47cc49e..df9ac9f70 100644 --- a/data/countries-strings/cs.json/localize.json +++ b/data/countries-strings/cs.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Metropolitní oblast Curych", "Syria":"Sýrie", -"Taiwan":"Čínská republika", +"Taiwan":"Tchaj-wan", "Tajikistan":"Tádžikistán", "Tanzania":"Tanzanie", "Tennessee":"Tennessee", diff --git a/data/countries-strings/da.json/localize.json b/data/countries-strings/da.json/localize.json index 55f9eeda5..f1dd56451 100644 --- a/data/countries-strings/da.json/localize.json +++ b/data/countries-strings/da.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Zürich byområde", "Syria":"Syrien", -"Taiwan":"Republikken Kina", +"Taiwan":"Taiwan", "Tajikistan":"Tadsjikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/es.json/localize.json b/data/countries-strings/es.json/localize.json index 0c46b3d7b..cfc735db2 100644 --- a/data/countries-strings/es.json/localize.json +++ b/data/countries-strings/es.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Tesino", "Switzerland_Zurich":"Área metropolitana de Zurich", "Syria":"Siria", -"Taiwan":"República de China", +"Taiwan":"Taiwán", "Tajikistan":"Tayikistán", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/eu.json/localize.json b/data/countries-strings/eu.json/localize.json index be4086a29..9d72b52a2 100644 --- a/data/countries-strings/eu.json/localize.json +++ b/data/countries-strings/eu.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Zurich", "Syria":"Siria", -"Taiwan":"Txinako Errepublika", +"Taiwan":"Taiwan", "Tajikistan":"Tadjikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/he.json/localize.json b/data/countries-strings/he.json/localize.json index 3f5a197b4..a8262104c 100644 --- a/data/countries-strings/he.json/localize.json +++ b/data/countries-strings/he.json/localize.json @@ -760,7 +760,7 @@ "Papua New Guinea":"פפואה גינאה החדשה", "Paraguay":"פרגוואי", "Pennsylvania":"פנסילבניה", -"People's Republic of China":"הרפובליקה העממית של סין", +"People's Republic of China":"סִין", "Peru":"פרו", "Peru_North":"פרו — צָפוֹן", "Peru_South":"פרו — דָרוֹם", @@ -977,7 +977,7 @@ "Switzerland_Ticino":"טיצ'ינו", "Switzerland_Zurich":"Zurich", "Syria":"סוריה", -"Taiwan":"הרפובליקה הסינית", +"Taiwan":"טייוואן", "Tajikistan":"טג'יקיסטן", "Tanzania":"טנזניה", "Tennessee":"טנסי", diff --git a/data/countries-strings/hu.json/localize.json b/data/countries-strings/hu.json/localize.json index a39bbe6f6..e33acda61 100644 --- a/data/countries-strings/hu.json/localize.json +++ b/data/countries-strings/hu.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino kanton", "Switzerland_Zurich":"Zürichi agglomeráció", "Syria":"Szíria", -"Taiwan":"Kínai Köztársaság", +"Taiwan":"Tajvan", "Tajikistan":"Tádzsikisztán", "Tanzania":"Tanzánia", "Tennessee":"Tennessee", diff --git a/data/countries-strings/ia.json/localize.json b/data/countries-strings/ia.json/localize.json index 510deadc0..04b9366be 100644 --- a/data/countries-strings/ia.json/localize.json +++ b/data/countries-strings/ia.json/localize.json @@ -39,5 +39,7 @@ "Italy_Sardinia":"Sardinian", "Luxembourg":"Luxembourgish", "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel", -"Argentina_Patagonia":"Patagonia" +"Argentina_Patagonia":"Patagonia", +"Taiwan":"Taiwan", +"People's Republic of China":"China" } diff --git a/data/countries-strings/id.json/localize.json b/data/countries-strings/id.json/localize.json index 3c6ba5441..b419d66b6 100644 --- a/data/countries-strings/id.json/localize.json +++ b/data/countries-strings/id.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Kanton Ticino", "Switzerland_Zurich":"Daerah Motropolitan Zurich", "Syria":"Suriah", -"Taiwan":"Republik Tiongkok", +"Taiwan":"Taiwan", "Tajikistan":"Tajikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/ja.json/localize.json b/data/countries-strings/ja.json/localize.json index eff2cc432..337253487 100644 --- a/data/countries-strings/ja.json/localize.json +++ b/data/countries-strings/ja.json/localize.json @@ -760,7 +760,7 @@ "Papua New Guinea":"パプアニューギニア", "Paraguay":"パラグアイ", "Pennsylvania":"ペンシルベニア州", -"People's Republic of China":"中華人民共和国", +"People's Republic of China":"中国", "Peru":"ペルー", "Peru_North":"ペルー・北部", "Peru_South":"ペルー・南部", @@ -977,7 +977,7 @@ "Switzerland_Ticino":"ティチーノ州", "Switzerland_Zurich":"チューリッヒ都市圏地域", "Syria":"シリア", -"Taiwan":"中華民国", +"Taiwan":"台湾", "Tajikistan":"タジキスタン", "Tanzania":"タンザニア", "Tennessee":"テネシー州", diff --git a/data/countries-strings/kab.json/localize.json b/data/countries-strings/kab.json/localize.json index 5375d5ac2..d5b16f274 100644 --- a/data/countries-strings/kab.json/localize.json +++ b/data/countries-strings/kab.json/localize.json @@ -13,5 +13,7 @@ "Armenia":"Arminya", "Australia":"Usṭralya", "Austria_Lower Austria_West Description":"Mustvirtel, Waldvirtel", -"Argentina_Patagonia":"Patagunya" +"Argentina_Patagonia":"Patagunya", +"People's Republic of China":"Ccinwa", +"Taiwan":"Taywan" } diff --git a/data/countries-strings/ko.json/localize.json b/data/countries-strings/ko.json/localize.json index 093e2d99f..15a9906d7 100644 --- a/data/countries-strings/ko.json/localize.json +++ b/data/countries-strings/ko.json/localize.json @@ -760,7 +760,7 @@ "Papua New Guinea":"파푸아뉴기니", "Paraguay":"파라과이", "Pennsylvania":"펜실베이니아 주", -"People's Republic of China":"중화인민공화국", +"People's Republic of China":"중국", "Peru":"페루", "Peru_North":"페루 — 북", "Peru_South":"페루 — 남", @@ -977,7 +977,7 @@ "Switzerland_Ticino":"티치노 주", "Switzerland_Zurich":"쮜리히 특별자치구", "Syria":"시리아", -"Taiwan":"중화민국", +"Taiwan":"대만", "Tajikistan":"타지키스탄", "Tanzania":"탄자니아", "Tennessee":"테네시 주", diff --git a/data/countries-strings/nb.json/localize.json b/data/countries-strings/nb.json/localize.json index 501716ce3..b4de79dc8 100644 --- a/data/countries-strings/nb.json/localize.json +++ b/data/countries-strings/nb.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Zürich byregion", "Syria":"Syria", -"Taiwan":"Republikken Kina", +"Taiwan":"Taiwan", "Tajikistan":"Tadsjikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/sr.json/localize.json b/data/countries-strings/sr.json/localize.json index d7f64f703..f7ec1ae9b 100644 --- a/data/countries-strings/sr.json/localize.json +++ b/data/countries-strings/sr.json/localize.json @@ -55,5 +55,7 @@ "Switzerland_Espace Mittelland":"Еспаце Мителанд", "US_Pennsylvania_Reading":"Читање", "Russia_Perm Krai_North Short":"Пермскиј крај", -"Spain_Castile and Leon":"Кастиља и Леон" +"Spain_Castile and Leon":"Кастиља и Леон", +"People's Republic of China":"Кина", +"Taiwan":"Тајван" } diff --git a/data/countries-strings/th.json/localize.json b/data/countries-strings/th.json/localize.json index 4e40427e4..9172537cf 100644 --- a/data/countries-strings/th.json/localize.json +++ b/data/countries-strings/th.json/localize.json @@ -760,7 +760,7 @@ "Papua New Guinea":"ประเทศปาปัวนิวกินี", "Paraguay":"ประเทศปารากวัย", "Pennsylvania":"รัฐเพนซิลเวเนีย", -"People's Republic of China":"ประเทศจีน", +"People's Republic of China":"จีน", "Peru":"ประเทศเปรู", "Peru_North":"ประเทศเปรู — เหนือ", "Peru_South":"ประเทศเปรู — ใต้", @@ -977,7 +977,7 @@ "Switzerland_Ticino":"รัฐทีชีโน", "Switzerland_Zurich":"มหานครซูริก", "Syria":"ประเทศซีเรีย", -"Taiwan":"ประเทศไต้หวัน", +"Taiwan":"ไต้หวัน", "Tajikistan":"ประเทศทาจิกิสถาน", "Tanzania":"ประเทศแทนซาเนีย", "Tennessee":"รัฐเทนเนสซี", diff --git a/data/countries-strings/uk.json/localize.json b/data/countries-strings/uk.json/localize.json index 567698262..0fa1c95cb 100644 --- a/data/countries-strings/uk.json/localize.json +++ b/data/countries-strings/uk.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Тічино", "Switzerland_Zurich":"Агломерація Цюрих", "Syria":"Сирія", -"Taiwan":"Республіка Китай", +"Taiwan":"Тайвань", "Tajikistan":"Таджикистан", "Tanzania":"Танзанія", "Tennessee":"Теннессі", diff --git a/data/countries-strings/vi.json/localize.json b/data/countries-strings/vi.json/localize.json index 4ec899f6e..f85957796 100644 --- a/data/countries-strings/vi.json/localize.json +++ b/data/countries-strings/vi.json/localize.json @@ -977,7 +977,7 @@ "Switzerland_Ticino":"Ticino", "Switzerland_Zurich":"Vùng đô thị Zürich", "Syria":"Syria", -"Taiwan":"Trung Hoa Dân Quốc", +"Taiwan":"Đài Loan", "Tajikistan":"Tajikistan", "Tanzania":"Tanzania", "Tennessee":"Tennessee", diff --git a/data/countries-strings/zh-Hans.json/localize.json b/data/countries-strings/zh-Hans.json/localize.json index 414241ff1..947805855 100644 --- a/data/countries-strings/zh-Hans.json/localize.json +++ b/data/countries-strings/zh-Hans.json/localize.json @@ -760,7 +760,7 @@ "Papua New Guinea":"巴布亚新几内亚", "Paraguay":"巴拉圭", "Pennsylvania":"宾夕法尼亚州", -"People's Republic of China":"中华人民共和国", +"People's Republic of China":"中国", "Peru":"秘鲁", "Peru_North":"秘鲁 - 北部", "Peru_South":"秘鲁 - 南部", @@ -977,7 +977,7 @@ "Switzerland_Ticino":"提契诺州", "Switzerland_Zurich":"苏黎世都会区", "Syria":"叙利亚", -"Taiwan":"中华民国", +"Taiwan":"台湾", "Tajikistan":"塔吉克斯坦", "Tanzania":"坦桑尼亚", "Tennessee":"田纳西州", diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings index 70c88341e..12f315bcd 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings @@ -3,7 +3,7 @@ "search" = "Recherche"; /* Used in home screen quick actions. */ -"bookmarks_and_tracks" = "Signets et parcours"; +"bookmarks_and_tracks" = "Signets et traces"; /* Used in home screen quick actions. */ "route" = "Itinéraire"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 78a6b5a8b..b451b163e 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -72,7 +72,7 @@ "bookmarks" = "Signets"; /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */ -"bookmarks_and_tracks" = "Signets et parcours"; +"bookmarks_and_tracks" = "Signets et traces"; /* Default bookmark list name */ "core_my_places" = "Mes endroits"; @@ -90,7 +90,7 @@ "category_eat" = "Un endroit pour manger"; /* Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! */ -"category_food" = "Epiceries"; +"category_food" = "Épiceries"; /* Search category for public transport; any changes should be duplicated in categories.txt @category_transport! */ "category_transport" = "Transport"; @@ -163,7 +163,7 @@ "load_kmz_successful" = "Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l'écran du Gestionnaire de signets."; /* Kml file loading failed */ -"load_kmz_failed" = "Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux."; +"load_kmz_failed" = "Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux."; /* resource for context menu */ "edit" = "Modifier"; @@ -198,7 +198,7 @@ "version: %@ (%@)\nmap data: %@" = "Version : %@ (%@)\nDonnées cartographiques : %@"; /* Title for tracks category in bookmarks manager */ -"tracks_title" = "Parcours"; +"tracks_title" = "Traces"; /* Length of track in cell that describes route */ "length" = "Longueur"; @@ -247,7 +247,7 @@ "pref_tts_street_names_title" = "Annoncer les noms de rue"; /* Settings «Route» category: «Tts announce street names» description */ -"pref_tts_street_names_description" = "Lorsqu'il est activé, le nom de la rue ou de la sortie vers laquelle tourner sera prononcé à haute voix."; +"pref_tts_street_names_description" = "Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix."; /* Settings «Route» category: «Tts language» title */ "pref_tts_language_title" = "Langue vocale"; @@ -340,7 +340,7 @@ "pref_calibration_title" = "Étalonnage de la boussole"; /* Toast text when user hides UI with a long tap anywhere on the map */ -"long_tap_toast" = "Appuie à nouveau longuement sur la carte pour voir l'interface."; +"long_tap_toast" = "Appuyez à nouveau longuement sur la carte pour voir l'interface"; /* Update all button text */ "downloader_update_all_button" = "Tout mettre à jour"; @@ -418,7 +418,7 @@ "pink" = "Rose"; /* deep purple color */ -"deep_purple" = "Pourpre foncé"; +"deep_purple" = "Violet foncé"; /* light blue color */ "light_blue" = "Bleu ciel"; @@ -445,16 +445,16 @@ "dialog_routing_disclaimer_precision" = "— La carte peut être imprécise et l'itinéraire proposé n'est pas forcément le plus direct pour arriver à destination ;"; "dialog_routing_disclaimer_recommendations" = "— L'itinéraire proposé doit être considéré comme une simple recommandation ;"; "dialog_routing_disclaimer_borders" = "— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;"; -"dialog_routing_disclaimer_beware" = "Restez vigilant et soyez prudent sur la route !"; +"dialog_routing_disclaimer_beware" = "Restez vigilants et soyez prudents sur la route !"; "dialog_routing_check_gps" = "Vérifiez le signal GPS"; -"dialog_routing_error_location_not_found" = "Impossible de créer l'itinéraire. Les coordonnées GPS actuelles n'ont pas pu être identifiées."; +"dialog_routing_error_location_not_found" = "Impossible de créer l'itinéraire. Les coordonnées GPS actuelles n'ont pas pu être déterminées."; "dialog_routing_location_turn_wifi" = "Vérifiez le signal GPS. Activez le Wi-Fi pour améliorer la précision de votre localisation."; "dialog_routing_location_turn_on" = "Activez les services de localisation"; -"dialog_routing_location_unknown_turn_on" = "Impossible d'identifier les coordonnées GPS actuelles. Activez les services de localisation pour calculer l'itinéraire."; +"dialog_routing_location_unknown_turn_on" = "Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l'itinéraire."; "dialog_routing_download_files" = "Téléchargez les fichiers requis"; "dialog_routing_download_and_update_all" = "Téléchargez et mettez à jour les informations de carte et d'itinéraire de votre trajet pour calculer l'itinéraire."; "dialog_routing_unable_locate_route" = "Impossible de localiser l'itinéraire"; -"dialog_routing_change_start_or_end" = "Modifiez votre point de départ ou votre destination."; +"dialog_routing_change_start_or_end" = "Veuillez ajuster votre point de départ ou votre destination."; "dialog_routing_change_start" = "Modifiez votre point de départ"; "dialog_routing_start_not_determined" = "Impossible de localiser le point de départ. L'itinéraire n'a pas pu être créé."; "dialog_routing_select_closer_start" = "Choisissez un point de départ à proximité d'une route."; @@ -467,7 +467,7 @@ "dialog_routing_application_error" = "Impossible de créer l'itinéraire à cause d'une erreur dans l'application."; "dialog_routing_try_again" = "Veuillez réessayer"; "dialog_routing_download_and_build_cross_route" = "Voulez-vous télécharger la carte et créer un itinéraire plus direct s'étendant sur plus d'une carte ?"; -"dialog_routing_download_cross_route" = "Téléchargez des cartes pour créer un itinéraire plus direct sortant des limites de cette carte."; +"dialog_routing_download_cross_route" = "Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte."; /* «Show» context menu */ "show" = "Afficher"; @@ -485,12 +485,12 @@ "dialog_routing_download_and_update_maps" = "Pour créer un trajet, veuillez télécharger et mettre à jour toutes les cartes concernant ce trajet."; "categories" = "Catégories"; "history" = "Historique"; -"search_not_found" = "Désolé, je n'ai rien trouvé."; +"search_not_found" = "Oups, aucun résultat trouvé."; /* The message when user did not find anything in the search. */ "search_not_found_query" = "Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d'ajouter le nom d'une ville ou d'un village proche."; "search_history_title" = "Historique de recherche"; -"search_history_text" = "Accédez rapidement aux dernières recherches."; +"search_history_text" = "Accédez à vos dernières recherches."; "clear_search" = "Effacer l'historique de recherche"; /* Place Page link to Wikipedia article (if map object has it). */ @@ -502,8 +502,8 @@ "p2p_start" = "Démarrer"; "p2p_from_here" = "Depuis"; "p2p_to_here" = "Itinéraire vers"; -"p2p_only_from_current" = "La navigation est uniquement disponible à partir de votre emplacement actuel."; -"p2p_reroute_from_current" = "Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?"; +"p2p_only_from_current" = "La navigation est disponible uniquement à partir de votre emplacement actuel."; +"p2p_reroute_from_current" = "Souhaitez-vous planifier un itinéraire à partir de votre emplacement actuel ?"; "editor_time_add" = "Ajouter un horaire d'ouverture"; "editor_time_delete" = "Supprimer un horaire d'ouverture"; @@ -517,11 +517,11 @@ "editor_time_simple" = "Mode simplifié"; "editor_hours_closed" = "Heures de fermeture"; "editor_example_values" = "Exemple de valeurs"; -"editor_add_select_location" = "Sélectionnez un lieu"; +"editor_add_select_location" = "Sélectionnez un emplacement"; "editor_done_dialog_1" = "Vous avez modifié la carte du monde ! Ne le cachez pas ! Dites-le à vos amis, et modifiez-la ensemble."; "share_with_friends" = "Partagez avec vos amis"; "editor_report_problem_send_button" = "Envoyer"; -"autodownload" = "Téléchargement automatique"; +"autodownload" = "Téléchargement automatique des cartes"; /* Place Page opening hours text */ "closed_now" = "Fermé actuellement"; @@ -570,7 +570,7 @@ "add_language" = "Ajouter une langue"; /* Editable House Number text field (in address block). */ -"house_number" = "Numéro de la maison"; +"house_number" = "Numéro du bâtiment"; "details" = "Détails"; /* Text field to enter non-existing street name, below list of known streets around */ @@ -579,7 +579,7 @@ "choose_street" = "Choisir une rue"; "postal_code" = "Code postal"; "cuisine" = "Cuisine"; -"select_cuisine" = "Sélectionner une cuisine"; +"select_cuisine" = "Sélectionner un type de cuisine"; /* login text field */ "email_or_username" = "Email ou nom d'utilisateur"; @@ -588,13 +588,13 @@ "please_note" = "À noter"; "downloader_delete_map_dialog" = "Toutes vos modifications de la carte seront supprimées avec elle."; "downloader_update_maps" = "Mettre à jour les cartes"; -"downloader_search_field_hint" = "Trouver la carte"; +"downloader_search_field_hint" = "Trouver une carte"; "migration_download_error_dialog" = "Erreur de téléchargement"; -"common_check_internet_connection_dialog" = "Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet."; +"common_check_internet_connection_dialog" = "Veuillez vérifier que votre appareil est bien connecté à Internet."; "downloader_no_space_title" = "Espace insuffisant"; "downloader_no_space_message" = "Veuillez supprimer les données inutiles"; "editor_profile_changes" = "Modifications vérifiées"; -"editor_focus_map_on_location" = "Déplacer la carte pour placer la croix à l'emplacement du lieu ou de l'entreprise."; +"editor_focus_map_on_location" = "Déplacez la carte pour placer la croix à l'emplacement du lieu ou de l'entreprise."; "editor_add_select_category" = "Sélectionner une catégorie"; "editor_add_select_category_popular_subtitle" = "Populaire"; "editor_add_select_category_all_subtitle" = "Toutes les catégories"; @@ -603,7 +603,7 @@ "editor_edit_place_name_hint" = "Nom du lieu"; /* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */ -"editor_default_language_hint" = "Comme c'est écrit dans la langue locale"; +"editor_default_language_hint" = "Comme écrit dans la langue locale"; "editor_edit_place_category_title" = "Catégorie"; "whatsnew_editor_message_1" = "Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l'appli."; "dialog_incorrect_feature_position" = "Modifier l'emplacement"; @@ -615,15 +615,15 @@ /* Downloaded 10 **of** 20 <- it is that "of" */ "downloader_of" = "%1$d de %2$d"; -"download_over_mobile_header" = "Téléchargement avec une connexion réseau cellulaire ?"; -"download_over_mobile_message" = "Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement."; -"error_enter_correct_house_number" = "Saisir un numéro de maison correct"; +"download_over_mobile_header" = "Télécharger avec une connexion réseau cellulaire ?"; +"download_over_mobile_message" = "Cela pourrait coûter cher avec certains abonnements ou si vous êtes en déplacement."; +"error_enter_correct_house_number" = "Saisir un numéro de bâtiment valide"; "editor_storey_number" = "Nombre d'étages (max %d)"; /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ "error_enter_correct_storey_number" = "Le nombre d'étages ne doit pas dépasser %d"; "editor_zip_code" = "Code postal"; -"error_enter_correct_zip_code" = "Entrer un code postal correct"; +"error_enter_correct_zip_code" = "Entrer un code postal valide"; /* Place Page title for long tap */ "core_placepage_unknown_place" = "Point sur la carte"; @@ -637,8 +637,8 @@ /* To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... */ "operator" = "Opérateur : %@"; -"editor_category_unsuitable_title" = "Tu ne trouves pas de catégorie appropriée ?"; -"editor_category_unsuitable_text" = "CoMaps ne permet d'ajouter que des catégories de points simples, c'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d'ajouter ces catégories directement sur OpenStreetMap.org. Consulte notre guide pour obtenir des instructions détaillées étape par étape."; +"editor_category_unsuitable_title" = "Vous ne trouvez pas de catégorie appropriée ?"; +"editor_category_unsuitable_text" = "CoMaps ne permet d'ajouter que des catégories de points simples, c'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d'ajouter ces catégories directement sur OpenStreetMap.org. Consultez notre guide pour obtenir des instructions détaillées étape par étape."; "downloader_no_downloaded_maps_title" = "Vous n'avez téléchargé aucune carte"; "downloader_no_downloaded_maps_message" = "Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne"; "current_location_unknown_error_title" = "L'emplacement actuel est inconnu."; @@ -678,7 +678,7 @@ "placepage_call_button" = "Appeler"; "placepage_edit_bookmark_button" = "Éditer le signet"; "placepage_bookmark_name_hint" = "Nom du signet"; -"placepage_personal_notes_hint" = "Remarques personnelles (texte ou html)"; +"placepage_personal_notes_hint" = "Notes personnelles (texte ou html)"; "placepage_delete_bookmark_button" = "Supprimer le signet"; "editor_edits_sent_message" = "Ta note sera envoyée à OpenStreetMap"; "editor_comment_hint" = "Commentaire…"; @@ -1098,6 +1098,6 @@ "osm_profile_view_notes" = "Afficher les notes"; "osm_profile_view_edit_history" = "Afficher l'historique des modifications"; "pref_mapappearance_title" = "Apparence de la carte"; -"pref_maplanguage_title" = "Map Language"; +"pref_maplanguage_title" = "Langue de la carte"; "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_local" = "Langue locale"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings index eb5454d18..3bb9d6932 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings @@ -1500,7 +1500,7 @@ "type.natural.wetland.reedbed" = "Roselière"; "type.natural.wetland.saltmarsh" = "Marais salant"; "type.leisure.escape_game" = "Escape Room"; -"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.luggage_locker" = "Casier à bagages"; "type.post_office.post_partner" = "Post Partner"; "type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.bicycle_parking.covered" = "Parking vélo couvert"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 9867a9075..ecdc62022 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -352,7 +352,7 @@ /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */ "downloader_status_maps" = "Kartor"; "downloader_download_all_button" = "Ladda ned alla"; -"downloader_downloading" = "Ladda ner:"; +"downloader_downloading" = "Laddar ner:"; "downloader_search_results" = "Hittat"; /* Status of outdated country in the list */ diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings index 8b7dca145..5c541fdfd 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings @@ -672,7 +672,7 @@ /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ "type.landuse.cemetery.christian" = "Християнський цвинтар"; -"type.landuse.religious" = "Religious Land"; +"type.landuse.religious" = "Релігійна територія"; "type.landuse.commercial" = "Комерційні ділянки"; "type.landuse.construction" = "Будівництво"; "type.landuse.education" = "Освітній заклади"; @@ -1483,24 +1483,24 @@ /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */ "type.leisure.sports_hall" = "Спортивний зал"; -"type.amenity.studio" = "Studio"; -"type.man_made.crane" = "Crane"; -"type.sport.diving" = "High Diving"; -"type.leisure.firepit" = "Firepit"; -"type.natural.wetland.tidalflat" = "Tidal Flat"; -"type.highway.ladder" = "Ladder"; -"type.natural.wetland.swamp" = "Swamp"; -"type.natural.wetland.saltmarsh" = "Salt Marsh"; -"type.natural.wetland.mangrove" = "Mangrove"; -"type.barrier.guard_rail" = "Guard Rail"; -"type.natural.wetland.fen" = "Fen"; -"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; -"type.natural.wetland.reedbed" = "Reed Bed"; -"type.railway.station.subway.qingdao" = "Subway Station"; -"type.landuse.plant_nursery" = "Plant Nursery"; -"type.amenity.love_hotel" = "Love Hotel"; -"type.leisure.escape_game" = "Escape Room"; -"type.amenity.luggage_locker" = "Luggage Locker"; -"type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; -"type.post_office.post_partner" = "Post Partner"; +"type.amenity.studio" = "Студія"; +"type.man_made.crane" = "Кран"; +"type.sport.diving" = "Стрибки у воду з висоти"; +"type.leisure.firepit" = "Вогнище"; +"type.natural.wetland.tidalflat" = "Припливна мілина"; +"type.highway.ladder" = "Драбина"; +"type.natural.wetland.swamp" = "Болото"; +"type.natural.wetland.saltmarsh" = "Солоне болото"; +"type.natural.wetland.mangrove" = "Мангровий ліс"; +"type.barrier.guard_rail" = "Відбійник"; +"type.natural.wetland.fen" = "Низинне болото"; +"type.natural.wetland.saltmarsh.tidal" = "Припливне солоне болото"; +"type.natural.wetland.reedbed" = "Очеретяні зарості"; +"type.railway.station.subway.qingdao" = "Станція метро"; +"type.landuse.plant_nursery" = "Розсадник"; +"type.amenity.love_hotel" = "Любовний готель"; +"type.leisure.escape_game" = "Квест-кімната"; +"type.amenity.luggage_locker" = "Камера схову"; +"type.amenity.ranger_station" = "Лісництво"; +"type.amenity.bicycle_parking.covered" = "Критий велосипедний паркінг"; +"type.post_office.post_partner" = "Поштовий партнер"; diff --git a/iphone/metadata/uk/subtitle.txt b/iphone/metadata/uk/subtitle.txt new file mode 100644 index 000000000..b840f46c6 --- /dev/null +++ b/iphone/metadata/uk/subtitle.txt @@ -0,0 +1 @@ +Приватна навігація From 332ab819b26bac2b7f5318bc69afead4f3630114 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sun, 27 Jul 2025 11:30:23 +0200 Subject: [PATCH 080/222] [android] Remove somes Android warnings Signed-off-by: Jean-Baptiste Charron --- .../java/app/organicmaps/MwmActivity.java | 1 - .../app/organicmaps/backup/BackupUtils.java | 6 -- .../backup/PeriodicBackupRunner.java | 1 - .../bookmarks/BookmarksListFragment.java | 27 +++++---- .../app/organicmaps/car/CarAppService.java | 3 - .../organicmaps/car/util/RoutingHelpers.java | 40 ++++--------- .../organicmaps/editor/OsmLoginFragment.java | 9 +-- .../leftbutton/LeftButtonsHolder.java | 1 - .../maplayer/MapButtonsController.java | 15 ++--- .../routing/RoutingPlanController.java | 60 +++++++++---------- .../app/organicmaps/sdk/util/HttpClient.java | 1 - .../organicmaps/search/CategoriesAdapter.java | 1 - .../settings/BackupSettingsFragment.java | 13 ++-- .../settings/SettingsPrefsFragment.java | 3 - .../util/bottomsheet/MenuAdapter.java | 1 - 15 files changed, 66 insertions(+), 116 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index a946cd946..685dba784 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -141,7 +141,6 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE; import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG; -import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; public class MwmActivity extends BaseMwmFragmentActivity diff --git a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java index 20a2c6713..2d07154c5 100644 --- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java +++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java @@ -4,7 +4,6 @@ import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAUL import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY; import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; -import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.net.Uri; @@ -17,11 +16,6 @@ import android.text.style.AbsoluteSizeSpan; import androidx.annotation.NonNull; import androidx.documentfile.provider.DocumentFile; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java index 0f0be9af8..ac5a07f45 100644 --- a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java +++ b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java @@ -5,7 +5,6 @@ import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable; import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY; import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY; import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY; -import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; import android.app.Activity; import android.content.SharedPreferences; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java index 687625ccb..4f38d4be1 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java @@ -150,9 +150,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment { - BookmarkListActivity.startForResult(this, startBookmarkListForResult, item); - }); + adapter.setOnClickListener((v, item) -> BookmarkListActivity.startForResult(this, startBookmarkListForResult, item)); return adapter; } @@ -855,15 +853,18 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment getMenuBottomSheetItems(String id) { - if (id.equals(BOOKMARKS_MENU_ID)) - return getBookmarkMenuItems(); - if (id.equals(TRACK_MENU_ID)) - { - final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition); - return getTrackMenuItems(track); - } - if (id.equals(OPTIONS_MENU_ID)) - return getOptionsMenuItems(); - return null; + switch (id) { + case BOOKMARKS_MENU_ID -> { + return getBookmarkMenuItems(); + } + case TRACK_MENU_ID -> { + final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition); + return getTrackMenuItems(track); + } + case OPTIONS_MENU_ID -> { + return getOptionsMenuItems(); + } + } + return null; } } diff --git a/android/app/src/main/java/app/organicmaps/car/CarAppService.java b/android/app/src/main/java/app/organicmaps/car/CarAppService.java index 49823f0a8..a13cc55d8 100644 --- a/android/app/src/main/java/app/organicmaps/car/CarAppService.java +++ b/android/app/src/main/java/app/organicmaps/car/CarAppService.java @@ -3,7 +3,6 @@ package app.organicmaps.car; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; -import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,8 +15,6 @@ import androidx.car.app.validation.HostValidator; import androidx.core.app.NotificationChannelCompat; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; -import androidx.lifecycle.DefaultLifecycleObserver; -import androidx.lifecycle.LifecycleOwner; import app.organicmaps.BuildConfig; import app.organicmaps.R; diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java index 5018c9360..7dc5ea30c 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java @@ -33,35 +33,17 @@ public final class RoutingHelpers public static LaneDirection createLaneDirection(@NonNull LaneWay laneWay, boolean isRecommended) { int shape = LaneDirection.SHAPE_UNKNOWN; - switch (laneWay) - { - case REVERSE: - shape = LaneDirection.SHAPE_U_TURN_LEFT; - break; - case SHARP_LEFT: - shape = LaneDirection.SHAPE_SHARP_LEFT; - break; - case LEFT: - shape = LaneDirection.SHAPE_NORMAL_LEFT; - break; - case SLIGHT_LEFT: - case MERGE_TO_LEFT: - shape = LaneDirection.SHAPE_SLIGHT_LEFT; - break; - case SLIGHT_RIGHT: - case MERGE_TO_RIGHT: - shape = LaneDirection.SHAPE_SLIGHT_RIGHT; - break; - case THROUGH: - shape = LaneDirection.SHAPE_STRAIGHT; - break; - case RIGHT: - shape = LaneDirection.SHAPE_NORMAL_RIGHT; - break; - case SHARP_RIGHT: - shape = LaneDirection.SHAPE_SHARP_RIGHT; - break; - } + shape = switch (laneWay) { + case REVERSE -> LaneDirection.SHAPE_U_TURN_LEFT; + case SHARP_LEFT -> LaneDirection.SHAPE_SHARP_LEFT; + case LEFT -> LaneDirection.SHAPE_NORMAL_LEFT; + case SLIGHT_LEFT, MERGE_TO_LEFT -> LaneDirection.SHAPE_SLIGHT_LEFT; + case SLIGHT_RIGHT, MERGE_TO_RIGHT -> LaneDirection.SHAPE_SLIGHT_RIGHT; + case THROUGH -> LaneDirection.SHAPE_STRAIGHT; + case RIGHT -> LaneDirection.SHAPE_NORMAL_RIGHT; + case SHARP_RIGHT -> LaneDirection.SHAPE_SHARP_RIGHT; + default -> shape; + }; return LaneDirection.create(shape, isRecommended); } diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java index 7494f6ccb..59802e46a 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java @@ -12,12 +12,11 @@ import android.widget.ScrollView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; -import app.organicmaps.sdk.Framework; + import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; import app.organicmaps.sdk.editor.OsmOAuth; import app.organicmaps.sdk.util.Constants; -import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.util.InputUtils; import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; @@ -56,7 +55,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment MaterialButton registerButton = view.findViewById(R.id.register); registerButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_REGISTER)); mProgress = view.findViewById(R.id.osm_login_progress); - final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion()); // TODO(@pastk): remove unused flow with users entering credentials into app's form // Hide login and password inputs and Forgot password button @@ -165,10 +163,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment // Finish OAuth2 auth flow and get username for UI. final String oauthToken = OsmOAuth.nativeAuthWithOAuth2Code(oauth2code); final String username = (oauthToken == null) ? null : OsmOAuth.nativeGetOsmUsername(oauthToken); - UiThread.run(() -> - { - processAuth(oauthToken, username); - }); + UiThread.run(() -> processAuth(oauthToken, username)); }); } } diff --git a/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java b/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java index 67ac90de4..be7f78f8d 100644 --- a/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java +++ b/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java @@ -10,7 +10,6 @@ import androidx.preference.PreferenceManager; import app.organicmaps.R; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index 2fc6851c0..6a85f44b6 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -399,15 +399,12 @@ public class MapButtonsController extends Fragment final View button = entry.getValue(); if (button.getParent() == parent) { - int toleranceOffset = 0; - // Allow offset tolerance for zoom buttons - switch(entry.getKey()) - { - case zoomIn: case zoomOut: case zoom: - toleranceOffset = -140; - break; - } - showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey()); + int toleranceOffset = switch (entry.getKey()) { + case zoomIn, zoomOut, zoom -> -140; + default -> 0; + // Allow offset tolerance for zoom buttons + }; + showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey()); } } } diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java index a3c6ef7c7..959aacec1 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java @@ -12,7 +12,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import app.organicmaps.sdk.Framework; @@ -226,37 +225,34 @@ public class RoutingPlanController extends ToolbarController { UiUtils.invisible(mProgressVehicle, mProgressPedestrian, mProgressTransit, mProgressBicycle, mProgressRuler); - WheelProgressView progressView; - switch (router) - { - case Vehicle: - mRouterTypes.check(R.id.vehicle); - progressView = mProgressVehicle; - break; - case Pedestrian: - mRouterTypes.check(R.id.pedestrian); - progressView = mProgressPedestrian; - break; - //case Taxi: - // { - // mRouterTypes.check(R.id.taxi); - // progressView = mProgressTaxi; - // } - case Transit: - mRouterTypes.check(R.id.transit); - progressView = mProgressTransit; - break; - case Bicycle: - mRouterTypes.check(R.id.bicycle); - progressView = mProgressBicycle; - break; - case Ruler: - mRouterTypes.check(R.id.ruler); - progressView = mProgressRuler; - break; - default: - throw new IllegalArgumentException("unknown router: " + router); - } + WheelProgressView progressView = switch (router) { + case Vehicle -> { + mRouterTypes.check(R.id.vehicle); + yield mProgressVehicle; + } + case Pedestrian -> { + mRouterTypes.check(R.id.pedestrian); + yield mProgressPedestrian; + } + //case Taxi: + // { + // mRouterTypes.check(R.id.taxi); + // progressView = mProgressTaxi; + // } + case Transit -> { + mRouterTypes.check(R.id.transit); + yield mProgressTransit; + } + case Bicycle -> { + mRouterTypes.check(R.id.bicycle); + yield mProgressBicycle; + } + case Ruler -> { + mRouterTypes.check(R.id.ruler); + yield mProgressRuler; + } + default -> throw new IllegalArgumentException("unknown router: " + router); + }; RoutingToolbarButton button = mRouterTypes .findViewById(mRouterTypes.getCheckedRadioButtonId()); diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java index f66dcf80d..59d02a505 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java @@ -31,7 +31,6 @@ import androidx.annotation.NonNull; import app.organicmaps.downloader.Android7RootCertificateWorkaround; import app.organicmaps.sdk.util.log.Logger; -import app.organicmaps.sdk.util.Utils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java index d15299a59..e0140ea85 100644 --- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java @@ -5,7 +5,6 @@ import android.app.Activity; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.os.Build; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java index 1716a4d08..3af4f39f6 100644 --- a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java @@ -2,7 +2,6 @@ package app.organicmaps.settings; import static app.organicmaps.backup.BackupUtils.formatReadableFolderPath; import static app.organicmaps.backup.BackupUtils.getMaxBackups; -import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable; import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable; import android.app.Activity; @@ -355,13 +354,11 @@ public class BackupSettingsFragment private void showBackupErrorAlertDialog(String message) { - requireActivity().runOnUiThread(() -> { - new MaterialAlertDialogBuilder(requireActivity()) - .setTitle(R.string.pref_backup_now_summary_failed) - .setMessage(message) - .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()) - .show(); - }); + requireActivity().runOnUiThread(() -> new MaterialAlertDialogBuilder(requireActivity()) + .setTitle(R.string.pref_backup_now_summary_failed) + .setMessage(message) + .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()) + .show()); } private void takePersistableUriPermission(Uri uri) diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java index 521ace624..46141f998 100644 --- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java @@ -24,7 +24,6 @@ import app.organicmaps.sdk.editor.OsmOAuth; import app.organicmaps.editor.LanguagesFragment; import app.organicmaps.editor.ProfileActivity; import app.organicmaps.sdk.editor.data.Language; -import app.organicmaps.help.HelpActivity; import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.location.LocationProviderFactory; import app.organicmaps.sdk.routing.RoutingOptions; @@ -44,8 +43,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Locale; diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java index 23f5358e9..d8eed3dd8 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java @@ -14,7 +14,6 @@ import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; import app.organicmaps.sdk.location.TrackRecorder; -import app.organicmaps.sdk.util.Config; import java.util.ArrayList; From b37572000f83e888941223863fdf22431ae3dfb0 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Sun, 27 Jul 2025 10:10:36 +0000 Subject: [PATCH 081/222] [strings] Update from Codeberg Translate Co-authored-by: B o d o Co-authored-by: Codeberg Translate Co-authored-by: ERYpTION Co-authored-by: Fjuro Co-authored-by: Mickael81 Co-authored-by: N4ta Co-authored-by: Weblate Co-authored-by: Weblate Translation Memory Co-authored-by: patepelo Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings --- .../play/listings/da-DK/full-description.txt | 36 ++++++++++++ .../src/google/play/listings/da-DK/title.txt | 1 + .../play/listings/fr-FR/short-description.txt | 2 +- .../app/src/main/res/values-cs/strings.xml | 56 +++++++++---------- .../src/main/res/values-cs/types_strings.xml | 4 ++ .../app/src/main/res/values-da/strings.xml | 56 +++++++++---------- .../app/src/main/res/values-de/strings.xml | 16 +++--- .../app/src/main/res/values-fr/strings.xml | 16 +++--- .../src/main/res/values-fr/types_strings.xml | 3 + .../src/main/res/values-pt/types_strings.xml | 2 + data/countries-strings/da.json/localize.json | 12 ++-- data/countries-strings/es.json/localize.json | 28 +++++----- .../cs.lproj/Localizable.strings | 6 +- .../cs.lproj/LocalizableTypes.strings | 8 +-- .../da.lproj/Localizable.strings | 12 ++-- .../da.lproj/Localizable.stringsdict | 4 ++ .../fr.lproj/Localizable.strings | 2 +- .../fr.lproj/LocalizableTypes.strings | 4 +- .../pt.lproj/Localizable.strings | 6 +- .../pt.lproj/LocalizableTypes.strings | 4 +- iphone/metadata/da/subtitle.txt | 2 +- 21 files changed, 165 insertions(+), 115 deletions(-) create mode 100644 android/app/src/google/play/listings/da-DK/full-description.txt create mode 100644 android/app/src/google/play/listings/da-DK/title.txt diff --git a/android/app/src/google/play/listings/da-DK/full-description.txt b/android/app/src/google/play/listings/da-DK/full-description.txt new file mode 100644 index 000000000..3cf4ebed5 --- /dev/null +++ b/android/app/src/google/play/listings/da-DK/full-description.txt @@ -0,0 +1,36 @@ +En fællesskabsdrevet gratis og open source-kortapp baseret på OpenStreetMap-data og forstærket med en forpligtelse til gennemsigtighed, privatliv og non-profit. + +Bliv en del af fællesskabet og vær med til at skabe den bedste kortapp +• Brug appen og fortæl andre om den +• Giv feedback og rapporter problemer +• Opdater kortdata i appen eller på OpenStreetMap-webstedet + +Din feedback og 5-stjernede anmeldelser er den bedste støtte for os! + +‣ Enkel og poleret: væsentlige, brugervenlige funktioner, der bare virker. +‣ Offline-focused: Planlæg og naviger på din rejse i udlandet uden behov for mobilfordbindelse, søg efter rutepunkter, mens du er på en lang vandretur osv. Alle app-funktioner er designet til at fungere offline.. +‣ Respekt for privatlivets fred: Appen er designet med fokus på privatlivets fred – den identificerer ikke personer, sporer ikke og indsamler ikke personlige oplysninger. Annoncefri. +‣ Sparer på batteriet og plads: Dræner ikke dit batteri som andre navigationsapps. Kompakte kort sparer værdifuld plads på din telefon. +‣ Gratis og udviklet af fællesskabet: Folk som dig har været med til at udvikle appen ved at tilføje steder til OpenStreetMap, teste og give feedback på funktioner samt bidrage med deres udviklingskompetencer og penge. +‣ Åben og gennemsigtig beslutningstagning og økonomi, non-profit og fuldstændig open source. + +Vigtigste funktioner: +• Detaljerede kort med steder, der ikke er tilgængelige på Google Maps, kan downloades. +• Udendørstilstand med fremhævede vandreruter, campingpladser, vandkilder, bjergtoppe, højdekurver osv. +• Gang- og cykelstier +• Interessepunkter som restauranter, tankstationer, hoteller, butikker, seværdigheder og meget mere +• Søg efter navn, adresse eller efter interessepunkt-kategori +• Navigation med stemmevejledning til gående, cyklende eller kørende +• Bogmærk dine yndlingssteder med ét enkelt tryk +• Offline Wikipedia-artikler +• Lag med metrolinjer og rutevejledning +• Sporoptagelse +• Eksportér og importér bogmærker og ruter i KML, KMZ, GPX-formater +• En mørk tilstand til brug om natten +• Forbedr kortdata for alle ved hjælp af en simpel, indbygget redigeringsfunktion +• Android Auto-understøttelse + +Rapportér app-problemer, kom med forslag og bliv en del af vores fællesskab på comaps.app webstedet. + +Nu med frihed +Udforsk din rejse, og navigér i verden med fokus på privatliv og fællesskab! diff --git a/android/app/src/google/play/listings/da-DK/title.txt b/android/app/src/google/play/listings/da-DK/title.txt new file mode 100644 index 000000000..8995258ba --- /dev/null +++ b/android/app/src/google/play/listings/da-DK/title.txt @@ -0,0 +1 @@ +CoMaps - Naviger med privatliv diff --git a/android/app/src/google/play/listings/fr-FR/short-description.txt b/android/app/src/google/play/listings/fr-FR/short-description.txt index 9b00be32b..3a6d8ef89 100644 --- a/android/app/src/google/play/listings/fr-FR/short-description.txt +++ b/android/app/src/google/play/listings/fr-FR/short-description.txt @@ -1 +1 @@ -Navigation cartographique facile - Propulsé par la communauté +Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml index bf5d81840..97fbbc767 100644 --- a/android/app/src/main/res/values-cs/strings.xml +++ b/android/app/src/main/res/values-cs/strings.xml @@ -9,7 +9,7 @@ Smazat Stáhnout mapy - Stahování selhalo, zkuste to znovu. + Stahování selhalo, klepnutím to zkusíte znovu Stahování… @@ -29,7 +29,7 @@ Omezená přesnost - Chcete-li zajistit přesnou navigaci, povolte v nastavení možnost Přesná poloha. + Chcete-li zajistit přesnou navigaci, povolte v nastavení možnost Přesná poloha Ukázat na mapě @@ -88,7 +88,7 @@ Ukládat mapy do - Vyberte místo, kam mají být stahovány mapy. + Vyberte místo, kam mají být stahovány mapy Mapy @@ -166,9 +166,9 @@ Vaše poloha zatím nebyla určena - Omlouváme se, nastavení uložení map je dočasně nedostupné. + Omlouváme se, nastavení úložiště map je dočasně nedostupné - Právě probíhá stahování země. + Právě probíhá stahování země Podívej se na mojí polohu v CoMaps! %1$s nebo %2$s Nemáš offline mapy? Stáhni si je zde: https://www.comaps.app/download/ @@ -226,7 +226,7 @@ Otestovat hlasové pokyny (TTS, Text-To-Speech) - Pokud nyní hlas neslyšíte, zkontrolujte nastavení hlasitosti nebo převodu textu na řeč v systému. + Pokud nyní hlas neslyšíte, zkontrolujte nastavení hlasitosti nebo převodu textu na řeč v systému Není dostupná Automatické zvětšení @@ -272,7 +272,7 @@ Stáhnout vše Probíhá stahování: - Chcete-li odstranit mapu, pak prosím zastavte navigaci. + Chcete-li odstranit mapu, zastavte prosím navigaci Lze vytvářet jen takové trasy, které se nachází na území jediné mapy. @@ -344,18 +344,18 @@ Povolit služby určování polohy Aktuální souřadnice GPS se nepodařilo zjistit. Pro výpočet trasy povolte služby určování polohy. Trasu se nepodařilo zjistit - Trasu se nepodařilo vytvořit. + Trasu se nepodařilo vytvořit Upravte výchozí nebo cílový bod. Upravte výchozí bod Trasa nebyla vytvořena. Výchozí bod se nepodařilo najít. Zvolte výchozí bod blíže k silnici. Upravit cíl Trasa nebyla vytvořena. Cíl se nepodařilo najít. - Vyberte cílový bod blíže k silnici. - Nelze najít mezilehlý bod. - Upravte mezilehlý bod. + Vyberte cílový bod blíže k silnici + Nelze najít mezilehlý bod + Upravte mezilehlý bod Systémová chyba - Trasu se nepodařilo vytvořit z důvodu chyby aplikace. + Trasu se nepodařilo vytvořit z důvodu chyby aplikace Prosím, zkuste to znovu Nyní ne Chcete mapu stáhnout a vytvořit optimálnější trasu, která vede přes více než jednu mapu? @@ -369,17 +369,17 @@ Skrýt Kategorie Historie - Omlouváme se, nic nebylo nalezeno. + Omlouváme se, nic nebylo nalezeno Stáhněte si oblast, ve které hledáte, nebo zkuste přidat název blízkého města/obce. Historie vyhledávání - Získejte rychlý přístup k hledaným výrazům. + Zobrazit nedávná vyhledávání Vymazat historii vyhledávání Vaše umístění Start Trasa z Trasa do - Navigovat lze pouze z současného umístění. + Navigovat lze pouze ze současného umístění Máme naplánovat trasu z vašeho současného umístění? Další @@ -446,14 +446,14 @@ E-mail nebo uživatelské jméno Podlaží - Zároveň s touto mapou budou odstraněny také všechny změny na této mapě. + Zároveň s touto mapou budou odstraněny také všechny změny na této mapě Aktualizujte mapy Chcete-li vytvořit trasu, pak musíte aktualizovat všechny mapy a poté trasu naplánovat znovu. Najít mapu - Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu. + Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu Nedostatek místa Odstraňte prosím nepotřebná data - Chyba při přihlašování. + Chyba při přihlašování Oveřené změny Přetažením mapy umístěte křížek na místo, kde se nachází místo nebo podnik. Probíhají úpravy @@ -470,11 +470,11 @@ Data OpenStreetMap vytvořená komunitou ke dni %s. Další informace o tom, jak upravovat a aktualizovat mapu, najdete na stránkách OpenStreetMap.org OpenStreetMap.org (OSM) je komunitní projekt, jehož cílem je vytvořit svobodnou a otevřenou mapu. Je hlavním zdrojem mapových dat v aplikaci CoMaps a funguje podobně jako Wikipedie. Můžete přidávat nebo upravovat místa a ta se pak stanou dostupná milionům uživatelů po celém světě. \nPřipojte se ke komunitě a pomozte vytvořit lepší mapu pro všechny! - Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu. + Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu %1$d z %2$d Stáhnout pomocí připojení přes mobilní síť? - Toto by mohlo být s některými tarify nebo roamingem výrazně dražší. + Toto by mohlo být s některými tarify nebo roamingem výrazně dražší Zadejte správné číslo domu Opravte počet poschodí, max. %d @@ -497,8 +497,8 @@ Nemůžete najít vhodnou kategorii? CoMaps umožňují přidávat pouze jednoduché kategorie bodů, tedy žádná města, silnice, jezera, obrysy budov atd. Takové kategorie prosím přidávejte přímo na OpenStreetMap.org. Podrobné pokyny krok za krokem najdete v našem průvodci. Nemáte stažené žádné mapy - Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline. - Současná poloha nezjištěna. + Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline + Aktuální poloha je neznámá m @@ -530,8 +530,8 @@ Chcete změnu odeslat všem uživatelům? - Ujistěte se, že jste nezadali žádná osobní data. - Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy. + Ujistěte se, že jste nezadali žádná soukromá nebo osobní data + Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy Záznam trasy @@ -544,10 +544,10 @@ Nepoužívat dnes Mobilní data - Pro zobrazení oznámení o aktualizacích map a nahrávání úprav je potřeba internet. + Pro zobrazení oznámení o aktualizacích map a nahrávání úprav je potřeba internet Nikdy nepoužívat Vždy se zeptat - Ke zobrazení údajů o provozu musí být aktualizovány mapy. + Ke zobrazení údajů o provozu musí být mapy aktuální Zvětšit velikost písma na mapě Aktualizujte CoMaps @@ -557,7 +557,7 @@ Všeobecné připomínky Pro hlasové pokyny používáme systémovou službu TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si jej stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid). \nOtevřete nastavení vašeho zařízení → Jazyky a zadávání → Hlasové zadávání → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč. - Více informací najdete v tomto návodu. + Více informací najdete v tomto návodu Přepis do latinky Zjistit více @@ -639,7 +639,7 @@ Nikdy neupozorňovat Režim spořiče baterie - Pokusit se snížit spotřebu energie na úkor některých funkcí. + Pokusit se snížit spotřebu energie na úkor některých funkcí Nikdy Při vybité baterii Vždy diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml index 4d7f3ba50..ec5658211 100644 --- a/android/app/src/main/res/values-cs/types_strings.xml +++ b/android/app/src/main/res/values-cs/types_strings.xml @@ -1406,4 +1406,8 @@ Mangrovy Wattové pobřeží Úniková hra + Poštovní partner + Kryté parkování kol + Úschovná skříňka + Správci parku diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index 7b9f87ef8..f8531e75a 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -9,7 +9,7 @@ Slet Hent kort - Hentning af kort mislykkedes. Tryk for at prøve igen. + Hentning af kort mislykkedes. Tryk for at prøve igen Henter… @@ -29,7 +29,7 @@ Begrænset nøjagtighed - For at sikre nøjagtig navigation skal du aktivere præcis placering i indstillinger. + For at sikre nøjagtig navigation skal du aktivere præcis placering i indstillinger Vis på kortet @@ -88,7 +88,7 @@ Gem kort på - Vælg den mappe, der skal downloades kort til. + Vælg den mappe, der skal downloades kort til Downloadede kort @@ -166,9 +166,9 @@ Din placering er ikke blevet bestemt endnu - Beklager, indstillingerne for kortlagring er i øjeblikket deaktiveret. + Beklager, indstillingerne for kortlagring er i øjeblikket deaktiveret - Download af kort er i gang nu. + Download af kort er i gang nu Hey, tjek min nuværende placering på CoMaps! %1$s eller %2$s. Har du ikke offline kort? Download her: https://www.comaps.app/download/ @@ -222,7 +222,7 @@ Test stemmeanvisninger (TTS, Text-To-Speech) - Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu. + Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu Ikke til rådighed Auto-zoom @@ -268,7 +268,7 @@ Download alle Downloader: - For at slette kortet skal du stoppe navigeringen. + For at slette kortet skal du stoppe navigeringen Der kan kun oprettes ruter, der er fuldt ud indeholdt i et kort over en enkelt region. @@ -340,18 +340,18 @@ Aktiver placeringstjenester Det lykkedes ikke at finde de aktuelle GPS-koordinater. Slå placeringstjenester til for at beregne rute. Kan ikke finde rute - Kan ikke oprette rute. + Kan ikke oprette rute Prøv at angive et andet startpunkt eller en anden destination. Vælg et andet startpunkt Rute blev ikke oprettet. Kunne ikke finde startpunktet. Angiv et startpunkt, der ligger tættere på en vej. Vælg en anden destination Rute blev ikke oprettet. Kunne ikke finde destinationen. - Angiv en destination, der ligger tættere på en vej. - Kunne ikke lokalisere mellemliggende punkt. - Rediger det mellemliggende punkt. + Angiv en destination, der ligger tættere på en vej + Kunne ikke lokalisere mellemliggende punkt + Rediger det mellemliggende punkt Systemfejl - Kan ikke oprette rute på grund af en applikationsfejl. + Kan ikke oprette rute på grund af en applikationsfejl Prøv venligst igen Ikke nu Ønsker du at downloade kortet og planlægge en mere optimal rute, der strækker sig over mere end ét kort? @@ -365,17 +365,17 @@ Skjul Kategorier Historik - Ups, ingen resultater fundet. + Ups, ingen resultater fundet Download den region, hvor du søger i, eller prøv at tilføje et nærliggende bynavn. Søgehistorik - Se dine seneste søgninger. + Se dine seneste søgninger Ryd søgehistorik Din placering Start Rute fra Rute til - Navigation er kun tilgængelig fra din nuværende placering. + Navigation er kun tilgængelig fra din nuværende placering Ønsker du at planlægge en rute fra din nuværende placering? Næste @@ -442,14 +442,14 @@ E-mail eller brugernavn Etage - Alle dine kortændringer vil blive slettet sammen med kortet. + Alle dine kortændringer vil blive slettet sammen med kortet Opdatér kort For at oprette en rute skal du opdatere alle kort og så planlægge ruten igen. Find kort - Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet. + Sørg for, din enhed er forbundet til internettet Ikke nok plads Slet unødvendig data - Login-fejl. + Login-fejl Bekræftede ændringer Træk i kortet for at placere korset på stedet eller virksomheden. Redigerer @@ -466,11 +466,11 @@ Fællesskabsskabte OpenStreetMap-data fra %s. Få mere at vide om, hvordan du redigerer og opdaterer kortet på OpenStreetMap.org OpenStreetMap.org (OSM) er et fællesskabsprojekt til opbygning af et gratis og åbent kort. Det er hovedkilden til kortdata i CoMaps og fungerer på samme måde som Wikipedia. Du kan tilføje eller redigere steder, og de bliver tilgængelige for millioner af brugere over hele verden. \nSlut dig til fællesskabet og vær med til at skabe et bedre kort for alle! - Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer til hele verden. + Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer for hele verden %1$d af %2$d Download ved brug af mobilnetværksforbindelse? - Dette kan være meget dyrt med nogle abonnementer eller ved roaming. + Dette kan være meget dyrt med nogle abonnementer eller ved roaming Indtast et gyldigt bygningsnummer Antallet af etager må ikke overstige %d etager @@ -493,8 +493,8 @@ Kan du ikke finde en passende kategori? CoMaps giver kun mulighed for at tilføje simple punktkategorier, dvs. ingen byer, veje, søer, bygningsomrids osv. Tilføj sådanne kategorier direkte til OpenStreetMap.org. Se vores guide for detaljerede trin for trin-instruktioner. Du har ikke downloadet nogen kort - Download kort for at søge og navigere offline. - Aktuel placering er ukendt. + Download kort for at søge og navigere offline + Aktuel placering er ukendt m @@ -526,8 +526,8 @@ Ønsker du at sende det til alle brugere? - Sørg for at du ikke indtastede personlige oplysninger. - OpenStreetMap-redaktører vil tjekke ændringerne og kontakte dig, hvis de har spørgsmål. + Sørg for at du ikke indtastede personlige oplysninger + OpenStreetMap-redaktører vil tjekke ændringerne og kontakte dig, hvis de har spørgsmål Optager sporet @@ -540,10 +540,10 @@ Brug ikke i dag Mobilt internet - Mobilt internet er nødvendigt for at få besked om kortopdateringer og uploade ændringer. + Mobilt internet er nødvendigt for at få besked om kortopdateringer og uploade ændringer Brug aldrig Spørg altid - Kort skal opdateres for at vise trafikdata. + Kort skal opdateres for at vise trafikdata Forøg størrelsen på kortetiketter Opdater CoMaps @@ -553,7 +553,7 @@ Generel feedback Vi bruger systemets TTS til stemmevejledning. Mange Android-enheder bruger Google TTS, du kan hente eller opdatere det via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) For nogle sprog skal du installere en anden talesyntese eller en yderligere sprogpakke fra appbutiken (Google Play, Galaxy Store, App Gallery, FDroid). \nÅbn enhedens indstillinger → Sprog og input → Tale → Tekst til tale. \nHer kan du administrere indstillingerne for talesyntese (f.eks. downloade en sprogpakke til brug offline) og vælge et andet tekst-til-tale program. - Se denne vejledning for flere oplysninger. + Se denne vejledning for flere oplysninger Translitterer til det latinske alfabet Flere oplysninger @@ -632,7 +632,7 @@ Advar aldrig Strømsparetilstand - Prøv at reducere strømforbruget på bekostning af nogle funktioner. + Prøv at reducere strømforbruget på bekostning af nogle funktioner Aldrig Når batteriniveauet er lavt Altid diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index 07ff1b539..9270c345a 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -9,7 +9,7 @@ Löschen Karten herunterladen - Herunterladen fehlgeschlagen. Antippen für einen neuen Versuch. + Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch Wird heruntergeladen … @@ -29,7 +29,7 @@ Begrenzte Genauigkeit - Um eine genaue Navigation zu gewährleisten, aktivieren Sie in den Einstellungen die Option \"Genauen Standort verwenden\". + Um eine präzise Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen Auf der Karte anzeigen @@ -88,7 +88,7 @@ Karten speichern auf - Wählen Sie den Speicherort für die heruntergeladenen Karten. + Wählen Sie den Speicherort für die herunterzuladenden Karten Heruntergeladene Karten @@ -179,9 +179,9 @@ Ihr Standort konnte noch nicht ermittelt werden - Leider sind die Einstellungen für die Kartenspeicherung aktuell deaktiviert. + Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert - Die Karte wird heruntergeladen. + Die Karte wird heruntergeladen Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/ @@ -239,7 +239,7 @@ Teste Sprachanweisungen (TTS, Text-To-Speech) - Überprüfe die Lautstärke oder die Text-to-speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hörst. + Überprüfe die Lautstärke oder die Text-to-speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst Nicht verfügbar Auto-Zoom @@ -285,7 +285,7 @@ Alle herunterladen Wird heruntergeladen: - Zum Löschen der Karte bitte die Navigation unterbrechen. + Zum Löschen der Karte bitte die Navigation unterbrechen Es können nur Routen erstellt werden, die vollständig in einer einzigen Karte enthalten sind. @@ -357,7 +357,7 @@ Standortdienste aktivieren Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen. Route kann nicht ermittelt werden - Route kann nicht erstellt werden. + Route kann nicht erstellt werden Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an. Startpunkt anpassen Route wurde nicht erstellt. Startpunkt kann nicht gefunden werden. diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index a0f69618b..f25b4b2be 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -91,7 +91,7 @@ Enregistrer les cartes dans - Sélectionner l\'emplacement où les cartes seront téléchargées + Sélectionnez le dossier dans lequel télécharger les cartes Cartes téléchargées @@ -182,7 +182,7 @@ Votre position n\'a pas encore été déterminée - Désolé, les paramètres de stockage des cartes sont présentement désactivés. + Désolé, les paramètres de stockage de carte sont actuellement désactivés. Le téléchargement de la carte est en cours @@ -371,7 +371,7 @@ Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé. Choisissez un lieu de destination à proximité d\'une route Impossible de localiser le point intermédiaire - Veuillez modifier votre point intermédiaire + Veuillez ajuster votre point intermédiaire Erreur système Impossible de créer l\'itinéraire à cause d\'une erreur dans l\'application Veuillez réessayer @@ -475,7 +475,7 @@ Mettre à jour les cartes Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire. Trouver une carte - Veuillez vérifier que votre appareil est bien connecté à Internet. + Veuillez vous assurer que votre appareil est connecté à Internet Espace insuffisant Veuillez supprimer les données inutiles Erreur de connexion @@ -495,7 +495,7 @@ Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde ! - Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier. + Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier. %1$d de %2$d Télécharger avec une connexion réseau cellulaire ? @@ -576,10 +576,10 @@ Ne pas utiliser aujourd\'hui Internet mobile - L\'Internet mobile est nécessaire pour afficher des informations détaillées sur les lieux, telles que les photos, les prix et les avis. + L\'Internet mobile est requis pour les notifications de mise à jour de carte et le téléchargement des modifications. Ne jamais utiliser Toujours demander - Pour afficher les données de circulation, les cartes doivent être actualisées. + Pour afficher les données de circulation, les cartes doivent être mises à jour. Augmenter la taille de police sur la carte Veuillez mettre à jour CoMaps @@ -671,7 +671,7 @@ Jamais avertir Mode économie d\'énergie - Si le mode d\'économie d\'énergie est activé, l\'application désactive les fonctions consommant de l\'énergie en fonction de la charge actuelle du téléphone + Essayez de réduire la consommation d’énergie au détriment de certaines fonctionnalités Jamais Automatique Économie d\'énergie maximale diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml index 254500877..aa0a347b3 100644 --- a/android/app/src/main/res/values-fr/types_strings.xml +++ b/android/app/src/main/res/values-fr/types_strings.xml @@ -1410,4 +1410,7 @@ Marais salant Parking vélo couvert Casier à bagages + Partenaire de publication + Poste de garde forestier + Escape Room diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml index e307ba68a..947551d81 100644 --- a/android/app/src/main/res/values-pt/types_strings.xml +++ b/android/app/src/main/res/values-pt/types_strings.xml @@ -1409,4 +1409,6 @@ Caniçal Pântano Mangal + Estacionamento de Bicicletas Coberto + Depósito de Bagagem diff --git a/data/countries-strings/da.json/localize.json b/data/countries-strings/da.json/localize.json index f1dd56451..a2ea09310 100644 --- a/data/countries-strings/da.json/localize.json +++ b/data/countries-strings/da.json/localize.json @@ -34,7 +34,7 @@ "Austria_Burgenland":"Burgenland", "Austria_Carinthia":"Kärnten", "Austria_Lower Austria_West":"Niederösterreich — Vest", -"Austria_Lower Austria_Wien":"Wien", +"Austria_Lower Austria_Wien":"Wien og Niederösterreich — Øst", "Austria_Salzburg":"Salzburg", "Austria_Styria":"Steiermark", "Austria_Tyrol":"Tyrol", @@ -568,8 +568,8 @@ "Italy_Sardinia":"Sardinien", "Italy_Sicily":"Sicilien", "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Sydtyrol", -"Italy_Tuscany_Grosseto":"Toscana — Grosseto", -"Italy_Tuscany_Massa e Carrara":"Toscana — Massa-Carrara", +"Italy_Tuscany_Grosseto":"Toscana — Sydøst", +"Italy_Tuscany_Massa e Carrara":"Toscana — Nordvest", "Italy_Umbria":"Umbria", "Italy_Veneto":"Veneto", "Italy_Veneto_Belluno":"Belluno", @@ -1376,7 +1376,7 @@ "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel", -"Austria_Lower Austria_Wien Description":"Vienna, Wiener Neustadt", +"Austria_Lower Austria_Wien Description":"Wien, Industrieviertel, Weinviertel", "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau", "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", @@ -1863,8 +1863,8 @@ "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena", "Italy_Sicily Description":"Palermo, Catania, Messina", "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto", -"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto", -"Italy_Tuscany_Massa e Carrara Description":"Lucca, Florence, Prato", +"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena", +"Italy_Tuscany_Massa e Carrara Description":"Firenze, Livorno, Lucca, Pisa, Prato, Pistoia, Carrara, Massa", "Italy_Umbria Description":"Perugia, Terni, Foligno", "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", "Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro", diff --git a/data/countries-strings/es.json/localize.json b/data/countries-strings/es.json/localize.json index cfc735db2..e69b0e25d 100644 --- a/data/countries-strings/es.json/localize.json +++ b/data/countries-strings/es.json/localize.json @@ -12,8 +12,8 @@ "Antarctica":"Antártida", "Antigua and Barbuda":"Antigua y Barbuda", "Argentina":"Argentina", -"Argentina_Buenos Aires_North":"Buenos Aires — Norte", -"Argentina_Buenos Aires_South":"Buenos Aires — Sur", +"Argentina_Buenos Aires_North":"Provincia de Buenos Aires — Norte", +"Argentina_Buenos Aires_South":"Provincia de Buenos Aires — Sur", "Argentina_Cuyo":"Cuyo", "Argentina_Mesopotamia":"Mesopotamia argentina", "Argentina_Northwest":"Noroeste argentino", @@ -34,7 +34,7 @@ "Austria_Burgenland":"Burgenland", "Austria_Carinthia":"Carintia", "Austria_Lower Austria_West":"Baja Austria — Oeste", -"Austria_Lower Austria_Wien":"Viena", +"Austria_Lower Austria_Wien":"Viena y Baja Austria - Este", "Austria_Salzburg":"Salzburgo", "Austria_Styria":"Estiria", "Austria_Tyrol":"Tirol", @@ -58,7 +58,7 @@ "Belgium_Flemish Brabant":"Brabante Flamenco", "Belgium_Hainaut":"Provincia de Henao", "Belgium_Liege":"Provincia de Lieja", -"Belgium_Limburg":"Limburgo", +"Belgium_Limburg":"Provincia de Limburgo", "Belgium_Luxembourg":"Provincia de Luxemburgo", "Belgium_Namur":"Provincia de Namur", "Belgium_Walloon Brabant":"Provincia del Brabante Valón", @@ -159,7 +159,7 @@ "Canada_Ontario_Toronto":"Toronto", "Canada_Prince Edward Island":"Isla del Príncipe Eduardo", "Canada_Quebec":"Quebec", -"Canada_Quebec_Quebec":"Quebec", +"Canada_Quebec_Quebec":"Ciudad de Quebec", "Canada_Quebek_Far North":"Quebec — Norte", "Canada_Quebek_Montreal":"Montreal", "Canada_Quebek_North":"Sept-Îles", @@ -188,7 +188,7 @@ "China_Fujian":"Fujian", "China_Gansu":"Gansu", "China_Guangdong":"Provincia de Cantón", -"China_Guangxi":"Guangxi", +"China_Guangxi":"Región Autónoma Zhuang de Guangxi", "China_Guizhou":"Guizhou", "China_Hebei":"Hebei", "China_Heilongjiang":"Heilongjiang", @@ -200,15 +200,15 @@ "China_Jiangxi":"Jiangxi", "China_Jilin":"Jilin", "China_Liaoning":"Liaoning", -"China_Ningxia Hui":"Ningxia", +"China_Ningxia Hui":"Región Autónoma Hui de Ningxia", "China_Qinghai":"Qinghai", "China_Shaanxi":"Shaanxi", "China_Shandong":"Shandong", "China_Shanghai":"Shanghái", "China_Shanxi":"Shanxi", "China_Sichuan":"Sichuan", -"China_Tibet Autonomous Region":"Tíbet", -"China_Xinjiang":"Sinkiang", +"China_Tibet Autonomous Region":"Región Autónoma del Tíbet", +"China_Xinjiang":"Región Autónoma Uigur de Xinjiang", "China_Yunnan":"Yunnan", "China_Zhejiang":"Zhejiang", "Colombia":"Colombia", @@ -568,8 +568,8 @@ "Italy_Sardinia":"Cerdeña", "Italy_Sicily":"Sicilia", "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Adigio", -"Italy_Tuscany_Grosseto":"Toscana — Grosseto", -"Italy_Tuscany_Massa e Carrara":"Toscana — Massa y Carrara", +"Italy_Tuscany_Grosseto":"Toscana — Sureste", +"Italy_Tuscany_Massa e Carrara":"Toscana — Noroeste", "Italy_Umbria":"Umbría", "Italy_Veneto":"Véneto", "Italy_Veneto_Belluno":"Belluno", @@ -1376,7 +1376,7 @@ "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel", -"Austria_Lower Austria_Wien Description":"Viena", +"Austria_Lower Austria_Wien Description":"Viena, Industrieviertel, Weinviertel", "Austria_Salzburg Description":"Salzburgo", "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", @@ -1863,8 +1863,8 @@ "Italy_Sardinia Description":"Cagliari", "Italy_Sicily Description":"Palermo, Catania, Mesina", "Italy_Trentino-Alto Adige Sudtirol Description":"Bolzano", -"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto", -"Italy_Tuscany_Massa e Carrara Description":"Florencia", +"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena", +"Italy_Tuscany_Massa e Carrara Description":"Florencia, Livorno, Lucca, Pisa, Prato, Pistoia, Carrara, Massa", "Italy_Umbria Description":"Perugia, Terni, Foligno", "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", "Italy_Veneto_Padova Description":"Padua", diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 774dd859c..34089d6bd 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1098,6 +1098,6 @@ "osm_profile_view_notes" = "Zobrazit poznámky"; "osm_profile_view_edit_history" = "Zobrazit historii úprav"; "pref_mapappearance_title" = "Vzhled mapy"; -"pref_maplanguage_title" = "Map Language"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Jazyk mapy"; +"transliteration_title_disabled_summary" = "Neaktivní, pokud se pro mapu vždy používá místní jazyk"; +"pref_maplanguage_local" = "Místní jazyk"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings index 0fb7543b6..129677042 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings @@ -1500,7 +1500,7 @@ "type.natural.wetland.mangrove" = "Mangrovy"; "type.natural.wetland.tidalflat" = "Wattové pobřeží"; "type.leisure.escape_game" = "Úniková hra"; -"type.amenity.luggage_locker" = "Luggage Locker"; -"type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; -"type.post_office.post_partner" = "Post Partner"; +"type.amenity.luggage_locker" = "Úschovná skříňka"; +"type.amenity.ranger_station" = "Správci parku"; +"type.amenity.bicycle_parking.covered" = "Kryté parkování kol"; +"type.post_office.post_partner" = "Poštovní partner"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index 5a1805499..aafc0fa06 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -325,7 +325,7 @@ "volunteer" = "At melde sig som frivillig"; /* "Social media" section header in the About screen */ -"follow_us" = "Følg og kontakt os"; +"follow_us" = "Følg os"; /* Alert text */ "email_error_body" = "Emailklienten er ikke blevet sat op. Venligst konfigurér den eller brug en anden måde til at kontakte os på %@"; @@ -1094,8 +1094,8 @@ "edit_track" = "Rediger spor"; "osm_profile_view_edit_history" = "Se redigeringshistorik"; "osm_profile_view_notes" = "Se bemærkninger"; -"about_proposition_3" = "Transparent and not for profit"; -"pref_mapappearance_title" = "Map Appearance"; -"pref_maplanguage_title" = "Map Language"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"about_proposition_3" = "Gennemsigtig og ikke-kommerciel"; +"pref_mapappearance_title" = "Kortudseende"; +"pref_maplanguage_title" = "Kortsprog"; +"transliteration_title_disabled_summary" = "Deaktiveret, når det lokale sprog altid bruges til kortet"; +"pref_maplanguage_local" = "Lokalt sprog"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict index fb80f7085..0cd88d81f 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict @@ -12,6 +12,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d + zero + Nul bogmærker one %d bogmærke other @@ -44,6 +46,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d + one + %d spor other %d spor diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index b451b163e..50d0ca1f5 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1099,5 +1099,5 @@ "osm_profile_view_edit_history" = "Afficher l'historique des modifications"; "pref_mapappearance_title" = "Apparence de la carte"; "pref_maplanguage_title" = "Langue de la carte"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; +"transliteration_title_disabled_summary" = "Désactivé lorsque la langue locale est toujours utilisée pour la carte"; "pref_maplanguage_local" = "Langue locale"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings index 3bb9d6932..5ada1f1ff 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings @@ -1501,6 +1501,6 @@ "type.natural.wetland.saltmarsh" = "Marais salant"; "type.leisure.escape_game" = "Escape Room"; "type.amenity.luggage_locker" = "Casier à bagages"; -"type.post_office.post_partner" = "Post Partner"; -"type.amenity.ranger_station" = "Ranger Station"; +"type.post_office.post_partner" = "Partenaire de publication"; +"type.amenity.ranger_station" = "Poste de garde forestier"; "type.amenity.bicycle_parking.covered" = "Parking vélo couvert"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 03f4a1841..31532584a 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1096,6 +1096,6 @@ "osm_profile_view_edit_history" = "Ver histórico de edições"; "about_proposition_3" = "Transparente e sem fins lucrativos"; "pref_mapappearance_title" = "Aparência do Mapa"; -"pref_maplanguage_title" = "Map Language"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Idioma do Mapa"; +"transliteration_title_disabled_summary" = "Desativado ao usar sempre o idioma local do mapa"; +"pref_maplanguage_local" = "Idioma Local"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings index b62513068..e1294cf5b 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings @@ -1500,7 +1500,7 @@ "type.natural.wetland.saltmarsh.tidal" = "Marisma"; "type.natural.wetland.reedbed" = "Caniçal"; "type.leisure.escape_game" = "Escape Room"; -"type.amenity.luggage_locker" = "Luggage Locker"; +"type.amenity.luggage_locker" = "Depósito de Bagagem"; "type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.bicycle_parking.covered" = "Estacionamento de Bicicletas Coberto"; "type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/metadata/da/subtitle.txt b/iphone/metadata/da/subtitle.txt index 0646f01c5..85c640220 100644 --- a/iphone/metadata/da/subtitle.txt +++ b/iphone/metadata/da/subtitle.txt @@ -1 +1 @@ -Naviger med privatlivsbeskyttelse +Naviger med privatliv From dd949925f6ce7af9f1db32a960f430c65c3c1e79 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Fri, 25 Jul 2025 16:07:27 +0200 Subject: [PATCH 082/222] [core] Respect system language order Signed-off-by: Yannik Bloscheck --- indexer/feature_utils.cpp | 9 +++++++++ platform/preferred_languages.cpp | 16 ++++++++++++++++ platform/preferred_languages.hpp | 1 + 3 files changed, 26 insertions(+) diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index 5f60707db..d3b449071 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -6,6 +6,7 @@ #include "indexer/ftypes_matcher.hpp" #include "indexer/scales.hpp" +#include "platform/preferred_languages.hpp" #include "platform/localization.hpp" #include "platform/distance.hpp" @@ -124,6 +125,14 @@ bool IsNativeLang(feature::RegionData const & regionData, int8_t deviceLang) vector MakeLanguagesPriorityList(int8_t deviceLang, bool preferDefault) { vector langPriority = {deviceLang}; + for (auto const & lang : languages::GetPreferredLangIndexes()) + { + if (find(langPriority.begin(), langPriority.end(), lang) == langPriority.end()) + { + langPriority.push_back(lang); + } + } + if (preferDefault) langPriority.push_back(StrUtf8::kDefaultCode); diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index aa96c92e1..8a188759f 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -188,6 +188,22 @@ std::string GetCurrentMapLanguage() return languageCode; } +std::vector GetPreferredLangIndexes() +{ + std::vector langs = {}; + for (auto const & systemLanguage : GetSystemPreferred()) + { + auto normalizedLang = Normalize(systemLanguage); + int8_t lang = StringUtf8Multilang::GetLangIndex(normalizedLang); + if (lang != StringUtf8Multilang::kUnsupportedLanguageCode + && find(langs.begin(), langs.end(), lang) == langs.end()) + { + langs.push_back(lang); + } + } + return langs; +} + std::string GetTwine(std::string const & lang) { // Special cases for different Chinese variations. diff --git a/platform/preferred_languages.hpp b/platform/preferred_languages.hpp index 4a2c2d780..1ec78582e 100644 --- a/platform/preferred_languages.hpp +++ b/platform/preferred_languages.hpp @@ -25,6 +25,7 @@ std::string GetCurrentMapTwine(); std::string Normalize(std::string_view lang); std::string GetCurrentNorm(); std::string GetCurrentMapLanguage(); +std::vector GetPreferredLangIndexes(); buffer_vector const & GetSystemPreferred(); } // namespace languages From b0bdd2c6653096694bb337fad85452c9a42ea708 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Fri, 25 Jul 2025 16:07:27 +0200 Subject: [PATCH 083/222] [core] Respect system language order Signed-off-by: Yannik Bloscheck From 5e8a8de646071da2fab3af4545a7ff5562a9da72 Mon Sep 17 00:00:00 2001 From: x7z4w Date: Fri, 25 Jul 2025 09:15:25 +0000 Subject: [PATCH 084/222] [docs] Allow pseudonyms Signed-off-by: x7z4w --- docs/CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index ea23dff41..dbedccc8d 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -102,5 +102,4 @@ Git has a flag that can sign a commit for you. An example using it is: git commit -s -m 'An example commit message' -Use your real name or on some rare cases a company email address, but we -disallow pseudonyms or anonymous contributions. +You can sign-off using your pseudonym or real name. From 979c7134364f4232364f812ef9a3830543891b47 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sun, 27 Jul 2025 14:03:12 +0200 Subject: [PATCH 085/222] [android] Fix logo missing in about layout Signed-off-by: Jean-Baptiste Charron --- android/app/src/main/res/layout-land/about.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml index 800467eff..04051ab15 100644 --- a/android/app/src/main/res/layout-land/about.xml +++ b/android/app/src/main/res/layout-land/about.xml @@ -53,18 +53,18 @@ app:layout_constraintTop_toTopOf="@id/version" /> - + app:tint="?attr/colorLogo" /> Date: Sat, 5 Jul 2025 09:56:22 +0200 Subject: [PATCH 086/222] [android] Use SVG assets for download status icons Signed-off-by: Jean-Baptiste Charron --- .../res/drawable-hdpi/ic_downloader_done.webp | Bin 408 -> 0 bytes .../ic_downloader_done_night.webp | Bin 444 -> 0 bytes .../drawable-hdpi/ic_downloader_download.webp | Bin 638 -> 0 bytes .../ic_downloader_download_night.webp | Bin 628 -> 0 bytes .../drawable-hdpi/ic_downloader_folder.webp | Bin 506 -> 0 bytes .../ic_downloader_folder_done.webp | Bin 350 -> 0 bytes .../ic_downloader_folder_done_night.webp | Bin 386 -> 0 bytes .../ic_downloader_folder_night.webp | Bin 488 -> 0 bytes .../drawable-hdpi/ic_downloader_retry.webp | Bin 472 -> 0 bytes .../res/drawable-mdpi/ic_downloader_done.webp | Bin 276 -> 0 bytes .../ic_downloader_done_night.webp | Bin 324 -> 0 bytes .../drawable-mdpi/ic_downloader_download.webp | Bin 424 -> 0 bytes .../ic_downloader_download_night.webp | Bin 424 -> 0 bytes .../drawable-mdpi/ic_downloader_folder.webp | Bin 356 -> 0 bytes .../ic_downloader_folder_done.webp | Bin 242 -> 0 bytes .../ic_downloader_folder_done_night.webp | Bin 264 -> 0 bytes .../ic_downloader_folder_night.webp | Bin 344 -> 0 bytes .../drawable-mdpi/ic_downloader_retry.webp | Bin 304 -> 0 bytes .../drawable-xhdpi/ic_downloader_done.webp | Bin 566 -> 0 bytes .../ic_downloader_done_night.webp | Bin 606 -> 0 bytes .../ic_downloader_download.webp | Bin 850 -> 0 bytes .../ic_downloader_download_night.webp | Bin 842 -> 0 bytes .../drawable-xhdpi/ic_downloader_folder.webp | Bin 678 -> 0 bytes .../ic_downloader_folder_done.webp | Bin 484 -> 0 bytes .../ic_downloader_folder_done_night.webp | Bin 530 -> 0 bytes .../ic_downloader_folder_night.webp | Bin 662 -> 0 bytes .../drawable-xhdpi/ic_downloader_retry.webp | Bin 630 -> 0 bytes .../drawable-xxhdpi/ic_downloader_done.webp | Bin 820 -> 0 bytes .../ic_downloader_done_night.webp | Bin 872 -> 0 bytes .../ic_downloader_download.webp | Bin 1212 -> 0 bytes .../ic_downloader_download_night.webp | Bin 1198 -> 0 bytes .../drawable-xxhdpi/ic_downloader_folder.webp | Bin 1014 -> 0 bytes .../ic_downloader_folder_done.webp | Bin 770 -> 0 bytes .../ic_downloader_folder_done_night.webp | Bin 824 -> 0 bytes .../ic_downloader_folder_night.webp | Bin 994 -> 0 bytes .../drawable-xxhdpi/ic_downloader_retry.webp | Bin 860 -> 0 bytes .../drawable-xxxhdpi/ic_downloader_done.webp | Bin 1124 -> 0 bytes .../ic_downloader_done_night.webp | Bin 1190 -> 0 bytes .../ic_downloader_download.webp | Bin 1648 -> 0 bytes .../ic_downloader_download_night.webp | Bin 1620 -> 0 bytes .../ic_downloader_folder.webp | Bin 1424 -> 0 bytes .../ic_downloader_folder_done.webp | Bin 984 -> 0 bytes .../ic_downloader_folder_done_night.webp | Bin 1120 -> 0 bytes .../ic_downloader_folder_night.webp | Bin 1374 -> 0 bytes .../drawable-xxxhdpi/ic_downloader_retry.webp | Bin 1170 -> 0 bytes .../src/main/res/drawable/downloader_done.xml | 27 ++++++++++++++++++ .../res/drawable/downloader_done_night.xml | 27 ++++++++++++++++++ .../main/res/drawable/downloader_download.xml | 27 ++++++++++++++++++ .../drawable/downloader_download_night.xml | 27 ++++++++++++++++++ .../main/res/drawable/downloader_failed.xml | 10 ++++++- .../main/res/drawable/downloader_folder.xml | 27 ++++++++++++++++++ .../res/drawable/downloader_folder_done.xml | 27 ++++++++++++++++++ .../drawable/downloader_folder_done_night.xml | 27 ++++++++++++++++++ .../res/drawable/downloader_folder_night.xml | 27 ++++++++++++++++++ .../main/res/drawable/downloader_update.xml | 12 ++++++-- .../main/res/drawable/ic_downloader_retry.xml | 9 ++++++ .../res/drawable/ic_downloader_update.xml | 4 +-- .../app/src/main/res/drawable/ic_folder.xml | 9 ++++++ .../src/main/res/layout/downloader_status.xml | 2 +- android/app/src/main/res/values/colors.xml | 7 +++++ android/app/src/main/res/values/themes.xml | 16 +++++------ 61 files changed, 271 insertions(+), 14 deletions(-) delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_done.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_done_night.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_download.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_download_night.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_folder.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done_night.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_folder_night.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_downloader_retry.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_done.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_done_night.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_download.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_download_night.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_folder.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done_night.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_folder_night.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_downloader_retry.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_done.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_download.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_download_night.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_folder.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_night.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_downloader_retry.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_done.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_download.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_download_night.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_night.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_downloader_retry.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download_night.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done_night.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_night.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_downloader_retry.webp create mode 100644 android/app/src/main/res/drawable/downloader_done.xml create mode 100644 android/app/src/main/res/drawable/downloader_done_night.xml create mode 100644 android/app/src/main/res/drawable/downloader_download.xml create mode 100644 android/app/src/main/res/drawable/downloader_download_night.xml create mode 100644 android/app/src/main/res/drawable/downloader_folder.xml create mode 100644 android/app/src/main/res/drawable/downloader_folder_done.xml create mode 100644 android/app/src/main/res/drawable/downloader_folder_done_night.xml create mode 100644 android/app/src/main/res/drawable/downloader_folder_night.xml create mode 100644 android/app/src/main/res/drawable/ic_downloader_retry.xml create mode 100644 android/app/src/main/res/drawable/ic_folder.xml diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_done.webp deleted file mode 100644 index ee1b878cf1774ff5487502bfca044bfb566b6ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmV;J0cZYFNk&GH0RRA3MM6+kP&iD30RR9mJHQSQR}m46+ct8XTY7W2*F~YKDnbUe zwfxC*znZnB5xoHf*|yU*Uy||LFIa8^H}#)=uLLbLO~g0~{FKrWG`0W4OSD2~MPI8{x!w-3r`@ zL@jJs->*=mHCy`eFQ3<_!4zP^(|^wS8C8PKLsghxP^GbW`xbs~P^B|?=@)+OQKvUp zQXzQK_Ech0zxFEOrGoYA@xe&Z;7~k&HcA%x%|#f9NwT3sF2Z6BmOPW&a}jR_TkAW> z!(c~U14Zcf+62hrz3^N6JO$}DXZLaO=MFkp{;j)&TC|F9?Czu%(fix({7>=ympT7K zegECgIfHMmLcTc?`Q~QMIiYVZO1?QTk!$Wv>S(S>qHq)>Z|MHC=&OEeQa( C%*87J diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_done_night.webp deleted file mode 100644 index 1689fec817415afbead668f4f82994b995abd77b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ym;$Nk&Gr0RRA3MM6+kP&iDd0RR9mJHQSQk3o=aQ-A4arbe28VT?-@H*#I+w-s5<5aeySH+R|4)@%acTI`UBA z`ZvaSgCt((HCP#Mk))^~XXE=Zl2i&W{lI(c&*ilu09}0UdJb3ZC@>BXe zdG0so^lkR*95Ooow{8xxC)+2&@( mIiYPXO13#Lk!kKtWSjGoZLL9MTH_FrX>B!QTGK74)sg_j7S2Qf diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_download.webp deleted file mode 100644 index 39f6e9902530af04ed27daec67ae467868fb2430..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmV-^0)hQfNk&F?0ssJ4MM6+kP&iC!0ssInJHQSQ7s8-zBuBaXhT{1{ygs49pphg+ zeIVidD}-l;M%%V+Xms!Y*G8@**;b;)AxMHH0KPl~TX)|8w7(`VNFJ1ZWNjI9#u%m5 z z6&}2O?o9#vMD*X0+eVILjTd#AomA-y3CXJ4X_iZif)-wGcDk!19FumnfD8&%pM;5e z^*Jc!-m^!88VuC>wrJdd5g!}8EW%9DX}4wwfVa44-9#XoYr@kCf>H78n6lwmXQ_#x zG&9^nV0NEuISVb{^{3+^f>RuCtAPmkmiu72J;>?c1}y!w__X_H=>ROXl!u_nr2vg@ zRF5T3q{%#%=95Hi@K_~JR0WS&)nruwk68up!hl)wjtto4RMP)?zDto-`Wl{pGuPKF zGuLvNqj2W>$|Vszae8E~ue4yUC4b8JG|yb$f;-pOQMUaP3oT z2AaakRCBI3x&lwtR_iu7aheB@+iI*nj}AY*~_IOoObe3H8(e4|=yE&kS*A6~&#A6n8d@JQK#9MHP1jmZHwyQrwwead!<# Y{fIk`Bn|o9YM2CJ6mh4Mq+q)w0Ct}{VE_OC diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_download_night.webp deleted file mode 100644 index 29aae450ee0250f2ed1f55374bd8f08411d1b822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n1pNk&F&0ssJ4MM6+kP&iCr0ssInJHQSQ2g0arBuVMz4|TtD&s1nAY}>Zs z|M#YQm~q=ij&!O2_mw(fEw_;*DN-IYpL#m{zyF3Ye*oq$QQzMgedLbuWX`ul#{OkIHe_??Gs6Z$}@B(M!l&^ck$RIC__C5^O90qd?quv_9 z-s|4*Ypvy%QN9f381F@^W;Dl`W9+rg38TC)$d>|wY};v@FqfH`nHl!KtVXfkm%4!e z^dkE2$ZZ=*vfxIYW;{!l`a%t)KAN6gSlQZit}K*k)obbKOf7G2MDXRQlIGN%U)z8v z-nE~GOEOS;wo`L%!^m9I;Qs1{89MBlbtRw>J2hsNh|&PuUQ{yJj-L}+Vu@*1NhuM} zC^4+Gucub2dei3WMsnDk)Z9h}<|f>ObKQOa7Tyb`7YZ-CKbJzGECn72<~Kkv9BV$8 zoMdM$m)1Ju6duYfO_9rZCcBnd-^4T79%5WA3k#9r&@Gj1J2@ixJ~)kR#F!n7rf=a`>`!4+ZbzE_)j zV7Qe9ft>tQnWqAAd?4IZ$%QhD*TVM8q+hq;Xl|&%gOAW3hj_A)rS{K4o#VMSY3ex- zV?P>VE!%qCxF%eNSW~thtK-kFV?(IYvGsQ8;!*~@MzX6I_usz=$WZHIv+U~^#1&zQ z0Yg=j?9uxNvzwWBhP=B9^X^E@yPIX+3G?ov%)0}VS$A(T@6OM>cMX!gjCUN89N>2= O){@Z5c&8)DWOqq$`aGln diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder.webp deleted file mode 100644 index 02465212b61a292ad09040cf3718da53b8ff205c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmV)|Bq?+J5gvlKziKx$7($XH zDLa;7)tBSI&S0Nr+cuITp1%4HOpt4_?gg z#)sZ`Ydgyo)h)7Lk@&mBSBS(HpHr_WqD_lRe#@2_LdZc-w+QGV28qa|T*wYvhK4|` zX8-G$XMw{2K+}f0yE~bs|Gzk)fgKRhe+O>cMv~M3bMDTWNxlFVJ?mc2_f4toKI^_d zfzMaFC?r%%`{J3Z#vL!YkCpjUzM_F^X*QJ&Xy}j`L~}!9Z_VZC4rK7?u1&=nnbh%x zNG4=+O6Y0RphirgkyTAZhs^%|vF70B`1PmR4cWbA-wY_=@D(MBSbnmii0elbC}ig97MWmR}vMjE#zW`d|NPLTNv;YfnAg*Pg7d(kWT;QbAsbhj=1;in$ zvqnxl>KN;u6^lB?UQ429N#?sG_l-IZo0UyTqGXYsxl3}NC7H=*(qcvTlJvDC^{M1g zCoFO-bguJ^rpUa}(m6IT3MyaiFFLnBgX@!Yo*V%HDipGk|CT|HB9?#f?FQkRLAF)_ w*%}FCYct`RP_`BY*%}x?wDty&t@%N=*8qT0u*Z2@T<@(4U@;Z!>E5#SlH!c_r~m)} diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done.webp deleted file mode 100644 index fd57e66d459fc20fd4ea727c761cb243efc08f84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0ipgg1IsaMS6HhZS{M#-yrFYZ^eJZiP%q)UhN>RoB%})OqP*b zhMZ&#n*X-G+v{^&KPGJeNc*2h_hXI{uo&Kb$79X{h~Z~2eqMKjAgQ0@co{UYtFMKN ztHV-iq$-hQkF+<-;i_pQyR#Ol?U8ngBsEekkqSrR6e&UC2(TEwb3TRzAj50U%Rm6O zzWeJt?)$p;Z2*w_Jm)`148bYK;4`cdR$Nl^*XRoDkI`Ga74%nM6~-iM+o** wz0`!E#Ye$tZu1&rJgu`+S!kC`7QCo&fTEr#`!EfSHWpAo&ms&VsFn+|QKL7v# diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done_night.webp deleted file mode 100644 index d322ff2c2b711fb5f227a1e306276d0e5a215fe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmV-|0e${bNk&F`0RRA3MM6+kP&iC(0RR9mJHQSQ=b#{M11A1W@2Hsn`B&7o4IJzF zET3_h+O};Nx0K0u0GZ&3fanv1K=>v0$M3?e0|tVCSle#f25Rg@NO9%wG3Kz;KF% zAudM}LrlmmA2&jt_<6kA*}qQW7876lzr9wqHOW86XH#5OzV)Yd_EwTVXQO?-Q3 z?IFF!(Wvs4UZZiUH0d=ukHlvrxgaT3dL2!b%19Us_Mjjs8A_ZBsgBt>%v_>b{Miim&MHj<>MkM9}X_c{N-m_LB(A?tm;a>cju8%?a$ z4kZM*p*+IG9)iThpAvSEK#hOmg@4ds0TIX`;ez@9zbd&i=wwfxos<-OZ&3gUvTdhr zzL}Z*6$b5pi%BY3|8)To{deTHjU-8Bpl6>`+W7(<)GO3x;iAEN4jO^F0 zu^rz=%c8cHG%T$7%d%aX-Snfu%HpoUUpfZZ{YlCY(_bcrIQ=ANkolLMjh^pM{nx7_ zJrTv05p(p;1^Zw@vJ6Ou7D-zpsY@iKr*J5bW*oD9*1g>FWV4lh#@?M` zn^#+GpY4~s!{y61Cwn5Igh3|wdl?lBF{OWS?*?}UY*!&{M5CW3Zv eB5da;?5;sXDR9U6njhb-auP8F?sQ+pc1Zx}p7D49 diff --git a/android/app/src/main/res/drawable-hdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_retry.webp deleted file mode 100644 index 199017a3f6826269a9f7d427df80455cbbc9c73e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn=aNk&G{0RRA3MM6+kP&iD)0RR9mJHQSQM`9ptoA@_<`k9#j`B&Sv4V#M7 z>lTG=+crt}oBTJ+}&qAZegWy|7AmDv4X)*vl zaJne~11#IN(>4l~8)k+wGc&&VPsxHv`70hp^q+y-wvA-?u6y_H59$k6-HkalJ3YwZ zf|{A$gyTguE4>SxEUDm1SJn^CpAtA*2^`9GZN{x*Wd}{Uj zA-!j$obIe^S?z#E55KGz6(pIhkgjV!&MP!t8zG(3THDX+qqumkp=)(}Yu=x(7BZe!^&3~{CaRFib#HB<*v$ns O82`}7!FnaFzBL5{bk&Fe diff --git a/android/app/src/main/res/drawable-mdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_done.webp deleted file mode 100644 index 659ab85b36b17d60ca6dbfe3551eb64de0625eb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmV+v0qg!!Nk&Et0RRA3MM6+kP&iEg0000lC%_319}y91+ct88FJG=cbRP?Ffj|I; z@qLVW8@Z>t;ING(MVj4X>Vs#7%|FS9xt@t2qW_HCwsACyX8WE}{va!4Mcwv5-_}JY zJhAGa(p8Z=3nd83K$s7p7;=xh)XmVqKobn|QNl?1|2LTV{aG07YY5~$hVQKi7otez zvnr7eH1i0BPBPxZ`?Y~WR?r?(N?RxtwZ*%7S+^D!XtcePa1+pzWp~*d)DO>;PORwl zSI+4Zq-gaYP1nyeQq%=jf)>SEzRb6j9+b$WTaCwtvLo_&=0xRLAAa@bSigS#z_GtL a_A9^sCw~1@#H~Mz`1N}c!~CGI%p(9vqKAzD diff --git a/android/app/src/main/res/drawable-mdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_done_night.webp deleted file mode 100644 index 5d94f9fce7aa6b5b2cb3b7d1caf9bc682bb6f5e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWTENk&FI0RRA3MM6+kP&iC40RR9mC%_31FJT~UoA@`q?Kd(1^RKpzBsF%7 zA$7qn^xOf+2n2$lkRdQ=19t)PIeZuzyc`M-1KAA-5{O0sVk1e4q+T4Z!)J!^ z-^YdCnzkUK|B4(*iD<@MPk?`r1IF2hR7whd9))Lc5h~FQ+^Ba2hZNTnnldQzbTsN5 zXk4cs^Ju_pr@Dh;uKK(K8$ZKPnigJu6P!~XY2lA{$w^q+y-MvCfV#@RoRpl|XlF(%3KrYCz{m4cO4 zo!!(>8i-6eSoCcSD{(7LIb{S(QR%S#SYU%<YQ~-Y*em~7Hv(mJlGIpvv{yu zc5&Sc1dBzT{94@!B&H*(p%GL>sZLVrp%e6tR+?NZc?QmN@3Qt!aIyrP_kqvh4NfAw zwVTiN{tYbi0q>j37kHlpg44P`L6Bq+Ja)@|_kbXi5A^TNz4r%6Zt;GvbFL6I7T?S3 z=(@)jM7_=TcMpR*L@7}P+3yczmGFO@UBMY^rX!+KBcx*K&(yM=@S5Jx5 S>NAmEy`OZoMf+iIOM3)`l+-H# diff --git a/android/app/src/main/res/drawable-mdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_download_night.webp deleted file mode 100644 index 9940e45721fac03ac89cc3f61c755ee1cf008660..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmV;Z0ayM~Nk&GX0RRA3MM6+kP&iDK0RR9mC%_31XTd0vBtYrd&+SmNs1K9;J;&Q0DT#cF#uzLl6PLg75))7u@_%pLX6^F zsKK`wN32L)ldF>ZNM*F%$jIQm&v&1DKleHeu6Y<8eIwZ0vejiRReqggd-nCc@4L@? zKcoMB`2~ly?WT>w%s*vj@csh^Bu5iO^q+y-MvCfV#@RoRpsBJX^8F~us)p=!c??#Z zcXm^4;X~vXtwmpluoBkNlv8-Hz(U3RXx`Fz(}T4k77JUu zWp`ulkc^8u`L&t>Bz{L!LL)I^dL z&H9&u83bT}l;~&FwrwNPb@t!%s@H5I+g5VE8}#1Xy=K=G_V*Fi`22`tcyIxFtM0s7W2X4Xj!yY z{#A}MD_=%n6XnwpR{m|w`ry?Yv3_~|fY@J%{fgKB!0V>~tv>_2eh=WgN9TuSXdVGQ ChqmSxn^q-O2HjbpsY~NGLALK_Da_vB`IXKa4Q^Th%S>2h5P#BG3 z`2{K$&$z3)X$mGR=4WvtV$%5j8>W5!%q;UP=Ih?1_bm&GRwUu&dX9&?iX`%pOUD=! z(Zu2HHU2#}ymbL@hsG0cL!M*cZLTb8XVJj|3yXz!!Fz@Gqrf6K7VazmPQ}?*zO>JL s-W2hbe~DQiym}+nFRvdE`wOvO@%o?e`l$%5Ka24Cy$EA|d^t0Z0A z8~`8`flwF%5CC`phYtW2fMFzCO+GoBrT<=)&*xPT(SJp58!62!!)f3TG{O3qN^2!W zZ%K{`d1J}J$YwgUZAuGT&|KX_R5zQcu!#wZzZSOzB6myiO=4 diff --git a/android/app/src/main/res/drawable-mdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_folder_night.webp deleted file mode 100644 index 6adc47ec89c8dd5783546400002ffbc1f1396e74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK^_Nk&Fc0RRA3MM6+kP&iCP0RR9mC%_31-=MZ_8%f6PKiu`#e*N{<8iv_O zsz2Ka-1iVpV3f9zNRkxwGWa*P0_Y3J%ohM=f}$UZ1|X74xAz6nV3p9< zr+rQdU1tgPIX)6P_honq?OPVDW8pLlZCDuI1@9H!k7gG0%3_V>-;;3`%a;ZiB=F3L qSpE&n`ry?Yv3_~|fY@J%{fgKB!0V>~tv>_2eh*-uIP>FY$vgt~N~`$* diff --git a/android/app/src/main/res/drawable-mdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_retry.webp deleted file mode 100644 index 60f238615d5e23b844ebaabd00841e1cb222f4c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmV-00nh$YNk&E}0RRA3MM6+kP&iB+0RR9mC%_31pJ5-RMk zl!8&yg#>kip!ngYm{e^KArJtNVB2=uR!>fCNd`%`AIqPy==qN>;7Iqq0Yvnlf!juk zF4H~cTk8ElTIq%m=adUja++fpI#I;=m{38A-iZdT9}B7}WAErwA)}EToT(}HgwG(6 zJ!fh+fylHY$QMv4%?n)wo!EBBZh-50l99nOHd@$?BEut zvbgg@gfj80Jk;@Lv@1}joH@V*15CD-0oYvRGE9&+4j5pBU~CLzXKV}vV`H3*dKjWV z3?mFN9_BT&1m6zm2qd@!ey6*W_c}-D-UVNWu{Zn~SNji`@ z)%vscvbq6WHuUtN_PPdgrrgl;P4$HZ?v@N8&LBb&X6Bw8ArT89l8}kHoFphpfvfL7 zt~V}%sD{zq{=(nBo?HY~^_%=Xy6)rBhPpP_AL#$O5!^jeeLniNZUpyebA3L4|L-)& zCyEW_(8tqwqY9y+oZJYmFtn88`%nX9joly=zFJ&5%7+KJ}cu~ysJ_WA(^`ziMNQDU#3XRse?ub(XT`tb&R z275k;*z;+`o{uE%DPqrO6*1=ni`et2Ma=o=B4W+wKZ5fgLIH*U EBs*#x6#xJL diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_done_night.webp deleted file mode 100644 index 673e3881511986e20a2b2306ba41ed9f8fb3fe62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 606 zcmV-k0-^mi%Bi2gHh+qO{^-@e}N@clqyDe9&jd^iE8;D@%U3rR@s zS`P)jb-APoWIUcAJc@sb&G`y@`0Eyr@Q)Le#eMyj;KxK+vn6;qO zW>G3eBw#EeRC*-A>$A8DNJO~OPA3x(bd!ZgLcC^&Y(!GVY(KR~OuH+G> z>rQ)KHM`7M>-P)wi8bUc2|_!72}2mDdr}0?EF(EWIDrO9FeCy`?>{_moCHx3qgUq> z|G!Z*BnZL0ud48GWBOg1d*;e@CC@b&zu#^xygIw{?&Y)JBv;_v`pa6`F{0 zawE7x9aWAmf-Mwr^~@s3^0D>c!_TGuyaJ0hx}JVq#Gf~y;iB6Si(qQX zllXzWPxg)mS!)zzjM+!t3!;qiK@?=pQPvz2Wi8Pl`v5stkoSp#DCRCXZyq^eQ4s!X zXrky1?}7F*1$rk1#3ay8{KY>}g)@Uf3WzD8Iw=qpNMIt65k(+GZDRg}H&IHE0{>1h zx1?i~bLds)pYK8^`g%VF1lhLJHq6Y-3}G%aC}l|Zzm~+Y{=cdz_fbV0ZZIO@erv7yfQcqTKj+otuO?k9FQ8PKa^#nTdl;dtK52(AEXx z1cf$kh&#shk**K|*QMz^qN-6!i$fR|$16wtFCPWEB2daBT2&I~(-YC+&U=c{(>6y=*=exV#iy+ElADT)Q)TOpjP(1BYjpec`3T_K#R>ZzhpKvncrqkyg| zr}l~7XNS71!R#BYIlZPe+g&1d?9*P~(VC+{i3bkt(?ZgPuSm2k2>ba&0n_%Ll4N~) zm1H`weh~YTtX?E;cH5a7qNuN;6LP^$^AzzU98y0fY&=d`Qh!God;Rh5+ocR#Q^;Dp zRw?A_lu~Bm3`#kxh=ZMswl|N(F)IrFU+dDUm0tKac1Q(i`GYY&kl;%1781D*WGzwg3&BMsO{$~4DAg47? zB)PUq4emQ7^Vs#_E)m1D%L>svTj*dphmX#)QFcY;i0#%XiJW*u<=#39?yd72T!*^1 zPKJBycn9kY?$tryUY!Q+)sf&{oeS>O;ox4K5OA)J3Ak5h1)Qq`18CHA>eODdJnvi` c9e{InegJT6A0kSsSUtUt?vsR5D(sU00QC2yv;Y7A diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_download_night.webp deleted file mode 100644 index 108ccb684ab3a882493405e20fab3715f91b9087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmV-Q1GW58Nk&FO0{{S5MM6+kP&iCB0{{RoPrwrpcfz1;Bu81`Px^ZO=vXLh+qU8T zy?0MDXe3EW@j1jL#;|aAFyl71ZKYbcOT-XTBK1)TDML!ecU7CV0W;buhXB(6Pl7kV z7bc33@VH8Czh9~&W6=J#1RbD2gRs3qf?&NY@PZRt6ok;g20yr>e~6*i_Jtj;Xb`p= z9B_v}{N-yhn=+gmkNy{?*8UmR`n;zxmPfr$gw_T_t%G5o-&&tqCsSiAhB=peFWu4~L@3o^ ze|>3YYHUQCnps-!537+!%B{`WNy%k$)>`Gr2ZiS9gg7%{&4Tt(sWUAg)+uQomAmtz zfOYjg-I@|5tfh1GzaolQO~LJPQN`NmQE@}m*)YhJMe%@D0N3Zl3v=e|#)5dl8m`CQ zOq$zaWllUY=kh`k`mJO_X)okfvx6HxaRCiUO+Qa3Biks=wx*Xy@VM&zX;h zZTGZm%kGIz{~%7>(=N}rC))c&{JHO*b_VIfZx9&}c5007Y(2T#wt%o>BLO&Ye(>WE z$vT3>b5~tJQAc9}ap&fHEUAG*>duRcUv{vhHbab~uY7+WgF$DO1>`DU*J#eAH9>jI zv%xXf`*5(`w`|)U9J8;`PoDl{`S%P@In?OKZ?j~0#>uL}IFs4lpSSRgvnu0YMtlD_ zRETIwL|JK`lW6a+JEFj<);x?n`ik4P0!^)XBFU?3m2g%- z=CPOWe-N&7_zpDB22IB~e0rYEZYb)e?6^+xaWYj-E4+0S!&~PCxDE|(oy_po@d4Hu z!mEQYygCiTt0OVIIv2yM!!f)%AsJj9lMJuUN(NU4CRy(3)Tw)#<@w<1=p=)y^OIy~ U`w%Ir!@=5edY@!@ZJ@AE0vRx>g8%>k diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder.webp deleted file mode 100644 index f6ef4929ed810e4e40e7a42f1c29d3fa97088ded..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$Kf1Nk&GV0ssJ4MM6+kP&iDH0ssInPrwrpzrnVVBt^YoUjFgjv;QW|q`@eX zq)5dL{$(Hq7f9HB-Q~D#BT1rvlYg@JuGmJlt>k?FxaZb1wNMb*PjLx=O@Pk^!UFM} zVW9_lajg%3xc8qqkC?+dF5=+q^iP(A{CcS&cEkTblUaoBkRZ%JqwyPmP=aegWDxDl2Jk<$7XnkEwDV zi-TjPNMSE7?hEQ1=i=o2sJ-o$5azm@=e;<(*SsM&7FWl7O;4Qdy-Y>it-MHSCGN8L zoIwDPPg4~Lt51^M353i((heXt9+F=Oh>QF^b%Bw0i8X(Dm*4N?ssCc-EWS}zEYIaD z3BhOZMqjZwe@XBf{o5yN%7vfAZLG7(bLbj3?Zo!6_OX zp)u^B(QTs9)csB-p76B6V#8>H1tT7?IFMB=s>(Xz+bWv>!F5(y=lois`Je7<>#*ym zO;mLR)pg?a*WgKAoimH!>R8k|n+*Z6@esgy3f?@5c=J5Kc_`jInRxSfz&-) z8shblh}Y*LULTHleL@nhk4fV7SxLA)Fv)D&rcX`N_B>i2og`eJpCo;+L!|IjYjsAC M*GWRBWpJGY0Qk08K>z>% diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done.webp deleted file mode 100644 index bc3e760a54d3dc15a69d6cbbfaac7044dbd6e96f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmV^T#LNEg+)*4&1hlB&nHuX7Al3`vYt> z&bh2rnrf4}mOMu|8d9lhu$C0yVVIVtX4^7_;Y(R`qml!`lHWoS9i*f&OS^*(^spNc zsp(ML=8d7~aLcw!#-loTj2mKC)x~PR#9q`%*;|)I-4xqmtmM{IJQD@7) zk<{JvPwbky+y1%0K?yu?ZTs@iO+l1G`Qw6FNz7z(RS9Hs)oh=iZ;$?`7air#*<`ps zr&sUYXH4HLhP!j^-D@o0>z0q?y}OMTjGv)*AK~M6HjM-nFM5BOMggkj-h2kpZk-Yg-3E{|o+ zv-#=(!a9YojsjnuM_7mQ)yd$i;|co=e0>n`^=ZJ@M*?4;3w(Vz@bw7+x;`er*JlOj a`oI8RpBkX+qXVGp^Z$_Ge+Y{n|C0cVu<@q= diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done_night.webp deleted file mode 100644 index b0b2fd9cbf727ebbee897c43399c3841adcadd8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmV+t0`2`$Nk&Er0ssJ4MM6+kP&iEe0RR9mPrwrp7oi|+11A1W@2Hsn`B&3MlAFB^ z)upc<~OJ@fTfR78{?Uj9j1OPy=ZM#WzDMCyTqjQ+;lK(v6<>RcG2LT0x2RP8~!mDWT3>f6$5^`U(+Nt?IgYWs|hJY1=isqdIu( zHbkG*#cV&tPSi=+S?5LF6x(c<)zNG@pgF3m$L2jrolS2esJr1!^sBnNzB$1`2|RGE zQ`MKNT2Tt6eI_c2@hKWn5~X=$uQcu-rubU(A@EBRU6#@ZUcLw}`)Umq9K2te|plwZ?GK=z}2SRQdkr;dD^9&$H&QcMqd zjBLcjMw;1}ZU4^yo@8M|7B&`TL+LP1iYJS(A(@RlvoR+&Qe-2JY>XWn9WoagNL(Z! za1o4o#CNUuGCbh5HRd@VwXpn8Pu4u_@>^xjmPZU5^27=ozdtN-YUuJ<);yc94j`;k z`06O|)p>+;hXY@q5TNU00(^Z|fUXY=@b#$y Ux;{Dpx<3Dd1ot5=l$+Il{=dxn(myo#zHseHQyLf?*0!5APMJw%W@gxbI8>xRfE3Yx2X5Oq zk~9XkUN4#K4?Wy}@i3_Ny(*DWlREkMee4HJrdH3GE2J!3F=val-eY!m*OrZHYD!GVWwn?&Z!tY0MMsryu6aU$evYWptk-GjTyEduo+21S(K>wK{LFhk{ z>JfyV`ld=CR=$!P6NsMtq)agSMG`xvM6A#|XOB3&*;R7^$j>c?-#=3@vH_&Kgx>$5Q z46zsn+hXCtidZo4-OS+n{BL!yL&PxCsITVV*GcB9y1;c30P@L0)&Kwi diff --git a/android/app/src/main/res/drawable-xhdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_retry.webp deleted file mode 100644 index 03133638269e8a6874af55c3a93de6fb9c1115fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmV-+0*U=nNk&F)0ssJ4MM6+kP&iCt0ssInPrwrp$6_FDoA@_7Kj;a|3=tpcZZ&uUQ`e6c@&YP=EvQVF=((R6+=XB2cUl(?QrNW(kGe zJtQTVV%lDUGflEoNVm4hkfa#fwr$(CXX^fMWg{bVBm3tf>qSn2ruRoJPv63{umad`dC3wyN`S=;O-Ki(HV z5)K+HCQQE<@D)y*DW1{iLhud8Su4d-HvLnC)JYS?Qnv+}b4~m86ieB*uLWGdEathG3-(TG-T(lNCh%{PS+Hbk0%p7ivThda+SCY}gv$VcLsKIh zC|m*nWK$FHIr7gW7Hpi_L ze)oI4D`-)RTWSt_GQMxVp_=WOvbq<8<6rML}uYn!{2r!HsP QEIQ|Zisi$N@lN^+2EI`(b^rhX diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_done.webp deleted file mode 100644 index 896729ad04b2717b3240b574446ee4923ff7c138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmV-41IzqUNk&F20{{S5MM6+kP&iB<0{{RocfcJG*8vcO|8fZt3fi`jb93*%18}KG zO~kY&^!ziAJ9z%5r8b)w$ny>G6!TU(rsoa#^!F#e`M9h2mcZMhu}t%BB`U| zuxIA5vHAnVkE`0fAHpdnAjMM{{JyOmDW}@?5i5!Pt|Fxroln?E@?AmNaBUAJ`c~Di zx;`c_l8!Ygp&7u=(2xR}01<-t8+CvfLG(6-hbUg`pUQO!!lX{-f2s^nKq!fyCP4*> z{h96nH5_v%ityM*+B35kH3Cc({lMNKYbNd!5X&G#wlhs%#E#!c^JWqS4gd(QdCXDlEs zPnFld#^2NhW|97E{O8%c0;w15bZ+o0mexQ$0`r zJFPMa9qq-QX}t0A?|kTJrdqD?)u;LRqd`<`EHy3Lb&X9?=E-0|NmcI1j3Q`i2g%xBT11|QL%gsO;sNteuAW^*SlulIly)MX1A`3 zBp~I))uzLdbek$BrG(|iVJ2=YxmlGMV>KN1wA;KqUo(Ig~R0X4*q3{oFT*9n|9HeVnL+V!CLCK?~Ki!SS(# za+XKCfO?J{oFWJHxZ_?EG%!FD91|r>P#$6EU;-CT#|lPRO`5_C=~T2ZLpxy(L*(Pp zz!1%-8BCFl#SW&}jhMn1>0zv3jMafb4`cMfFbbHX7{(Un*bWS#iI3k;etiK0;eT}v zyx(rU_m6)upYlC6(8Kpc_qJ{^1YC5trvBU!R6w)G5Xg zf41X!M_1lYr~F&&c~-u6emWJrw}$8c^B^Wt!3Wy$j7L{~Dph>cHP86_^=Tq?{J*G~ z<{Q6X$5Y3@se)^MHIXkGM8Yf&H8l9U_$2zdBLjR%XBMM1d#<^6yWcT#4HU z!?3#_Yk2?J?tZ)B^98%-DTdFF?4FkyJ|DDu9%}gf*Y0_@;q!gF^$cXUeuM1Rs~E1& zv0INscI&UmZoL`Vt*;}y^@L=%ev<6gi;~^?Sh8CWOm^#^iOkk}6WOhAC%g6hL}vRJ yh{$Ze1`(OsKwNDN_R}43&_CE7_7ApV{eu7}8mP?x diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download.webp deleted file mode 100644 index 82102a222c3ef481b26c4da21af83afe455fdc15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1212 zcmV;t1Vj5$Nk&Gr1ONb6MM6+kP&iDe1ONapcfcJGU&EknBuDxFkKp;UydDh;28|>s z>fJpV?_VA>HsiK!1JUif`!9P3IgVsoRT}pd1WIhA!k!4eyK>dGZNsc~3hw~44ft!2 z^?|GhWt>3}MVVKU_mwc}6a^V4$T$*3=@SK_DMK>X*UXzh!Wsvet5ag~M;Ql5--FEC z)4x<%4~XAp5a=KR{Gt7Z&M?6Sbbz`otf+>Kpa-4UfDyV7sto}f!3qs32-Su{R)8NN zKM?4(!eetcTxm-7T)Od}x9>DZyGkt9WuyJD6hFVzKEAIR|T)~j<`LAUC zaeH`bu3Bg2xvTRN{ePsCOcV2~nWt`4CVRzE#>z(Kn|syKp91k`Ow2s8vGZSm#vNv! zSQ|6AOqmBRY@3RSnX*fRrY2LS=$Gl=qG;roOv#=~F3RQ=W*V*yi3biP;$6WyfYD!mA~epTmfXk%b3yq-NhuH znp}TiH5YHq-TqGO6OZkS4%y!nujPJuX2o+;=`8;?&y8gtPHVY%Z=On}XGj8Yh-Iiq z5LQa$OD;i}f9cM&1R}d;3H=+t-#c}n&2%>k*56CrfX~nG9w;ygSa!*Rp*>y1DM8C( z@Qa`Wg$mlO!qfz!s`E28qx0ZZ$0{u*ML~UHi(XSuA7!4nXAP=cqcWbB6KFp#w1ETTmf$Q-<-;0iX#~NE|VY?~%L% z6_Q{}{A;*eMb)u6U?4xAMCHUMR2>7j;p){vOwtQj8U4WJ=Uoi9aaH8M1m=&6h+H79 ziUh{KwzGyh9x4%&|PG1rgD|-7m1>^MbPom+^4ZZy<>lmlg3sG@Yalg*Y z?zFfiI;OVh>`$7tjnn79i;A85lbjJ9KOSq2%R26Kgbh>j$zxNJow)C}f4_U`08Yfo z4h!ObzHs*d*yLJ8tqAAylv8MuV-eehaXmls4Hn~iUgp;a>=M`WL9f2$_fj{)Jr51| z{5Rb5?tstt!|i8axcwUpw_hdT{+w|8kr;0O6~pZ}W4Qfw47Z<<;r355+=nN=O=@`zd$nB`x+#Jy`Mrd*!wsn*_grJKbm3Yk)htVBFRwi amvy*0KkmVOIz8L&4~}eh-XG+M*8M@S8D>EM diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download_night.webp deleted file mode 100644 index 72a08c83afebddbaa3a675ed5096788d9aee5515..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 zcmV;f1X24^Nk&Gd1ONb6MM6+kP&iDQ1ONapcfcJGAH$%LBt^Z(PxLeFT_2cW*tU%$ z&j0&f`zA+iBuSE6LvKJ2l;yC$zJfs`Ns9WIAAP>f*YW}w?i99dgLKTh1F!@>g`dX1 zZFUM*{zlNK$%GP~CKV+JAR&Y_B;{oYhM+VgYC(Vm2IG+%W)KiSf(R@)D59W%MH*~S zp<*=9XcJ@2?GKCkg++ZY7T>F#sy zdqn>sNRrz&+Nt&BfD4d703Q%OYdfi2xp8pR_WFIVeRR+$=TbXsVmXU!tvx^_2JKpQ zA(pb4sZU_Yq@LLn+gMLkN1!mOrq;zGVudb+!%>x_*A6+4~tP=PrtF+|xF8C;`yY5#C3MdOHzp79`TUDPoM^Hdpqs?n8U3j&H z%zxFPfWGSgHGu;9nuy2(DyRz!kt|fuS5~9~74%gTX+s5lwPkGp74$V&+kp=H!Vc}C z@bJTrDTN>JAF$#`<-p<2zbTD>w@HEI%HZ&1O5_PCka80oZZdU?6iAa+;=kqj9V?F6 z5lCG8VEM--D~=;xy1K{GeOef8V)^-keMa^-vHkBR@@fVk2QCJA`o|^6_mdIx^rsWB8LTPXKS#>b z*Lj&vTcid)kHYmBd}>Pd(d#h3fdW~bdN4Fke?5l+3#IxuBu`)GWd$aB_5QOUJ%a{y zz4MKLJnhTN3S{)oa{}`8&r4`9+SEJ0!g8Lz4;8A4=XHQTPrrl?DW7%DCjnoc{&Wfz zy6b*P2|8T;y3Wfw6qYP8DDmhql!z_M{Jj12#rG+Z?=Osh>GJ@a_ZMDF$ryKb;z2U* zr+jD2w6k*%Xyg8oWl99guwQ1`3x^>#><`-YF5|s0x!VtQxc}>JzuV#dzPs}b;_m#0 zxI3@n@O+ND^GM?E{FS&nZzk@}*NMCHgyQb}q_{gTD(=q5io5f`;_m#jh_mzFBJR$& zi@WpuBF^qFh={ZM8Y1HCeu{{=x{u={R^sj-m11HKuI^j;aCN_IiAANa-YVgg4+h4{ipZV3b^I*=fm z5RePy2c7~In7|--gP#yUiWJ}hu|OdBfIsFVOoAD0CHSHZYF2_8%VN}bHEHQW*G9Ql zs|F$r(rw#X(<)8fU2%60dY~;7x%d6wsLIZF&i|c={zGshNs$!MwRE_=UGM=fe4kzx z*CyuL+^Vs`QJr;V6rPt>?Y~hcuSngxaZJKVJHqAa^pF2XC8=SIp6VI_}ml) zHlG>3sX$c7RM@8;azjz#F!vB@tlOeUu0xFFOjOBbXpsm+nM{Nf$%&|w$xtHQ7lkq% zLL^m26cIm}n21t|{=hO2wG#U~>zOE)$m_>LTU5)3?a7I9b6ZDhD9Rmf`{wi3LS#h#8S$YQamc@Di5dAvB*l=)-|31WJHN(N$te_0hsjqX5R-XaB@gDhZJUPD=(D@f7K}3MP{4bEDFR<*NL!wK8?0Mu; zAP;?qf?r&E%m}1Y&avx5j}?J*$}x6*${t?@(kT&keds+61X3>pz6hpXqL+nW9{3JL zVK%~442uz_VpxkX6+?83uNb~Xn2Oa^)ev(`B^XYSQbdV zl;Qo6?@|z=`$5Gl(fzMpdhmWNSneR|&zt0fzb+^7l ziCmk-w*d2#m%cNJT$kzNcd&fye`gEJU%mebH2-{i=HQnR&DX_#VmIGzxV~Vkp3?m_ z4A+nB*2@gn2kq8F4cC9|*1HYY_wDvG&~E<*?e?n}?$5E?k3_ruSG3!2M!WrWwA)We zyZw{2+b>GH{js#$4@|rL&!pLYZ_;jmJMH%KlV;}^NSdA3AZd0!g{0Ye9FmOX!<|3M k$EZiM^HwBjV!jM!{Gx` z-_VWwxTMpXRr7jEOWcoL5OTZSyy`~RdDjW4%@nhO<~TLNW*BF!XR)|44t?+KIw4yt7S!vDKdD>NpU6KDE zAt|*fZ0Dfl9yZ6I^lm+Po0ZWAXtKI6H~$mWiSgg))s6jsBz0r@ zCkA!o@ZVcUrhneLa=68!u3WC)Lyz+C{#7>kq^9=Q9Fc3gdpX}8TRUDwfc`~3mqOTb zxCpH0dS41<8!v%UHE)Hp%@@%q;%6ak%^B>$`%`TEdVf^V=?wG)#6f($Q^7FGwGy|%$(3n%3m=QWd(gf@G{}~obO`j7j!!fp1=Aic4FiGxkA3~vDk^_H^z$q^OLW|N-Up~!zExo z)~bQ|tK(Im`RB(EgM)pe`MUlZzxj5@^9z3GQykA9`JFFwJU{4nKGgC2uiyD@$MgGs z>lwsv{f79hS8-gQj}kg{iOJ<7ZtztvEsKLSp3#Mi@2@# z7V%r(E`ICzMcl4m5D~ZQHAKYi`VVuUUSiP@s-BVrcldXN~Q>t9|3ulIS` z!ubte=6F8mJ4Eygx;s5QfAtX}3a$5d9pvjCLqwtchRy=aPrim|3b`*$eh!$AjW)3S z)%qgP{PW{SgbVvd^L3+3{N~#o?=Se>PjS3|+9sVo=|@4C*`+ZRDSDY<+mPKe(RqlxAoqV-}-j> zt>>5A_Af|s+pi(XZGVa+xBWPh-1Z+ya@%huNiO=!5C@B$!+yF8FZu_I%l^S4TK^!$ CLZn;( diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_night.webp deleted file mode 100644 index 9c0bae4d50d1b901a8510858afd4eb259716a1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmV<810DQQNk&H60{{S5MM6+kP&iD^0{{RocfcJGKjJo$Bt^$eh#+`BHLDSzAN67nlzvT0bKqMP!WuZNpsbY zUm7hh6;kD9B#EI$AqfEzVMHS(KKh{_niomx5RhP~CvHp-2#^qig+mhx4J^^HLqVY` zG}*#bre&!mc82-?J=O~AI`fRC!smXmZ9DG_!aJM$ZwmW<=NX~GJDNg;f&#WANopLK zS(cgEM`JoLGwc6<=}@hmdEefR=szU4jU-7@xo2PURF#ntA4tk~VlG?XIXpeDG#ior z{50&WXLA#Ya&Oo6D;H8oR`%C!6QxeC9^44%4Oc^=&B<)}O=+LRHYjJ4YV&cfL)uuR>t7C}^XO2aIF|d4>n_h)n zF8jUljcc#O7{*J@Y}+d`#1eB`6;)PmOUryyl*##$lGa6?AuS~=eyuY~{zdxQ@g1Oq`KoDKwy??tGNcMoLe=hNF*t<6*Zw2x%cjyzgo?CKF z5Z&^Dt!FLat{}SQ2V2j6!ipfe#bfKKaNDQG5hHLNHJ^Zeo!&D=>AtPH}HO6 zFNEtGdRfKmIX}5Wzme61X}o^*nL8BP@5d7Abx*lFvHC{n3s#?Oz2&aN>N%Y32dl^4 zySl*o)#gCJ`g7~))4?wzTCa503tV2#F!|p#T5? diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_retry.webp deleted file mode 100644 index 7992647364148547dab6b4d230ba18222a9571f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 860 zcmV-i1Ec&>Nk&Fg0{{S5MM6+kP&iCT0{{RocfcJGZ-bz1+n7J;E8RiN|NJX#+qO-` zE9q3&wr!JiPu_ug11Q0*10eR+LAW*njDS!C@HmkobPp;MKtli+2pQw!K*xm+3*rPt z<3m{RImd^O3>|p);Aq4BX^<@dkfJsdcXzjXlIqd8)DL1%syI|Gl+OQu0L;vByZ748 zM)ZFI;Gd#9A8B_y9ix7mjHOSgTAqocpQx(UxfuG@q_xGk(x2|2&C-Vecxy*0&7(`^i0dc zbOPD=$DKeDKR3YATMbUI-v>-=Sz824kJgY`Sps&WsWJ<;P9ifq4*c(^T9^j$*x}n* zE36?iI|#xzsGlc5+WGtk>g|FJZWxtukallB=mP0b8k;|Mn74v-umn-eVCy^Pr5O7V z#RViUj2o#_`MyZ(P>nIuJft5(BY8>e)|tOF_wa%?HnuhhO-K6M(M_tXcoGSqf-cBvb)a@1;cmZ_Xs zRcb0alaw4dE3Rmr_l*#y#?W(@?CCwqme>SP`j449=?)Td5S zsmX~tKT%g;xJT*ZXgo&RGi|s|<$EQsnw+FBPt}J_(-fuqlAc#3_ev%ENT!<2)s*;;y`5h{u7=13#0i2Ck|Z|6p?f{tFq=8>Kb? diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done.webp deleted file mode 100644 index 87bfaaa5cf8f20b3e718f67ffa5dd161394cf2aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 zcmV-q1e^O(Nk&Fo1ONb6MM6+kP&iCa1ONappTH*&7XlE3|8WZu3fs1AL#5J{79b`t z0~o$Y z`VWb1BS%uHz4?0T(sZnvzfjP0Yd=nNxZFk{ZZE?;jegxVVgRlm#t@NB4CBx{QH$$* zKoNrPG``giGm0_~t!Sdz1XLhwwEQ2q)r4wHD+PaGjgP2G^yD9JFF?Qr@qa)&f`pOu zK|6tniSU8*Aj7l$hxS|0vF(M3b^;|lU*rbRGH`rRGlQ6!;Vj%oP!p?H={(q}eFA9% z6cB12tcy@V?4%Yw)KII6H59Ry8f>77jTFauD5Llh-3WDzuB>?|#23{DDk=E|Ybd4M zaeAnw)cLoAV#>5&ZG>WCTR<*AHNl;49?CiYcs4~#B@RpjG{TV4UA%QYyn0Q4j-v$vtIsn_4hBO zU2PAfWHk2ZHtl)+xU93op{W?mzWAID`TVe`xATD<6!79pI_9RVziw{|=J8G|rDsJQ z?sihp<}WGzUesf+qt+#*e~Y>tRJ^mO^jle{o$${FEbGUkvR?Q6XWeC`{|dW32>XC6 zLvQaC_IqUiWQN{7DD8Leu_Z9uca_-J_eIDWx~hvs|K7 zg^#>E`qsbyk>L{MyW8>=-F=^q`E$`F&ab!(#U1@8rR+jlTbPSG`Z{G7)&tE`aYsL< z+(LWQX)NyOo0MB<&$pv5?&$w1v+yPn3;R-4zm(jpA?=0&fR2z|wQm_}93OZcvb;&!g*>$ikS$AdQ&TDRAI8fbn@jI`n zg?9H!^_9OnubCB&RC!;k; zUtFr#7uPHH#YGz!S8iWizSx)7K*^YSu@*q7Hz z?8^%#_T^O*`|{F>eR=&v%*%@?VqacKu`e&DhFR_T2m)BWD q%*%@{BIe~47ZLOFvL8?}ue~O!To*teg|DlimO|I1FaYlBdH?_<^DM0Z diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done_night.webp deleted file mode 100644 index 315c033b3d16fff477c70beb3ec8bce9c2971e76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1190 zcmV;X1X=r1Nk&GV1ONb6MM6+kP&iDH1ONappTH*&Z=#@W8^-)ePk$8VfBqG=ZG*zn zP;J{b47{cC4j?92fmZzwoEivj5GnyMIxitO3<^m{D$rO6g-=Hk@Msvxqz@?~2pMSG zwyn02B(t5eRS_C=in*G(n3}u&{~r{=^}YL^=Y1mj4+)aowh;zf7fXQl`Hz#q%ntZ#OB+-&CceQxIcFQ!0kNLK0#Urh4=SfUV zuNnzJW3l`lr0Y_GQLZES1+(lVL9q<{@Y!tvz-9?7^J@XYK>tSPg#b|izA@Pe7(2A) zVto)eY@GlxD+Q7g<_|R8wgO6P82^T6wE$xXA6%UT8e1iSNi%^b3wzY87JR}UwKz!> z*dhtVs+CA+LtSDc5wS@^a7&`Xynp28mXYE8j_I{ThoycklL*PY>Xt-_&l5HhDgN%W zl4vncTC@@^t$ESxBoSji`T%JyQDf=lmPzDXe!rDOk6ozQNuuY%W71j_z|u=>D=J_Y zXx54fv@>@rMF~o0twjyij+z`q4Q%3OJ5hw4ljfoda~CT_6$+=<$}k_dYf%Op)lAf3 zHfFa)9c)BXQ3xBhOcWv;RC*GHuyn}Qq7v&ND@7&B0Zm0ItZ!GM6xO#!l%nar6-|@> z^2b*{eeFBcc}J0q#vZ*pljMiTeuLe1t&#|M@n=V*J@guF)lnM5Xz|5g=RR+|hTEn$ zwiI}VMLzQy@bbnY81IaT-+7IAcVqZ-DP!UahQB^UQmoznvW&w>ii*-UEI5kDCLxR+|9h zvY*Zl4&9h8LyT)*IXHA%KMgW3;NX7)%fig7I5@D_gqoLn6^)n&o7a04i)i8IMPEfC zTEKbbS8<3Ia$f#b6tb}E8m}S{cY)W1UXSYw-Vn?JudCg8Kc+vP3L0%1cwMsN(CV&B z23^_cII_6yDCoL)$AQIpM`4#XI*zNRr?C4nI*uw{^)2k$M#n+LY2QNc3%c_jRpo$! z@2k4=L@-$oNWpz+`t9pea9^Z;`$`qum#g2tW(D_!>$k67!Mp_h@;VgEi_tHyi2CJa zDVW!$UtXYsd6oL*rBc7VUh0<@tzcfcetG%SudV_0s|!K>>S|EGx+K)Eu8V?oarCPz zM5ZX{f)tJJuunNG3=L6EEI!AB z|LXrN|N86e;%pCH2E z{kwa*3whtl=R8S7|0S_)BuSFlF*AGbYhyc)sJ|ydx}(15deKtCTRSP+hf@I5mo2tCT>iN~?kr zN#!qCn6Qat)crYbj1p?hDXRQAN-U?QgZ&?(1am6>53tooiDtIqr-~BJ#je6}n{ci$ zX8j(viDz7_+Ug+<=-G;sCDH;HqyElWEpUjQR;vjna+O+ba1m>BkhEbC(NamwK3qEP z=fI`+#H=z>S_y=vH> z8v~438N>!&+H&}O{q%lcxqZfcAr9#hV&G2rOip|y1|{Xh;DOKP0WmNv?`ZG%Y#cEF z%kTBnXY+&@G&c}~U#ER0r+yKGhIZoca<|XIy&w+lOl{$|&*B!bF#VRrud_abGe3z% z|A6K3?x6Co?18t$V}NZ%>ap^&kBG@A-;&BT)pdoqO!4K%DYbR-J8_v}TycE8S7q&a zMQla~ET4xebD#JO^jk*f)zvv-)Zb|teLAYD4u2#@oo$xW3q}3aJtIzSjh5AIHMvQw z!27mQQGd>okVpd*4+^)v0E5xlNP0V8V*Gxaw2G#M6FCe<+mhcUG#ax{_38Q00mOk zm2XGO4H6(_gsjU)?5~-ADnN&reT_){^}rjFU`^1z(BtqtA`yxu?W-r?+yy-r`B4F z^`KzIit+f76=Nl^)SiocfAN^l##~f*+&T1Iq{?%p?+^K`pzvivO69rS3qCJ}=dn}& z!lLk8^D&>9Ayp7s>du8HCYTS8vUBzP-?&JMG({-n&8YbcC*`M@yeLt3ufttP!f#X= zsWf;mMt}E;fEKF>E^=w`UYq{z1#0kKrT*@vLVx#qp}%|48oXDozkB)6-&_OeZ!QG% zH&+Atn@a-y&2_=98cG}kwb9>PAwYX`nE?IGwSxZUf{-+iXzNVb(~F78VRfGo&A6#ufq?OwHQ+c2Y3c?W0} zehz2RDg@!~ljiDNtwU8LYzrJ^a%kX9a)B`h&Mi}9!1VjS@qk9vQt77C>Tr#QHv z#9(l-Qd@Y5V5LTuNw}fp#fqB>6f+Sl*r;G%aEJ^fQbUj+K{RzZ?KPRw%I`0&2)1OG;@z*vpX7|=cbkCxoP-3hlWha|M(j+ zWi%>d%#_pmW(sMyHW`vsV>HHC$Cx{wS=+X4+p78Rz1@Y3H}i8wMnwN5v27$tlG!n{ z_wH+AJCCS;1fiwWy=!gt=!x0si6Jl3vnRsp+OBSGi5y_Pd|=1iIA!MNc1U?WvR323 zp5t4{0689fV`QJg{>2e8C@e}LvPpB#95I;lLF~}bxiUmd{7PsLc5VS22F!2$;j!A_UBw|*-ZySNz=6QeB#(A=U55i|~imWgt5tsf^vczb=@aWr0 z)(CyVp?4EmWRpb3)$JzBNS*0AMAkVdX0ux@Bu1-Otz_~y^lc(5Z8G=w^lv3g1yf&t z2S>?Tqhh2sPLai?f`O{{WHlf1XP;Wm=dO-zWVvmUv)U%fdco(a`UQ0W33+lroj`Kb zhEZ~Y(U3h$~);tjWY8Ys>r@7`!y}!iJ32^hyRUONOe+~9ZIcM{v~&~Y-vr)PGSca-I-GD z0Q)I;8E#L`F6D<8^@-ImLHqzS(U6o*0st88Ov;J^K#WhQ<{<@u7~fo*9t8jy^|jfq z05CIGQw4$m87)+2ze2#w{^~3$1k5Z}RpW?4z|4sMp8>^y8TJ3OM=^kA&;J}J44^q4 ziL8Sh20_i1^+?JD0yOF)oV6&_9EfBGfk4fUNahFxYUUytClILdQHydo|NP^h*f{_3 z`8nm#QX&TOC1xTluTnQLco5ilWzfy?j`ne2qr||o{8@Jbo4d+j$1*WE^)Y7h=@cQ zd`l`XOxH`|GQ^iNpUl?hv&3acl+CrjChOmIWiv6Yd>)w0L*+9)t9(wrHCOLA{}VcU zLK&U^ZmND^ix)A+&eBN`fH`1^77rv z>|XxdCuY7x%<}iwm&C2qLd%zZ30k6Syz6Vt)3}>E$blb@)`SUrJn*g4zsV3slWcd zN(lA4xstRUnBeB1}1KQN6)&VS z{%2q%246c<%H+A+H!&}R=dqL6p;;}169HX0phy3up-j5cZi_i&D9lg z-dti4ao${K5pmvJY!PwZTyYU`-dy%7%{?qP`Gap3o3K0=z&?hbt6(id&!upHmQwew S9m~h&YM<+&VR;A6b3Fh7LoT%d diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder.webp deleted file mode 100644 index 1f8a9615556b8d8d26ee4c28754d0d7228c780f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1424 zcmV;B1#kLNNk&G91pok7MM6+kP&iC`1pojqpTH*&ALBTZB&o>;-r&D?xWEgY(;->m zDv~6{$|V`+U&_h2d+^Up&A4qNN4%W-@AKY=lj}&bRb}=(MX&r30FjUvDZ9fxM`6+i zOm|-aO@cQeXzkkb+k9Zv7^Ni;y=8J3jX&{&{<{R_DIq$u_@o{7K@Liwp=KC3} z-%9?fQYw**s~Aq-e}9ygS`538sT3j6Tm(Z3fnfNF4+?~-2up;l-w(>NWukPN)9d}aP9g@PqJ=EU+DX_4=bI$MmMf4vMBT0^w%<02J;bBbgKd3NY z>uwE=PE0Q@tv8ePB~DL_4z;>#`QU(=(q(;SP1<&i^~+KwnDu}4_f$gwHl|qpAM9DU zn%@|7RgE;A_d_@}6p$3cmy%e_RYyi5fRp3RA3 z=gt_vsB|(JygF9^Fq1l=bh|_iv-N{UPdX-CNmpNYMQ+&u%^dcE)=4J}Qu$`=6pD zu{A39F${_MElRA7;d?6AM5O%lA~H9cxw~9IQhtvTd*k9RvyhM^KD51au7G|Noj8YLaLp zcHtx{pIs(rQ2Fe_MN~e!a0wRhd8AAnOY5k7c3E$t^4X>7AO1by-?I=F@L8lx;47L& z<+IE51S+3hCPq>D>@r$M<+ICB3l{Kcq)g!7#oefUcImF6^4X=9N9D6i9yTvvmNnqK z%9BW$$a$4ID4<#DxOqLZ5H~MsmJ)7W*(!|;ZeHFhQ^<9VNSi1KToslfXVnKQs!HMSh!WFU;XbRU4qutX6_VdU&hx+m!NgYi#r9{*YZ!- zKR%#!-Dd7CpnXA~BTa(V#fR@H(7vjJkC7rl`wA-e6l!1E!Dls3MD5F1&)x@YU*Es4 z?-jh!H@JN*t$WMCeUbj{D|K*Ru7CTQ9o!f0-@bYlcEk}`Xb1n!bvSq~#=mn#*X2uFb!5fexOl^zU3M{X5r7|IS4_c&^;PbNTeIuL1q*3qk+-YS6#FB=oPZ3p)nH zob15jUtb~8y}nGOe|@d!Utci#*H?}H^`)bKef>!H`XZA4^_8T5eK|=UD{ZL40V!AlJ50&Ch1;ZY?AKv6({LlUv`pY?qXJAaF)4X$ylxnU{COM e70e2{E`w3&gj@0#B*8>0{Ow_Lc diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done.webp deleted file mode 100644 index 7dda7cc962e8ac752fb7a944c1a193d481647279..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 984 zcmV;}11J1aNk&G{0{{S5MM6+kP&iD)0{{RopTH*&M*$Fo|8WZu3>ryN9K3;JzL)VS z006?!AwLoT_)uY;0RaFYTL6%@wZPFNR%0W*J$v2N{Qoa@B?Nem=>G(Oh%R&~m$4qE zM%1Q59ZODKa9}`;L#~Y$Z#54Q^}>)Uv8*YeLVg&D^*DG{TwiH}wRcM3uFz)74&`&H z(WYB+viUs;xc74TOhRTalP@G_@$z6IVG{}yClYsxlK4U*7cT`4B=&$JxRC@OodB_s z=q+vy6N#U2Q@)ad)o&;?Qn7{2L{c+uq$5SUP4uK{&kqwRn~)i1Qa2;7L<%QXJ*nI? z>PYF1O(eA=lR%0G7QSiLJOiwxdd2k;DW6u0q<&ns_76BRsJkyQIlX@W zo)>?TC*6gO#qsStulgiT!+Unb@%S;X{Uia0FZS0W(qmF4wH4JW}QaXVXRlPPMfSV9oU?;I#lb_ z(K=(XPRZ8E$vUaCP8X~boOK*D+cbd6Wmc*JWZPtb!8QXxv`qv++aLf`%Txe>WSMjk zEE6u!GI#-_T}HS%*k!opdHj*)HxGXeDvNJvzFAbb*|T_+=9NW%%dt3}WjUW%xLZ&- z(7P<}#IeAgI~K=JNj{G(cK2Z8K*#s96zBINacp=GBo;)c*Y7{u`}6&JBAyBEc1)CY z_rcyCdw9^>!#@Jq8W|q;*6@!(u|p*8tb_YYx_p`bAhfX_sJith!ZP4}8K`OOZW@?e`MwJ&5j7+g3{s#K&FP zPT3*o==!>a+B?wH4s!9!<-tZoAdSGyBb|YwN0mDmq;5>r;>l!owvRe3>hUCGLX zpQBr_Iu{O0$qFr@?SfT`Ji?TfiaVb%s}=S9oAs>L9`g#8cvh@Oya#X{tG09JQ?hc; zKff`n_uLamJgfK2!?=zO@Vvw1Y=Ze2E$P_=`{Z;QHp1rQHeoZIoYoTY>M?s-;FUn&Vr3`akM3Dj>$3RY>x9IEoOs^4^x7o-aNj4hLgQxah3<0 z^N^sIPk-AhK+opgfd+cTzkCTH=-MWSXdp2kLeRD~`#*sWef=BsZSg)cNXYvT^lh_! zmXMHdLE*OCYbhq=N6@&XyX2UR-$9C>?~k_(GvB3!L_~n}@A-;BwmZ%Bn2e$b;T5&@ zZp#RiQ5fNwL5{W*por4=Lmi>m(t#rW1Ytfh#*T<0P(pdUGsuWwJ$dr@Vvu9lvo6ac zFvy&!0tHk{MYIG3RLhdcg956><35q8h2s$_pI$~&R6e~-OH@9+loc%CZxAMqsz&A0 zOWmUK>7`ww^66!{LgmxTY6A=S7lesp<5Bta;$ivpf>SZ}{bJuiU?-%PRfo!_m##(S z(@R^U^690nQ2F#ym9T*SL72ez#Zy#1y-Y`_e0mwhsC;^fVf_MX@xXqSAWdYyN(Bn2 zmI~Ler}F(l-ztPeh@aouauSgvaY=*2iY%xKEeA{P%CJ^6b87rUytSfem$0=_Ui%Fl|DfL diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_night.webp deleted file mode 100644 index 89f01ac433eaef1e84c668f5268458d1c7e2e870..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1374 zcmV-k1)=&e>yeRQnuHi`_JbFgHa&}0X7(M zI6{on8%`pO)X9L6I(8U2F=D5Jp(nzCi3)Q=K!lNc$pu1z0vUt?!T^XTMNxVh7q zjw6WyzNtUT(mg4xPczm-qSnEMdoR}nAYTSQnCP?e@M2qlh6`2_O%BhbQi7=u)ZxJ7 z^`?}hzYYU*-tor1lq&sr;F+af%c)~=PEI8bx%5n&lp%4%{zp6Fs5=aa3yz(O!_p_^J8=-5HZUpK{s$Z4xEsFQ zk6Jzx1^U49Ts#yN9x^G*`5jT>&OFO;Ze7$E=2(WaE2791!r#KayP{0?q3emL^D(j9 zjS3~SW}`|8thp6Y=?d=q%&&`51M27R;*O|whmcx66vZ9}K=pf3tq;BPAS&1QToW6j z+zs|vV+W$%;Crh6^Jst!z3?cSAbY5#9WlY3P@GFK!ce%T#0;kj*3hw-A%}`_Ukven zp{i_(A?}7EJdLL43siMgOwm`n^F)mCN!J=(6Jz9PH*UooZ@bj^mY5^QJJSGVefR0d zue`AD#W@=tYhWJ|^!4Zed5lrd*dOS`BqZnSuX&8RM(D&fB<9CFY8%%bYIqZo^6kG| z-PjE6%s^6p$fLe7)6OX*(fV^m_!EH=Nr-<J#oYc?pX6H+RfWg7GEE zH*27X&hbMqG9;{n61vB40a+(*F3LHgfMmi96i_W0nSuhUB_;Pj0oAg{5mZ36#85-! z(@Sj{l}|6z4OBk8G%{Ggf4O7g$gWWN^m6qAl}|4rMdi~=dVTo7tK_bUoL9*}0o9V>=JnJ<+`On-JZ@fDD-5`Kd9Azzu4`x| z0M~`I;(_aGN(mmgE~%72k_4^mDuu07Fd2X6j`>Rq_F?fez+abzMwC;OM=$LuR9cKU)8tV9Z~xVCOZ^tU)mRE-Wfcm z_6ItF+}G#8Hx0ObEsc(4;J!%v_LUmAFW0_(%?9oZw{KrPE4$GUeJFx`=Q<2L7h~VK zBJ!CSAq$s*=i2N$7ii$QO8d^G(!O)OwC`NBf#=HYJC{%U`Wn!_z7VvpuLkYwOG5kl zy0GtYRA(R-`}zuz=JjPF?dxkr`}%^>zP@U-uP+_#>+46F*B6nrudgKS>&r=U$rB$TzStzq>nl#uyuR!t$>Et(DZ$`}smW6A g1<)t>UIn#+?xirmk=k@4yLyqf-|G>>Rp!pU9k(^bnMovOm=ddChz9Of`)-ZFUvTiihNjPysFOA z1td?X$k*j&tKaY*Rn_FjDuXp_`-19|YLZ`Ltbq)2a!9euO!KcG?-a-6kdbU2BQw?q z22LDB_FvTs9bn+L2N<2~YA|r{24}IP@^u9mcgW(@D#?`2qKM=IrbT7a5golGT?XcJ80wki0qL2BQkFE#^*PLQZ6TGK z^wWz}-@=76axErFw|+L09z$hFhO|*X$4R4=a*lLZKetKiDrGC_rhZxO|xmXg(R<^ zSELR$2`+q<^J!r3AidJhZPGfv*) z4g1Qp56MnP4F%FzI(lhGDp(!KX_B1cIUiyhq2+YK3- z`1Yt+k96OlFBwn}zcL!uqoM)D$%IQTw0=}d$oeS&GcNta5=pldOc}hX4C}z0Z4WBJwSh?!N2BK* z7O5WGbGEYz;$XwT kp_gSf>kbVxK#WZFY(9SbRVF)Wv) + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_done_night.xml b/android/app/src/main/res/drawable/downloader_done_night.xml new file mode 100644 index 000000000..74ae3d345 --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_done_night.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_download.xml b/android/app/src/main/res/drawable/downloader_download.xml new file mode 100644 index 000000000..656bd5c41 --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_download.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_download_night.xml b/android/app/src/main/res/drawable/downloader_download_night.xml new file mode 100644 index 000000000..de8b69c3c --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_download_night.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_failed.xml b/android/app/src/main/res/drawable/downloader_failed.xml index e0afcf1ff..084bd4f0a 100644 --- a/android/app/src/main/res/drawable/downloader_failed.xml +++ b/android/app/src/main/res/drawable/downloader_failed.xml @@ -4,8 +4,16 @@ + - + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/downloader_folder.xml b/android/app/src/main/res/drawable/downloader_folder.xml new file mode 100644 index 000000000..8596f39fa --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_folder.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_folder_done.xml b/android/app/src/main/res/drawable/downloader_folder_done.xml new file mode 100644 index 000000000..e8a9b0952 --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_folder_done.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_folder_done_night.xml b/android/app/src/main/res/drawable/downloader_folder_done_night.xml new file mode 100644 index 000000000..7745e86f9 --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_folder_done_night.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_folder_night.xml b/android/app/src/main/res/drawable/downloader_folder_night.xml new file mode 100644 index 000000000..00fa330a4 --- /dev/null +++ b/android/app/src/main/res/drawable/downloader_folder_night.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/downloader_update.xml b/android/app/src/main/res/drawable/downloader_update.xml index deffe9b3a..805387bcb 100644 --- a/android/app/src/main/res/drawable/downloader_update.xml +++ b/android/app/src/main/res/drawable/downloader_update.xml @@ -3,9 +3,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + + - + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/ic_downloader_retry.xml b/android/app/src/main/res/drawable/ic_downloader_retry.xml new file mode 100644 index 000000000..59ff2c03f --- /dev/null +++ b/android/app/src/main/res/drawable/ic_downloader_retry.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_downloader_update.xml b/android/app/src/main/res/drawable/ic_downloader_update.xml index e2894f76d..8e9438838 100644 --- a/android/app/src/main/res/drawable/ic_downloader_update.xml +++ b/android/app/src/main/res/drawable/ic_downloader_update.xml @@ -1,6 +1,6 @@ diff --git a/android/app/src/main/res/drawable/ic_folder.xml b/android/app/src/main/res/drawable/ic_folder.xml new file mode 100644 index 000000000..c83e5ffd0 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_folder.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/layout/downloader_status.xml b/android/app/src/main/res/layout/downloader_status.xml index 13b49f8fc..bc8ed9909 100644 --- a/android/app/src/main/res/layout/downloader_status.xml +++ b/android/app/src/main/res/layout/downloader_status.xml @@ -21,5 +21,5 @@ android:layout_height="match_parent" android:scaleType="center" android:background="?clickableBackground" - tools:src="@drawable/downloader_failed"/> + tools:src="@drawable/downloader_update"/> diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index f45cb4132..0d7bb8621 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -143,4 +143,11 @@ #929292 #FFC22219 + + + #ebebeb + #54575b + #FF37653F + #ffe68c + #ffc30a diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml index 47a97a016..38573bc30 100644 --- a/android/app/src/main/res/values/themes.xml +++ b/android/app/src/main/res/values/themes.xml @@ -158,19 +158,19 @@ \ No newline at end of file + + + + + From 014b54b1f7d60e2432e66ef27c6a4a241f509a45 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 29 Jun 2025 16:34:02 -0300 Subject: [PATCH 168/222] [routing][tests] Updated Turn integration tests. Signed-off-by: Viktor Govako --- .../pedestrian_route_test.cpp | 6 ++-- .../routing_integration_tests/turn_test.cpp | 29 +++---------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp index 24ac1b180..eebd6d250 100644 --- a/routing/routing_integration_tests/pedestrian_route_test.cpp +++ b/routing/routing_integration_tests/pedestrian_route_test.cpp @@ -569,18 +569,18 @@ UNIT_TEST(NoTurnOnForkingRoad_TurnTest) { TRouteResult const routeResult = integration::CalculateRoute( integration::GetVehicleComponents(VehicleType::Pedestrian), - mercator::FromLatLon(55.67505, 37.51851), {0.0, 0.0}, mercator::FromLatLon(55.67488, 37.5178)); + mercator::FromLatLon(55.67505, 37.51851), {0.0, 0.0}, mercator::FromLatLon(55.6748507, 37.5177359)); Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestRouteLength(route, 51.2); + integration::TestRouteLength(route, 64.655); + /// @todo t[1].m_pedestrianTurn, PedestrianDirection::TurnRight is redundant here. std::vector t; route.GetTurnsForTesting(t); TEST_EQUAL(t.size(), 2, ()); - TEST_EQUAL(t[0].m_pedestrianTurn, PedestrianDirection::TurnLeft, ()); } diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp index 300898e8a..42558e427 100644 --- a/routing/routing_integration_tests/turn_test.cpp +++ b/routing/routing_integration_tests/turn_test.cpp @@ -14,26 +14,6 @@ namespace turn_test using namespace routing; using namespace routing::turns; -UNIT_TEST(Russia_Moscow_NagatinoUturn_TurnTest) -{ - TRouteResult const routeResult = - integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), - mercator::FromLatLon(55.67251, 37.63604), {0.01, -0.01}, - mercator::FromLatLon(55.67293, 37.63507)); - - Route const & route = *routeResult.first; - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - integration::TestTurnCount(route, 2 /* expectedTurnCount */); - - integration::GetNthTurn(route, 0) - .TestValid() - .TestDirection(CarDirection::UTurnLeft); - - integration::TestRouteLength(route, 251.3); -} - // Secondary should be preferred against residential. UNIT_TEST(StPetersburg_SideRoadPenalty_TurnTest) { @@ -301,17 +281,16 @@ UNIT_TEST(Russia_HugeRoundabout_TurnTest) Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; - /// @todo Actualized exit num. But one exit is highway=unclassified, that (probably?) should not be counted? TEST_EQUAL(result, RouterResultCode::NoError, ()); integration::TestTurnCount(route, 2 /* expectedTurnCount */); integration::GetNthTurn(route, 0) .TestValid() .TestDirection(CarDirection::EnterRoundAbout) - .TestRoundAboutExitNum(6); + .TestRoundAboutExitNum(7); integration::GetNthTurn(route, 1) .TestValid() .TestDirection(CarDirection::LeaveRoundAbout) - .TestRoundAboutExitNum(6); + .TestRoundAboutExitNum(7); } UNIT_TEST(Belarus_Misk_ProspNezavisimostiMKAD_TurnTest) @@ -1274,9 +1253,9 @@ UNIT_TEST(Cyprus_Governors_Beach_TurnTestNextRoad) RouteSegment::RoadNameInfo ri; route.GetNextTurnStreetName(ri); - TEST_EQUAL(ri.m_destination, "Governer's Beach; Pentakomo", ()); + TEST_EQUAL(ri.m_destination, "ΑΚΤΗ ΚΥΒΕΡΝΗΤΗ; Governer's Beach; ΠΕΝΤΑΚΩΜΟ; Pentakomo", ()); // Aggregated network/ref tags. - TEST_EQUAL(ri.m_destination_ref, "CY:B/B1", ()); + TEST_EQUAL(ri.m_destination_ref, "B1", ()); } // Exit which is marked as non-link, but has link tags m_destination_ref and m_destination. From effc8ba5d1211f423059956db6ded2d3b04d42eb Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 29 Jun 2025 18:31:43 -0300 Subject: [PATCH 169/222] [routing] Relaxed roundabout skip turns check (driveway, parking_aisle). Signed-off-by: Viktor Govako --- drape_frontend/rule_drawer.cpp | 9 +- indexer/ftypes_matcher.cpp | 98 ++++++++++--------- indexer/ftypes_matcher.hpp | 3 + openlr/helpers.cpp | 22 +++-- routing/car_directions.cpp | 11 ++- .../routing_integration_tests/turn_test.cpp | 37 +++++++ routing/turns_generator.cpp | 4 +- routing/turns_generator_utils.cpp | 14 ++- 8 files changed, 129 insertions(+), 69 deletions(-) diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index 2146dd0c1..b0cca08c1 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -352,18 +352,19 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, TInsertSha if (m_context->IsTrafficEnabled() && m_zoomLevel >= kRoadClass0ZoomLevel) { + using ftypes::HighwayClass; struct Checker { - std::vector m_highwayClasses; + std::vector m_highwayClasses; int m_zoomLevel; df::RoadClass m_roadClass; }; static Checker const checkers[] = { - {{ftypes::HighwayClass::Trunk, ftypes::HighwayClass::Primary}, + {{HighwayClass::Trunk, HighwayClass::Primary}, kRoadClass0ZoomLevel, df::RoadClass::Class0}, - {{ftypes::HighwayClass::Secondary, ftypes::HighwayClass::Tertiary}, + {{HighwayClass::Secondary, HighwayClass::Tertiary}, kRoadClass1ZoomLevel, df::RoadClass::Class1}, - {{ftypes::HighwayClass::LivingStreet, ftypes::HighwayClass::Service}, + {{HighwayClass::LivingStreet, HighwayClass::Service, HighwayClass::ServiceMinor}, kRoadClass2ZoomLevel, df::RoadClass::Class2} }; diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index cd0705a96..50cb56634 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -22,71 +22,76 @@ namespace { class HighwayClasses { - map m_map; + map m_map; public: HighwayClasses() { auto const & c = classif(); - m_map[c.GetTypeByPath({"route", "ferry"})] = ftypes::HighwayClass::Transported; - m_map[c.GetTypeByPath({"route", "shuttle_train"})] = ftypes::HighwayClass::Transported; + m_map[c.GetTypeByPath({"route", "ferry"})] = HighwayClass::Transported; + m_map[c.GetTypeByPath({"route", "shuttle_train"})] = HighwayClass::Transported; - m_map[c.GetTypeByPath({"highway", "motorway"})] = ftypes::HighwayClass::Trunk; - m_map[c.GetTypeByPath({"highway", "motorway_link"})] = ftypes::HighwayClass::Trunk; - m_map[c.GetTypeByPath({"highway", "trunk"})] = ftypes::HighwayClass::Trunk; - m_map[c.GetTypeByPath({"highway", "trunk_link"})] = ftypes::HighwayClass::Trunk; + m_map[c.GetTypeByPath({"highway", "motorway"})] = HighwayClass::Trunk; + m_map[c.GetTypeByPath({"highway", "motorway_link"})] = HighwayClass::Trunk; + m_map[c.GetTypeByPath({"highway", "trunk"})] = HighwayClass::Trunk; + m_map[c.GetTypeByPath({"highway", "trunk_link"})] = HighwayClass::Trunk; - m_map[c.GetTypeByPath({"highway", "primary"})] = ftypes::HighwayClass::Primary; - m_map[c.GetTypeByPath({"highway", "primary_link"})] = ftypes::HighwayClass::Primary; + m_map[c.GetTypeByPath({"highway", "primary"})] = HighwayClass::Primary; + m_map[c.GetTypeByPath({"highway", "primary_link"})] = HighwayClass::Primary; - m_map[c.GetTypeByPath({"highway", "secondary"})] = ftypes::HighwayClass::Secondary; - m_map[c.GetTypeByPath({"highway", "secondary_link"})] = ftypes::HighwayClass::Secondary; + m_map[c.GetTypeByPath({"highway", "secondary"})] = HighwayClass::Secondary; + m_map[c.GetTypeByPath({"highway", "secondary_link"})] = HighwayClass::Secondary; - m_map[c.GetTypeByPath({"highway", "tertiary"})] = ftypes::HighwayClass::Tertiary; - m_map[c.GetTypeByPath({"highway", "tertiary_link"})] = ftypes::HighwayClass::Tertiary; + m_map[c.GetTypeByPath({"highway", "tertiary"})] = HighwayClass::Tertiary; + m_map[c.GetTypeByPath({"highway", "tertiary_link"})] = HighwayClass::Tertiary; - m_map[c.GetTypeByPath({"highway", "unclassified"})] = ftypes::HighwayClass::LivingStreet; - m_map[c.GetTypeByPath({"highway", "residential"})] = ftypes::HighwayClass::LivingStreet; - m_map[c.GetTypeByPath({"highway", "living_street"})] = ftypes::HighwayClass::LivingStreet; - m_map[c.GetTypeByPath({"highway", "road"})] = ftypes::HighwayClass::LivingStreet; + m_map[c.GetTypeByPath({"highway", "unclassified"})] = HighwayClass::LivingStreet; + m_map[c.GetTypeByPath({"highway", "residential"})] = HighwayClass::LivingStreet; + m_map[c.GetTypeByPath({"highway", "living_street"})] = HighwayClass::LivingStreet; + m_map[c.GetTypeByPath({"highway", "road"})] = HighwayClass::LivingStreet; - m_map[c.GetTypeByPath({"highway", "service"})] = ftypes::HighwayClass::Service; - m_map[c.GetTypeByPath({"highway", "track"})] = ftypes::HighwayClass::Service; - m_map[c.GetTypeByPath({"highway", "busway"})] = ftypes::HighwayClass::Service; - m_map[c.GetTypeByPath({"man_made", "pier"})] = ftypes::HighwayClass::Service; + m_map[c.GetTypeByPath({"highway", "service"})] = HighwayClass::Service; + m_map[c.GetTypeByPath({"highway", "track"})] = HighwayClass::Service; + m_map[c.GetTypeByPath({"highway", "busway"})] = HighwayClass::Service; + m_map[c.GetTypeByPath({"man_made", "pier"})] = HighwayClass::Service; - m_map[c.GetTypeByPath({"highway", "pedestrian"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "footway"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "bridleway"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "steps"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "cycleway"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "path"})] = ftypes::HighwayClass::Pedestrian; - m_map[c.GetTypeByPath({"highway", "construction"})] = ftypes::HighwayClass::Pedestrian; + // 3-level types. + m_map[c.GetTypeByPath({"highway", "service", "driveway"})] = HighwayClass::ServiceMinor; + m_map[c.GetTypeByPath({"highway", "service", "parking_aisle"})] = HighwayClass::ServiceMinor; + + m_map[c.GetTypeByPath({"highway", "pedestrian"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "footway"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "bridleway"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "steps"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "cycleway"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "path"})] = HighwayClass::Pedestrian; + m_map[c.GetTypeByPath({"highway", "construction"})] = HighwayClass::Pedestrian; } - ftypes::HighwayClass Get(uint32_t t) const + HighwayClass Get(uint32_t t) const { auto const it = m_map.find(t); if (it == m_map.cend()) - return ftypes::HighwayClass::Undefined; + return HighwayClass::Undefined; return it->second; } }; -char const * HighwayClassToString(ftypes::HighwayClass const cls) +char const * HighwayClassToString(HighwayClass const cls) { switch (cls) { - case ftypes::HighwayClass::Undefined: return "Undefined"; - case ftypes::HighwayClass::Transported: return "Transported"; - case ftypes::HighwayClass::Trunk: return "Trunk"; - case ftypes::HighwayClass::Primary: return "Primary"; - case ftypes::HighwayClass::Secondary: return "Secondary"; - case ftypes::HighwayClass::Tertiary: return "Tertiary"; - case ftypes::HighwayClass::LivingStreet: return "LivingStreet"; - case ftypes::HighwayClass::Service: return "Service"; - case ftypes::HighwayClass::Pedestrian: return "Pedestrian"; - case ftypes::HighwayClass::Count: return "Count"; + case HighwayClass::Undefined: return "Undefined"; + case HighwayClass::Transported: return "Transported"; + case HighwayClass::Trunk: return "Trunk"; + case HighwayClass::Primary: return "Primary"; + case HighwayClass::Secondary: return "Secondary"; + case HighwayClass::Tertiary: return "Tertiary"; + case HighwayClass::LivingStreet: return "LivingStreet"; + case HighwayClass::Service: return "Service"; + case HighwayClass::ServiceMinor: return "ServiceMinor"; + case HighwayClass::Pedestrian: return "Pedestrian"; + case HighwayClass::Count: return "Count"; } ASSERT(false, ()); return ""; @@ -121,10 +126,13 @@ HighwayClass GetHighwayClass(feature::TypesHolder const & types) for (auto t : types) { - ftype::TruncValue(t, 2); - HighwayClass const hc = highwayClasses.Get(t); - if (hc != HighwayClass::Undefined) - return hc; + for (uint8_t level : {3, 2}) + { + ftype::TruncValue(t, level); + HighwayClass const hc = highwayClasses.Get(t); + if (hc != HighwayClass::Undefined) + return hc; + } } return HighwayClass::Undefined; diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 22fb1b388..c4ea6c25f 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -635,6 +635,9 @@ enum class HighwayClass Tertiary, LivingStreet, Service, + // OSM highway=service type is widely used even for _significant_ roads. + // Adding a new type to distinguish mapped driveway or parking_aisle. + ServiceMinor, Pedestrian, Transported, // Vehicles are transported by train or ferry. Count // This value is used for internals only. diff --git a/openlr/helpers.cpp b/openlr/helpers.cpp index 40a8150de..2f80fab1a 100644 --- a/openlr/helpers.cpp +++ b/openlr/helpers.cpp @@ -11,8 +11,7 @@ #include #include #include -#include -#include + namespace { @@ -29,6 +28,7 @@ openlr::FunctionalRoadClass HighwayClassToFunctionalRoadClass(ftypes::HighwayCla case ftypes::HighwayClass::Tertiary: return openlr::FunctionalRoadClass::FRC3; case ftypes::HighwayClass::LivingStreet: return openlr::FunctionalRoadClass::FRC4; case ftypes::HighwayClass::Service: return openlr::FunctionalRoadClass::FRC5; + case ftypes::HighwayClass::ServiceMinor: return openlr::FunctionalRoadClass::FRC6; default: return openlr::FunctionalRoadClass::FRC7; } } @@ -45,38 +45,42 @@ optional GetFrcScore(Graph::Edge const & e, FunctionalRoadClass functiona auto const hwClass = infoGetter.Get(e.GetFeatureId()).m_hwClass; + using ftypes::HighwayClass; + switch (functionalRoadClass) { case FunctionalRoadClass::FRC0: // Note. HighwayClass::Trunk means motorway, motorway_link, trunk or trunk_link. - return hwClass == ftypes::HighwayClass::Trunk ? optional(kMaxScoreForFrc) : nullopt; + return hwClass == HighwayClass::Trunk ? optional(kMaxScoreForFrc) : nullopt; case FunctionalRoadClass::FRC1: - return (hwClass == ftypes::HighwayClass::Trunk || hwClass == ftypes::HighwayClass::Primary) + return (hwClass == HighwayClass::Trunk || hwClass == HighwayClass::Primary) ? optional(kMaxScoreForFrc) : nullopt; case FunctionalRoadClass::FRC2: case FunctionalRoadClass::FRC3: - if (hwClass == ftypes::HighwayClass::Secondary || hwClass == ftypes::HighwayClass::Tertiary) + if (hwClass == HighwayClass::Secondary || hwClass == HighwayClass::Tertiary) return optional(kMaxScoreForFrc); - return hwClass == ftypes::HighwayClass::Primary || hwClass == ftypes::HighwayClass::LivingStreet + return hwClass == HighwayClass::Primary || hwClass == HighwayClass::LivingStreet ? optional(0) : nullopt; case FunctionalRoadClass::FRC4: - if (hwClass == ftypes::HighwayClass::LivingStreet || hwClass == ftypes::HighwayClass::Service) + if (hwClass == HighwayClass::LivingStreet || hwClass == HighwayClass::Service) return optional(kMaxScoreForFrc); - return (hwClass == ftypes::HighwayClass::Tertiary || hwClass == ftypes::HighwayClass::Secondary) + return (hwClass == HighwayClass::Tertiary || hwClass == HighwayClass::Secondary) ? optional(0) : nullopt; case FunctionalRoadClass::FRC5: case FunctionalRoadClass::FRC6: case FunctionalRoadClass::FRC7: - return hwClass == ftypes::HighwayClass::LivingStreet || hwClass == ftypes::HighwayClass::Service + return (hwClass == HighwayClass::LivingStreet || + hwClass == HighwayClass::Service || + hwClass == HighwayClass::ServiceMinor) ? optional(kMaxScoreForFrc) : nullopt; diff --git a/routing/car_directions.cpp b/routing/car_directions.cpp index aebbd08c0..92ab32f18 100644 --- a/routing/car_directions.cpp +++ b/routing/car_directions.cpp @@ -6,7 +6,6 @@ #include "geometry/angles.hpp" -#include namespace routing { @@ -175,8 +174,8 @@ bool KeepRoundaboutTurnByHighwayClass(TurnCandidates const & possibleTurns, if (t.m_segment == firstOutgoingSegment) continue; // For roundabouts of Tertiary and less significant class count every road. - // For more significant roundabouts - ignore service roads. - if (turnInfo.m_outgoing->m_highwayClass >= HighwayClass::Tertiary || t.m_highwayClass != HighwayClass::Service) + // For more significant roundabouts - ignore service roads (driveway, parking_aisle). + if (turnInfo.m_outgoing->m_highwayClass >= HighwayClass::Tertiary || t.m_highwayClass != HighwayClass::ServiceMinor) return true; } return false; @@ -303,7 +302,8 @@ bool CanDiscardTurnByHighwayClassOrAngles(CarDirection const routeDirection, continue; // If outgoing route's road is significantly larger than candidate's service road, the candidate can be ignored. - if (CalcDiffRoadClasses(outgoingRouteRoadClass, candidateRoadClass) <= kMinHighwayClassDiffForService && candidateRoadClass == HighwayClass::Service) + if (CalcDiffRoadClasses(outgoingRouteRoadClass, candidateRoadClass) <= kMinHighwayClassDiffForService && + (candidateRoadClass == HighwayClass::Service || candidateRoadClass == HighwayClass::ServiceMinor)) continue; // If igngoing and outgoing edges are not links @@ -445,7 +445,8 @@ void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingS return; // No turns are needed on transported road. - if (turnInfo.m_ingoing->m_highwayClass == HighwayClass::Transported && turnInfo.m_outgoing->m_highwayClass == HighwayClass::Transported) + if (turnInfo.m_ingoing->m_highwayClass == HighwayClass::Transported && + turnInfo.m_outgoing->m_highwayClass == HighwayClass::Transported) return; Segment firstOutgoingSeg; diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp index 42558e427..aa3792ebd 100644 --- a/routing/routing_integration_tests/turn_test.cpp +++ b/routing/routing_integration_tests/turn_test.cpp @@ -93,6 +93,8 @@ UNIT_TEST(Russia_Moscow_TrikotagniAndPohodniRoundabout_TurnTest) Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; + /// @todo Simple highway=service is now included in turns count. + /// Fix OSM on driveway/parking_aisle ? TEST_EQUAL(result, RouterResultCode::NoError, ()); integration::TestTurnCount(route, 2 /* expectedTurnCount */); @@ -1389,4 +1391,39 @@ UNIT_TEST(UK_Junction_Circular) GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::LeaveRoundAbout); } +UNIT_TEST(Integrated_TurnTest_IncludeServiceRoads) +{ + struct Sample + { + ms::LatLon start, finish; + int expectedTurns; + }; + Sample arr[] = { + // https://github.com/organicmaps/organicmaps/issues/8892 + {{50.128011, 14.7100098}, {50.1283017, 14.7119639}, 3}, + {{50.1283462, 14.7122953}, {50.1280032, 14.7099638}, 3}, + // https://github.com/organicmaps/organicmaps/issues/5888 + {{58.8428062, 5.71619759}, {58.8422583, 5.71672851}, 3}, + // https://github.com/organicmaps/organicmaps/issues/3596 + {{38.7114203, 0.0365096768}, {38.7103102, 0.0349380496}, 2}, + }; + + for (auto const & s : arr) + { + using namespace integration; + TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(s.start), {0., 0.}, + mercator::FromLatLon(s.finish)); + + Route const & route = *routeResult.first; + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + GetNthTurn(route, 0) + .TestValid() + .TestDirection(CarDirection::EnterRoundAbout) + .TestRoundAboutExitNum(s.expectedTurns); + } +} + } // namespace turn_test diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp index 7cb6a8661..705b734bd 100644 --- a/routing/turns_generator.cpp +++ b/routing/turns_generator.cpp @@ -4,7 +4,6 @@ #include "indexer/ftypes_matcher.hpp" -#include "base/stl_helpers.hpp" namespace routing { @@ -47,7 +46,8 @@ bool CanDiscardTurnByHighwayClass(std::vector const & turnCandida continue; // If route's road is significantly larger than candidate's service road, the candidate can be ignored. - if (CalcDiffRoadClasses(maxRouteRoadClass, candidateRoadClass) <= kMinHighwayClassDiffForService && candidateRoadClass == HighwayClass::Service) + if (CalcDiffRoadClasses(maxRouteRoadClass, candidateRoadClass) <= kMinHighwayClassDiffForService && + (candidateRoadClass == HighwayClass::Service || candidateRoadClass == HighwayClass::ServiceMinor)) continue; return false; diff --git a/routing/turns_generator_utils.cpp b/routing/turns_generator_utils.cpp index 5ce66a1b0..5c5ce8306 100644 --- a/routing/turns_generator_utils.cpp +++ b/routing/turns_generator_utils.cpp @@ -1,8 +1,11 @@ #include "routing/turns_generator_utils.hpp" -#include "platform/measurement_utils.hpp" -#include "geometry/mercator.hpp" #include "routing/turns.hpp" +#include "platform/measurement_utils.hpp" + +#include "geometry/mercator.hpp" + + namespace routing { namespace turns @@ -19,7 +22,9 @@ bool IsHighway(HighwayClass hwClass, bool isLink) bool IsSmallRoad(HighwayClass hwClass) { return hwClass == HighwayClass::LivingStreet || - hwClass == HighwayClass::Service || hwClass == HighwayClass::Pedestrian; + hwClass == HighwayClass::Service || + hwClass == HighwayClass::ServiceMinor || + hwClass == HighwayClass::Pedestrian; } int CalcDiffRoadClasses(HighwayClass const left, HighwayClass const right) @@ -120,7 +125,8 @@ double CalcEstimatedTimeToPass(double const distanceMeters, HighwayClass const h case HighwayClass::Secondary: speedKmph = 70.0; break; case HighwayClass::Tertiary: speedKmph = 50.0; break; case HighwayClass::LivingStreet: speedKmph = 20.0; break; - case HighwayClass::Service: speedKmph = 10.0; break; + case HighwayClass::Service: + case HighwayClass::ServiceMinor: speedKmph = 10.0; break; case HighwayClass::Pedestrian: speedKmph = 5.0; break; default: speedKmph = 50.0; break; } From e65ab6e4589369b9ab13bb8cbdb1761427e21394 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Tue, 8 Jul 2025 18:38:28 +0200 Subject: [PATCH 170/222] Update gitignore Signed-off-by: Andrei Shkrob --- .gitignore | 6 +- data/routing_statistics.log | 1673 ----------------------------------- 2 files changed, 2 insertions(+), 1677 deletions(-) delete mode 100644 data/routing_statistics.log diff --git a/.gitignore b/.gitignore index 7a614e71b..8910d4ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,7 @@ stxxl.errlog stxxl.log screenlog.0 -data/styles/*/*/out/* -data/resources-*_design/* +data/resources-*_design # symbols png/sdf are now generated at build data/resources-*_*/symbols.png data/resources-*_*/symbols.sdf @@ -53,8 +52,7 @@ omim.sdf *.rc !qt/res/windows.rc *.pdb -out/* -qt/mapswithme.log +out/ # XCode xcode/keys/* diff --git a/data/routing_statistics.log b/data/routing_statistics.log deleted file mode 100644 index 3def0649d..000000000 --- a/data/routing_statistics.log +++ /dev/null @@ -1,1673 +0,0 @@ -LOG TID(1) INFO 1.0997e-05 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 13:36:50 Routing_CalculatingRoute [ distance=41976.2 elapsed=2.00894 finalLat=-27.05933 finalLon=-48.95868 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-26.89112 startLon=-48.71376 ] -LOG TID(1) INFO 0.0798171 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:37:48 Routing_CalculatingRoute [ distance=47361.9 elapsed=0.354524 finalLat=14.76492 finalLon=-60.90752 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 0.157817 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:37:55 Routing_CalculatingRoute [ distance=17200 elapsed=0.094743 finalLat=14.57433 finalLon=-60.9719 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 0.185396 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:38:01 Routing_CalculatingRoute [ distance=10143.1 elapsed=0.088623 finalLat=14.52767 finalLon=-60.97879 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 0.216765 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 14:41:58 Routing_CalculatingRoute [ distance=25860.6 elapsed=1.19462 finalLat=7.9978 finalLon=-76.63799 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.259312 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:47:15 Routing_CalculatingRoute [ distance=973088 elapsed=11.6571 finalLat=5.33568 finalLon=-72.39371 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.386033 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:47:20 Routing_CalculatingRoute [ distance=535309 elapsed=3.22384 finalLat=5.06459 finalLon=-75.49924 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.466887 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:47:31 Routing_CalculatingRoute [ distance=535309 elapsed=3.83996 finalLat=5.06459 finalLon=-75.49924 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.537392 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:48:10 Routing_CalculatingRoute [ distance=787062 elapsed=9.13377 finalLat=4.59805 finalLon=-74.07608 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.672078 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:48:27 Routing_CalculatingRoute [ distance=827139 elapsed=7.20203 finalLat=5.71483 finalLon=-72.92792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.13196 startLon=-76.71485 ] -LOG TID(1) INFO 0.78081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 14:53:43 Routing_CalculatingRoute [ distance=15730.1 elapsed=1.94487 finalLat=34.5103 finalLon=45.70645 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46369 startLon=45.86078 ] -LOG TID(1) INFO 0.866951 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:12 Routing_CalculatingRoute [ distance=24035.1 elapsed=0.208928 finalLat=5.20646 finalLon=103.20524 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.01963 startLon=103.30187 ] -LOG TID(1) INFO 0.926316 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:58:12 Routing_CalculatingRoute [ distance=10333.5 elapsed=0.0404968 finalLat=12.11893 finalLon=-68.96586 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.08724 startLon=-68.89935 ] -LOG TID(1) INFO 0.960952 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:58:18 Routing_CalculatingRoute [ distance=10333.5 elapsed=0.046765 finalLat=12.11893 finalLon=-68.96586 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.08724 startLon=-68.89935 ] -LOG TID(1) INFO 0.978028 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:37:48 Routing_CalculatingRoute [ distance=47361.9 elapsed=0.354524 finalLat=14.76492 finalLon=-60.90752 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 1.01932 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:37:55 Routing_CalculatingRoute [ distance=17200 elapsed=0.094743 finalLat=14.57433 finalLon=-60.9719 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 1.0463 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:38:01 Routing_CalculatingRoute [ distance=10143.1 elapsed=0.088623 finalLat=14.52767 finalLon=-60.97879 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.46643 startLon=-60.93978 ] -LOG TID(1) INFO 1.07701 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:19:56 Routing_CalculatingRoute [ distance=12514 elapsed=0.0670612 finalLat=12.15746 finalLon=-68.94665 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.08723 startLon=-68.8993 ] -LOG TID(1) INFO 1.09838 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 14:46:34 Routing_CalculatingRoute [ distance=23174.2 elapsed=0.465553 finalLat=47.14588 finalLon=39.57092 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.10211 startLon=39.42935 ] -LOG TID(1) INFO 1.14743 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:35:51 Routing_CalculatingRoute [ distance=24943.1 elapsed=0.61886 finalLat=47.13748 finalLon=39.74587 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.14913 startLon=39.56306 ] -LOG TID(1) INFO 1.21977 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 16:44:10 Routing_CalculatingRoute [ distance=17156.9 elapsed=0.40423 finalLat=47.19704 finalLon=39.61368 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.13664 startLon=39.74399 ] -LOG TID(1) INFO 1.29024 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:44:25 Routing_CalculatingRoute [ distance=15403.5 elapsed=0.897655 finalLat=47.20492 finalLon=39.76823 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.26815 startLon=39.82012 ] -LOG TID(1) INFO 1.36782 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:20:20 Routing_CalculatingRoute [ distance=20531.2 elapsed=0.726359 finalLat=47.28135 finalLon=39.75981 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.20586 startLon=39.60719 ] -LOG TID(1) INFO 1.46088 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:05:19 Routing_CalculatingRoute [ distance=29440.6 elapsed=0.9539 finalLat=-19.93843 finalLon=-43.93478 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-19.96695 startLon=-44.1791 ] -LOG TID(1) INFO 1.63029 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:20:03 Routing_CalculatingRoute [ distance=17150.9 elapsed=1.41922 finalLat=25.27544 finalLon=55.30362 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.34336 startLon=55.39684 ] -LOG TID(1) INFO 1.74816 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:20:11 Routing_CalculatingRoute [ distance=17150.9 elapsed=0.482123 finalLat=25.27544 finalLon=55.30362 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.34336 startLon=55.39684 ] -LOG TID(1) INFO 1.79242 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:22:31 Routing_CalculatingRoute [ distance=16623 elapsed=1.47 finalLat=25.27544 finalLon=55.30362 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.34594 startLon=55.39786 ] -LOG TID(1) INFO 1.83508 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 13:06:28 Routing_CalculatingRoute [ distance=15852.4 elapsed=1.40667 finalLat=25.34524 finalLon=55.39917 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.27574 startLon=55.30307 ] -LOG TID(1) INFO 1.87877 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 13:11:57 Routing_CalculatingRoute [ distance=10790.4 elapsed=0.568421 finalLat=25.2652 finalLon=55.39181 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.27096 startLon=55.30755 ] -LOG TID(1) INFO 1.92626 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:24:50 Routing_CalculatingRoute [ distance=17205.9 elapsed=0.3515 finalLat=-41.45848 finalLon=-72.94783 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-41.32434 startLon=-72.9852 ] -LOG TID(1) INFO 1.99149 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 13:14:22 Routing_CalculatingRoute [ distance=33360.9 elapsed=0.150943 finalLat=31.72181 finalLon=35.99626 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.91356 startLon=35.85884 ] -LOG TID(1) INFO 2.03167 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 12:32:32 Routing_CalculatingRoute [ distance=20924 elapsed=0.986992 finalLat=34.33433 finalLon=45.96923 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46095 startLon=45.85968 ] -LOG TID(1) INFO 2.10414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 15:30:15 Routing_CalculatingRoute [ distance=34833.1 elapsed=3.22005 finalLat=33.58466 finalLon=-7.6327 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.41775 startLon=-7.85297 ] -LOG TID(1) INFO 2.17949 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 15:32:24 Routing_CalculatingRoute [ distance=34794.7 elapsed=1.3033 finalLat=33.58466 finalLon=-7.6327 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.4178 startLon=-7.85295 ] -LOG TID(1) INFO 2.22734 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 15:33:35 Routing_CalculatingRoute [ distance=42493.4 elapsed=1.4815 finalLat=33.59276 finalLon=-7.53048 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.4178 startLon=-7.85296 ] -LOG TID(1) INFO 2.28141 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 09:49:24 Routing_CalculatingRoute [ distance=65659.1 elapsed=14.7105 finalLat=55.84663 finalLon=37.17506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.75131 startLon=37.92149 ] -LOG TID(1) INFO 2.43569 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 11:26:24 Routing_CalculatingRoute [ distance=14360 elapsed=11.4409 finalLat=55.84663 finalLon=37.17506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.82829 startLon=37.36885 ] -LOG TID(1) INFO 2.59672 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:32:11 Routing_CalculatingRoute [ distance=38363.8 elapsed=14.9103 finalLat=55.89258 finalLon=37.66968 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.84831 startLon=37.18834 ] -LOG TID(1) INFO 2.78171 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:17:32 Routing_CalculatingRoute [ distance=27647.5 elapsed=11.7224 finalLat=55.64402 finalLon=37.3508 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.82845 startLon=37.36988 ] -LOG TID(1) INFO 2.96164 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 11-Sep-2015 05:05:35 Routing_CalculatingRoute [ distance=117493 elapsed=1.5961 finalLat=10.22839 finalLon=-64.63373 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.05633 startLon=-65.33593 ] -LOG TID(1) INFO 3.0462 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 13:33:27 Routing_CalculatingRoute [ distance=85474.9 elapsed=1.85532 finalLat=52.72647 finalLon=12.22544 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.41165 startLon=12.97368 ] -LOG TID(1) INFO 3.11496 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 13:46:49 Routing_CalculatingRoute [ distance=72128.7 elapsed=1.5654 finalLat=52.72647 finalLon=12.22544 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.49419 startLon=12.96261 ] -LOG TID(1) INFO 3.16928 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 13:46:49 Routing_CalculatingRoute [ distance=72098 elapsed=0.310395 finalLat=52.72647 finalLon=12.22544 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.49447 startLon=12.96256 ] -LOG TID(1) INFO 3.22234 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 14:23:30 Routing_CalculatingRoute [ distance=30052.4 elapsed=0.491363 finalLat=52.72647 finalLon=12.22544 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.72318 startLon=12.58781 ] -LOG TID(1) INFO 3.26872 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 12:02:19 Routing_CalculatingRoute [ distance=86052.3 elapsed=0.687042 finalLat=52.40748 finalLon=12.97775 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.73333 startLon=12.21139 ] -LOG TID(1) INFO 3.34555 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 17:36:52 Routing_CalculatingRoute [ distance=16875.7 elapsed=6.53711 finalLat=42.2632 finalLon=3.17554 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.29243 startLon=3.27733 ] -LOG TID(1) INFO 3.60576 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 17:38:09 Routing_CalculatingRoute [ distance=16994.7 elapsed=5.50703 finalLat=42.2632 finalLon=3.17554 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.29307 startLon=3.27819 ] -LOG TID(1) INFO 3.96752 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:02:39 Routing_CalculatingRoute [ distance=569187 elapsed=3.36344 finalLat=16.59031 finalLon=79.31784 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.92542 startLon=77.59702 ] -LOG TID(1) INFO 4.35088 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:04 Routing_CalculatingRoute [ distance=15030.3 elapsed=0.990121 finalLat=48.90279 finalLon=2.37201 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.9228 startLon=2.5368 ] -LOG TID(1) INFO 4.53905 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:58:44 Routing_CalculatingRoute [ distance=54476.8 elapsed=1.02649 finalLat=-0.78315 finalLon=-80.51658 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-0.46354 startLon=-80.45474 ] -LOG TID(1) INFO 4.59203 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:33:07 Routing_CalculatingRoute [ distance=10131.4 elapsed=6.13257 finalLat=19.60566 finalLon=-99.22516 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.60389 startLon=-99.22389 ] -LOG TID(1) INFO 4.73149 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:33:15 Routing_CalculatingRoute [ distance=10135.3 elapsed=5.95675 finalLat=19.60566 finalLon=-99.22516 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.6039 startLon=-99.22394 ] -LOG TID(1) INFO 4.91301 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Aug-2015 01:29:27 Routing_CalculatingRoute [ distance=267107 elapsed=0.701874 finalLat=-1.67314 finalLon=-78.64866 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=-2.9225 startLon=-78.91391 ] -LOG TID(1) INFO 5.0279 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 19:56:13 Routing_CalculatingRoute [ distance=29397 elapsed=1.93283 finalLat=10.60732 finalLon=106.67243 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.83266 startLon=106.67803 ] -LOG TID(1) INFO 5.11158 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:39:04 Routing_CalculatingRoute [ distance=12879.2 elapsed=2.09464 finalLat=48.88566 finalLon=2.34255 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.83552 startLon=2.24938 ] -LOG TID(1) INFO 5.22642 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:41:19 Routing_CalculatingRoute [ distance=22730.6 elapsed=0.346502 finalLat=31.99958 finalLon=34.87126 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.06453 startLon=34.76463 ] -LOG TID(1) INFO 5.28604 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:53:17 Routing_CalculatingRoute [ distance=17241.3 elapsed=0.194324 finalLat=32.00043 finalLon=34.87045 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.03515 startLon=34.79753 ] -LOG TID(1) INFO 5.32025 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:31:11 Routing_CalculatingRoute [ distance=30920.9 elapsed=0.415048 finalLat=53.39074 finalLon=-6.56648 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.42733 startLon=-6.21557 ] -LOG TID(1) INFO 5.393 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:50:59 Routing_CalculatingRoute [ distance=10034.4 elapsed=0.39285 finalLat=53.39074 finalLon=-6.56648 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.36119 startLon=-6.45567 ] -LOG TID(1) INFO 5.46098 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:27:08 Routing_CalculatingRoute [ distance=297003 elapsed=2.37022 finalLat=-14.06397 finalLon=-75.72905 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-12.13161 startLon=-76.97833 ] -LOG TID(1) INFO 5.55355 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:01:33 Routing_CalculatingRoute [ distance=43740.7 elapsed=1.24462 finalLat=34.02236 finalLon=-6.83904 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.23154 startLon=-6.57714 ] -LOG TID(1) INFO 5.61544 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:45:31 Routing_CalculatingRoute [ distance=345301 elapsed=1.72138 finalLat=32.26052 finalLon=3.62591 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.69187 startLon=3.25328 ] -LOG TID(1) INFO 5.70648 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:32:21 Routing_CalculatingRoute [ distance=409468 elapsed=0.752049 finalLat=33.81579 finalLon=-84.33327 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.00712 startLon=-81.10258 ] -LOG TID(1) INFO 5.81611 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:15 Routing_CalculatingRoute [ distance=203198 elapsed=1.8984 finalLat=50.67375 finalLon=-114.27943 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.69062 startLon=-112.81983 ] -LOG TID(1) INFO 5.91318 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:21:58 Routing_CalculatingRoute [ distance=43513.4 elapsed=2.95864 finalLat=28.73122 finalLon=-13.86001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.38945 startLon=-13.86306 ] -LOG TID(1) INFO 6.19135 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:43 Routing_CalculatingRoute [ distance=84803.5 elapsed=2.04335 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.4341 ] -LOG TID(1) INFO 6.5326 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:55:14 Routing_CalculatingRoute [ distance=44151.1 elapsed=0.436468 finalLat=25.77304 finalLon=-100.303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.74841 startLon=-99.98185 ] -LOG TID(1) INFO 6.7357 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:55:27 Routing_CalculatingRoute [ distance=44151.1 elapsed=0.498424 finalLat=25.77304 finalLon=-100.303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.74841 startLon=-99.98185 ] -LOG TID(1) INFO 6.91748 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:55:33 Routing_CalculatingRoute [ distance=44151.1 elapsed=0.404507 finalLat=25.77304 finalLon=-100.303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.74841 startLon=-99.98185 ] -LOG TID(1) INFO 7.10815 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:54 Routing_CalculatingRoute [ distance=84803 elapsed=2.96272 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.43409 ] -LOG TID(1) INFO 7.37622 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:54 Routing_CalculatingRoute [ distance=84803 elapsed=2.96272 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.43409 ] -LOG TID(1) INFO 7.63823 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:54 Routing_CalculatingRoute [ distance=84803 elapsed=2.96272 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.43409 ] -LOG TID(1) INFO 7.89989 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:48:25 Routing_CalculatingRoute [ distance=44192.8 elapsed=0.225382 finalLat=53.18971 finalLon=63.6419 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.96541 startLon=63.15864 ] -LOG TID(1) INFO 8.00235 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:59:46 Routing_CalculatingRoute [ distance=723165 elapsed=0.43772 finalLat=51.16202 finalLon=71.3995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.00887 startLon=63.29842 ] -LOG TID(1) INFO 8.05351 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 02:06:38 Routing_CalculatingRoute [ distance=15272.7 elapsed=0.421071 finalLat=36.1565 finalLon=-115.13641 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.04146 startLon=-115.12333 ] -LOG TID(1) INFO 8.09874 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:16 Routing_CalculatingRoute [ distance=12939.8 elapsed=2.17045 finalLat=-25.535 finalLon=-49.25484 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.46041 startLon=-49.29422 ] -LOG TID(1) INFO 8.21375 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:23 Routing_CalculatingRoute [ distance=12939.9 elapsed=0.928952 finalLat=-25.535 finalLon=-49.25484 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.46041 startLon=-49.29422 ] -LOG TID(1) INFO 8.33058 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 07:43:17 Routing_CalculatingRoute [ distance=70072 elapsed=0.887936 finalLat=48.13329 finalLon=8.23333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.23307 startLon=7.71464 ] -LOG TID(1) INFO 8.49097 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 07:53:01 Routing_CalculatingRoute [ distance=62370.7 elapsed=0.938248 finalLat=48.1333 finalLon=8.23333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.20237 startLon=7.77958 ] -LOG TID(1) INFO 8.64729 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 08:15:42 Routing_CalculatingRoute [ distance=43531.9 elapsed=0.780379 finalLat=48.13329 finalLon=8.23333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.23115 startLon=7.98376 ] -LOG TID(1) INFO 8.79437 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 11:39:21 Routing_CalculatingRoute [ distance=29860.3 elapsed=0.702215 finalLat=48.29857 finalLon=8.2226 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.1017 startLon=8.22549 ] -LOG TID(1) INFO 8.9381 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 22:35:10 Routing_CalculatingRoute [ distance=24058 elapsed=22.1972 finalLat=28.6669 finalLon=77.229 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.55569 startLon=77.08621 ] -LOG TID(1) INFO 9.16168 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 22:43:39 Routing_CalculatingRoute [ distance=20819.6 elapsed=5.00202 finalLat=28.64192 finalLon=77.22175 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.55565 startLon=77.0858 ] -LOG TID(1) INFO 9.43014 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:22:56 Routing_CalculatingRoute [ distance=25798.9 elapsed=3.09125 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 9.57628 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:23:01 Routing_CalculatingRoute [ distance=25798.9 elapsed=2.80445 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 9.66123 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:23:08 Routing_CalculatingRoute [ distance=25798.9 elapsed=4.03789 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 9.74765 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:23:12 Routing_CalculatingRoute [ distance=25798.9 elapsed=3.35035 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 9.83577 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:23:19 Routing_CalculatingRoute [ distance=25798.9 elapsed=2.82788 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 9.92462 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 15:23:23 Routing_CalculatingRoute [ distance=25798.9 elapsed=2.61753 finalLat=37.02293 finalLon=-8.99656 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=37.06678 startLon=-8.80877 ] -LOG TID(1) INFO 10.016 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:37:13 Routing_CalculatingRoute [ distance=445852 elapsed=2.12794 finalLat=45.42104 finalLon=-75.69004 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.70415 startLon=-79.42483 ] -LOG TID(1) INFO 10.1498 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:05:58 Routing_CalculatingRoute [ distance=287062 elapsed=0.200447 finalLat=9.93256 finalLon=-84.07956 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.21146 startLon=-85.6112 ] -LOG TID(1) INFO 10.2145 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:08:04 Routing_CalculatingRoute [ distance=18258.9 elapsed=1.91236 finalLat=49.97454 finalLon=20.60537 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.96233 startLon=20.37166 ] -LOG TID(1) INFO 10.3656 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 22:13:56 Routing_CalculatingRoute [ distance=424089 elapsed=1.69672 finalLat=35.70326 finalLon=-0.64929 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.72769 startLon=3.2242 ] -LOG TID(1) INFO 10.5126 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Sep-2015 17:38:44 Routing_CalculatingRoute [ distance=278130 elapsed=1.53169 finalLat=35.61868 finalLon=-0.57984 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.16628 startLon=1.79686 ] -LOG TID(1) INFO 10.5937 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Sep-2015 18:05:41 Routing_CalculatingRoute [ distance=203809 elapsed=1.24796 finalLat=35.61868 finalLon=-0.57984 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.12895 startLon=1.35518 ] -LOG TID(1) INFO 10.659 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:14:35 Routing_CalculatingRoute [ distance=16498.6 elapsed=0.252176 finalLat=32.07017 finalLon=34.767 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.13931 startLon=34.81014 ] -LOG TID(1) INFO 10.7181 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:14:58 Routing_CalculatingRoute [ distance=12961.9 elapsed=0.0667976 finalLat=32.07017 finalLon=34.767 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.16205 startLon=34.80868 ] -LOG TID(1) INFO 10.7567 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Sep-2015 07:06:00 Routing_CalculatingRoute [ distance=33877 elapsed=0.476812 finalLat=45.81492 finalLon=28.50315 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.92085 startLon=28.19412 ] -LOG TID(1) INFO 10.7823 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Sep-2015 07:17:16 Routing_CalculatingRoute [ distance=34127.2 elapsed=0.565054 finalLat=45.81492 finalLon=28.50315 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.92052 startLon=28.19451 ] -LOG TID(1) INFO 10.8045 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Sep-2015 12:34:31 Routing_CalculatingRoute [ distance=25148.7 elapsed=0.793449 finalLat=45.9035 finalLon=28.67559 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.81507 startLon=28.51352 ] -LOG TID(1) INFO 10.828 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 09:59:21 Routing_CalculatingRoute [ distance=68303.7 elapsed=2.21773 finalLat=45.77955 finalLon=28.62359 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.92005 startLon=28.19381 ] -LOG TID(1) INFO 10.8548 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 14:39:24 Routing_CalculatingRoute [ distance=53743 elapsed=0.573826 finalLat=45.91484 finalLon=28.19438 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.85983 startLon=28.69233 ] -LOG TID(1) INFO 10.8819 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:47:40 Routing_CalculatingRoute [ distance=51753.3 elapsed=1.7271 finalLat=20.7961 finalLon=-102.73444 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00002 startLat=20.79606 startLon=-102.73444 ] -LOG TID(1) INFO 11.0137 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:15 Routing_CalculatingRoute [ distance=18377.9 elapsed=2.44731 finalLat=59.94806 finalLon=30.23682 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.83537 startLon=30.3504 ] -LOG TID(1) INFO 11.1808 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:11 Routing_CalculatingRoute [ distance=139958 elapsed=1.29513 finalLat=59.20314 finalLon=39.91158 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.10763 startLon=37.90516 ] -LOG TID(1) INFO 11.2845 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 12:53:31 Routing_CalculatingRoute [ distance=304922 elapsed=8.99644 finalLat=38.23911 finalLon=-1.41897 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.23304 startLon=0.21993 ] -LOG TID(1) INFO 11.568 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 12:55:51 Routing_CalculatingRoute [ distance=304922 elapsed=5.08929 finalLat=38.23911 finalLon=-1.41897 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.23304 startLon=0.21993 ] -LOG TID(1) INFO 11.9338 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Sep-2015 15:56:46 Routing_CalculatingRoute [ distance=968088 elapsed=1.96786 finalLat=36.28485 finalLon=7.95155 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.26273 startLon=3.64222 ] -LOG TID(1) INFO 12.1555 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Sep-2015 16:11:36 Routing_CalculatingRoute [ distance=936574 elapsed=6.49474 finalLat=36.28485 finalLon=7.95155 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.26267 startLon=3.64223 ] -LOG TID(1) INFO 12.2775 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 12:53:31 Routing_CalculatingRoute [ distance=304922 elapsed=8.99644 finalLat=38.23911 finalLon=-1.41897 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.23304 startLon=0.21993 ] -LOG TID(1) INFO 12.5494 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 11:43:21 Routing_CalculatingRoute [ distance=11517.7 elapsed=1.99477 finalLat=59.95184 finalLon=30.30328 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.87138 startLon=30.36559 ] -LOG TID(1) INFO 12.7683 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 11:43:23 Routing_CalculatingRoute [ distance=11517.7 elapsed=1.57867 finalLat=59.95184 finalLon=30.30328 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.87138 startLon=30.36559 ] -LOG TID(1) INFO 12.8872 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:09:45 Routing_CalculatingRoute [ distance=309436 elapsed=0.197631 finalLat=22.93555 finalLon=57.76194 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.58871 startLon=59.44089 ] -LOG TID(1) INFO 12.9439 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:58:35 Routing_CalculatingRoute [ distance=250395 elapsed=4.27316 finalLat=49.8161 finalLon=23.98323 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.42315 startLon=26.97645 ] -LOG TID(1) INFO 13.0903 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:12 Routing_CalculatingRoute [ distance=240219 elapsed=1.99734 finalLat=49.83811 finalLon=24.03139 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.42315 startLon=26.97644 ] -LOG TID(1) INFO 13.2719 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:54 Routing_CalculatingRoute [ distance=84803 elapsed=2.96272 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.43409 ] -LOG TID(1) INFO 13.52 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 01:15:03 Routing_CalculatingRoute [ distance=403918 elapsed=3.06948 finalLat=38.07402 finalLon=-122.83951 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.26637 startLon=-121.26156 ] -LOG TID(1) INFO 13.7522 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 19:20:02 Routing_CalculatingRoute [ distance=115143 elapsed=2.64387 finalLat=39.72425 finalLon=-121.81772 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.43778 startLon=-121.53408 ] -LOG TID(1) INFO 13.9691 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 14:07:25 Routing_CalculatingRoute [ distance=13789.4 elapsed=4.5432 finalLat=45.48038 finalLon=9.24282 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.55346 startLon=9.3378 ] -LOG TID(1) INFO 14.3512 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:16:53 Routing_CalculatingRoute [ distance=15499.6 elapsed=4.1365 finalLat=45.5807 finalLon=9.22732 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.54845 startLon=9.33044 ] -LOG TID(1) INFO 14.8168 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:55:08 Routing_CalculatingRoute [ distance=13490.9 elapsed=3.67772 finalLat=45.54734 finalLon=9.3242 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.58034 startLon=9.22571 ] -LOG TID(1) INFO 15.2461 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 07:01:09 Routing_CalculatingRoute [ distance=32367.1 elapsed=4.19657 finalLat=45.45665 finalLon=8.86885 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.47222 startLon=9.1338 ] -LOG TID(1) INFO 15.7019 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:54 Routing_CalculatingRoute [ distance=84803 elapsed=2.96272 finalLat=51.96605 finalLon=6.5015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5219 startLon=6.43409 ] -LOG TID(1) INFO 16.0513 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:16:25 Routing_CalculatingRoute [ distance=19294.8 elapsed=1.06583 finalLat=26.49684 finalLon=127.89547 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.59373 startLon=127.97023 ] -LOG TID(1) INFO 16.2447 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 21:58:30 Routing_CalculatingRoute [ distance=14366.6 elapsed=2.28046 finalLat=3.04277 finalLon=101.79871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=3.11744 startLon=101.72376 ] -LOG TID(1) INFO 16.364 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:05:55 Routing_CalculatingRoute [ distance=162482 elapsed=1.11824 finalLat=25.28876 finalLon=55.38167 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.10084 startLon=55.75929 ] -LOG TID(1) INFO 16.4324 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:01:44 Routing_CalculatingRoute [ distance=44910.1 elapsed=0.150033 finalLat=-0.58963 finalLon=-80.40845 name=vehicle result=NoError startDirectionX=0.00032 startDirectionY=0 startLat=-0.70277 startLon=-80.10957 ] -LOG TID(1) INFO 16.4754 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:12:42 Routing_CalculatingRoute [ distance=116199 elapsed=0.34779 finalLat=45.74822 finalLon=-73.46744 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.39486 startLon=-72.70628 ] -LOG TID(1) INFO 16.5457 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:59:52 Routing_CalculatingRoute [ distance=12589 elapsed=0.695284 finalLat=-22.90392 finalLon=-43.17606 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.98335 startLon=-43.19083 ] -LOG TID(1) INFO 16.707 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:58:58 Routing_CalculatingRoute [ distance=176835 elapsed=1.16625 finalLat=47.29968 finalLon=-96.51535 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.79634 startLon=-96.49177 ] -LOG TID(1) INFO 16.8431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:49 Routing_CalculatingRoute [ distance=317525 elapsed=0.372668 finalLat=44.878 finalLon=-93.21878 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.79637 startLon=-96.49172 ] -LOG TID(1) INFO 16.9327 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:26:23 Routing_CalculatingRoute [ distance=94754.1 elapsed=0.448521 finalLat=14.73611 finalLon=-91.15746 name=vehicle result=NoError startDirectionX=0.00048 startDirectionY=0 startLat=14.87124 startLon=-91.61944 ] -LOG TID(1) INFO 16.9885 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 20:05:04 Routing_CalculatingRoute [ distance=120150 elapsed=0.932927 finalLat=14.83844 finalLon=-91.50959 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43339 startLon=-91.73729 ] -LOG TID(1) INFO 17.0162 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 20:05:56 Routing_CalculatingRoute [ distance=120362 elapsed=0.355713 finalLat=14.85896 finalLon=-91.51837 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43339 startLon=-91.73729 ] -LOG TID(1) INFO 17.0514 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:57:59 Routing_CalculatingRoute [ distance=706104 elapsed=4.71072 finalLat=45.43384 finalLon=28.05494 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.20381 startLon=21.06745 ] -LOG TID(1) INFO 17.1896 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:24:49 Routing_CalculatingRoute [ distance=636586 elapsed=5.80814 finalLat=45.61817 finalLon=27.54279 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.1806 startLon=21.32129 ] -LOG TID(1) INFO 17.3286 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:05:34 Routing_CalculatingRoute [ distance=680902 elapsed=5.35773 finalLat=45.43384 finalLon=28.05494 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.17911 startLon=21.34888 ] -LOG TID(1) INFO 17.5156 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:39:46 Routing_CalculatingRoute [ distance=19082.1 elapsed=1.33318 finalLat=46.68139 finalLon=7.86215 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.62449 startLon=8.03379 ] -LOG TID(1) INFO 17.6417 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:45 Routing_CalculatingRoute [ distance=310572 elapsed=10.2446 finalLat=51.68714 finalLon=-0.2218 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.53508 startLon=-2.3827 ] -LOG TID(1) INFO 17.9653 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 21:12:46 Routing_CalculatingRoute [ distance=10266 elapsed=1.01692 finalLat=-16.65573 finalLon=-49.25867 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.71552 startLon=-49.28387 ] -LOG TID(1) INFO 18.1615 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:31:29 Routing_CalculatingRoute [ distance=65168.2 elapsed=0.836121 finalLat=52.3168 finalLon=14.58895 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.32147 startLon=15.51138 ] -LOG TID(1) INFO 18.3473 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:14:33 Routing_CalculatingRoute [ distance=88328.8 elapsed=0.300613 finalLat=52.51705 finalLon=13.38888 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.3204 startLon=14.4159 ] -LOG TID(1) INFO 18.4868 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:16 Routing_CalculatingRoute [ distance=152608 elapsed=0.990578 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 18.77 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:14 Routing_CalculatingRoute [ distance=183571 elapsed=1.16549 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 18.8665 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:44 Routing_CalculatingRoute [ distance=183571 elapsed=0.981242 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 18.9596 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:16 Routing_CalculatingRoute [ distance=183571 elapsed=0.745444 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 19.0547 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:49 Routing_CalculatingRoute [ distance=183571 elapsed=0.683333 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 19.1487 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:26 Routing_CalculatingRoute [ distance=183571 elapsed=0.688986 finalLat=-33.03616 finalLon=27.8099 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=-32.58069 startLon=26.91088 ] -LOG TID(1) INFO 19.2458 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:54 Routing_CalculatingRoute [ distance=18645.7 elapsed=0.191596 finalLat=46.14792 finalLon=14.36769 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.07368 startLon=14.54042 ] -LOG TID(1) INFO 19.3117 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:57:30 Routing_CalculatingRoute [ distance=475478 elapsed=22.9807 finalLat=-23.52349 finalLon=-46.84067 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-19.75965 startLon=-47.8927 ] -LOG TID(1) INFO 19.4911 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:46:28 Routing_CalculatingRoute [ distance=474706 elapsed=78.1719 finalLat=-23.52349 finalLon=-46.84067 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-19.74728 startLon=-47.89572 ] -LOG TID(1) INFO 19.7227 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:35:35 Routing_CalculatingRoute [ distance=158082 elapsed=47.4635 finalLat=-23.52349 finalLon=-46.84067 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.49893 startLon=-47.42892 ] -LOG TID(1) INFO 19.9234 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:44:06 Routing_CalculatingRoute [ distance=53380.2 elapsed=28.1097 finalLat=-23.53678 finalLon=-46.82354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-23.17534 startLon=-46.93695 ] -LOG TID(1) INFO 20.1337 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:40 Routing_CalculatingRoute [ distance=277985 elapsed=0.943964 finalLat=10.64688 finalLon=107.24376 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.94797 startLon=108.44067 ] -LOG TID(1) INFO 20.2431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:37:23 Routing_CalculatingRoute [ distance=154709 elapsed=1.25803 finalLat=52.40115 finalLon=-1.56825 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.83762 startLon=0.15106 ] -LOG TID(1) INFO 20.6462 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 14:27:02 Routing_CalculatingRoute [ distance=15631.6 elapsed=1.70158 finalLat=42.89563 finalLon=47.63231 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.96436 startLon=47.49852 ] -LOG TID(1) INFO 20.9139 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 14:39:22 Routing_CalculatingRoute [ distance=10539 elapsed=1.34148 finalLat=42.89563 finalLon=47.63231 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.9484 startLon=47.55216 ] -LOG TID(1) INFO 20.9393 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 18:28:35 Routing_CalculatingRoute [ distance=21965.6 elapsed=1.63967 finalLat=42.98399 finalLon=47.47514 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.86718 startLon=47.64927 ] -LOG TID(1) INFO 20.9922 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:21:22 Routing_CalculatingRoute [ distance=13368 elapsed=1.07778 finalLat=12.12428 finalLon=-86.29838 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.11777 startLon=-86.2026 ] -LOG TID(1) INFO 21.0422 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:38 Routing_CalculatingRoute [ distance=116291 elapsed=0.379425 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.23591 startLon=30.80758 ] -LOG TID(1) INFO 21.2269 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:46 Routing_CalculatingRoute [ distance=116291 elapsed=0.355072 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.23591 startLon=30.80758 ] -LOG TID(1) INFO 21.2675 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:10 Routing_CalculatingRoute [ distance=116291 elapsed=0.632812 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=29.2359 startLon=30.80758 ] -LOG TID(1) INFO 21.3102 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:34:36 Routing_CalculatingRoute [ distance=1.00482e+06 elapsed=4.81158 finalLat=-15.65158 finalLon=-56.10063 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.83012 startLon=-54.68431 ] -LOG TID(1) INFO 21.4219 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:53:11 Routing_CalculatingRoute [ distance=274760 elapsed=4.54742 finalLat=-20.47054 finalLon=-54.62435 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.6479 startLon=-54.81113 ] -LOG TID(1) INFO 21.5035 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:27:08 Routing_CalculatingRoute [ distance=297003 elapsed=2.37022 finalLat=-14.06397 finalLon=-75.72905 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-12.13161 startLon=-76.97833 ] -LOG TID(1) INFO 21.6096 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:30:22 Routing_CalculatingRoute [ distance=1.06844e+06 elapsed=4.85791 finalLat=-15.59867 finalLon=-56.09913 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-23.12656 startLon=-54.19755 ] -LOG TID(1) INFO 21.6976 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:01:27 Routing_CalculatingRoute [ distance=1.01556e+06 elapsed=0.637193 finalLat=32.10253 finalLon=20.08102 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.87087 startLon=13.20761 ] -LOG TID(1) INFO 21.7914 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:02:25 Routing_CalculatingRoute [ distance=1.01556e+06 elapsed=0.706779 finalLat=32.10253 finalLon=20.08102 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.87087 startLon=13.2076 ] -LOG TID(1) INFO 21.8515 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:05:34 Routing_CalculatingRoute [ distance=26722 elapsed=0.975798 finalLat=48.1982 finalLon=11.60607 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.02523 startLon=11.66067 ] -LOG TID(1) INFO 22.0197 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:04 Routing_CalculatingRoute [ distance=204191 elapsed=0.435006 finalLat=-7.50994 finalLon=-63.02487 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.75739 startLon=-63.90789 ] -LOG TID(1) INFO 22.2169 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:26 Routing_CalculatingRoute [ distance=116106 elapsed=0.258075 finalLat=48.68137 finalLon=71.63449 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.01606 startLon=70.79586 ] -LOG TID(1) INFO 22.2529 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:40 Routing_CalculatingRoute [ distance=116106 elapsed=0.271956 finalLat=48.68137 finalLon=71.63449 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.01606 startLon=70.79586 ] -LOG TID(1) INFO 22.2904 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 10:59:34 Routing_CalculatingRoute [ distance=14619 elapsed=0.977181 finalLat=-2.91313 finalLon=-79.03727 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-2.84667 startLon=-78.96239 ] -LOG TID(1) INFO 22.3638 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 03:26:08 Routing_CalculatingRoute [ distance=199856 elapsed=4.25571 finalLat=-2.15633 finalLon=-79.88362 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-2.88428 startLon=-78.96944 ] -LOG TID(1) INFO 22.4428 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 17:04:03 Routing_CalculatingRoute [ distance=11505.4 elapsed=0.802495 finalLat=-2.91313 finalLon=-79.03727 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-2.86554 startLon=-78.96931 ] -LOG TID(1) INFO 22.5042 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:35:57 Routing_CalculatingRoute [ distance=548366 elapsed=17.2685 finalLat=32.25593 finalLon=77.17653 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.56115 startLon=77.24568 ] -LOG TID(1) INFO 22.7549 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:37:30 Routing_CalculatingRoute [ distance=26168 elapsed=1.94103 finalLat=28.70324 finalLon=77.13223 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.56114 startLon=77.24567 ] -LOG TID(1) INFO 23.0496 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:38:36 Routing_CalculatingRoute [ distance=194529 elapsed=1.88672 finalLat=27.17527 finalLon=78.00983 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.56114 startLon=77.24567 ] -LOG TID(1) INFO 23.3335 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:57:08 Routing_CalculatingRoute [ distance=17430.9 elapsed=5.22696 finalLat=52.21905 finalLon=27.85712 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.34299 startLon=27.88522 ] -LOG TID(1) INFO 23.559 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:57:08 Routing_CalculatingRoute [ distance=17430.9 elapsed=0.337128 finalLat=52.21905 finalLon=27.85712 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.34307 startLon=27.88521 ] -LOG TID(1) INFO 23.6177 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:41:23 Routing_CalculatingRoute [ distance=12213.8 elapsed=0.738343 finalLat=50.13262 finalLon=14.37764 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.07269 startLon=14.46015 ] -LOG TID(1) INFO 24.0306 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:41:49 Routing_CalculatingRoute [ distance=12213.8 elapsed=0.26774 finalLat=50.13262 finalLon=14.37764 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.07269 startLon=14.46015 ] -LOG TID(1) INFO 24.1796 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:36:28 Routing_CalculatingRoute [ distance=11596.3 elapsed=1.04274 finalLat=50.3112 finalLon=9.46104 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.25849 startLon=9.51874 ] -LOG TID(1) INFO 24.3918 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 13:52:52 Routing_CalculatingRoute [ distance=21501.2 elapsed=1.40795 finalLat=49.33205 finalLon=29.44885 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.18973 startLon=29.5254 ] -LOG TID(1) INFO 24.5052 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 13:53:00 Routing_CalculatingRoute [ distance=10598.4 elapsed=0.766808 finalLat=49.26717 finalLon=29.5389 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.18973 startLon=29.5254 ] -LOG TID(1) INFO 24.6307 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 06:19:37 Routing_CalculatingRoute [ distance=29006.2 elapsed=2.09564 finalLat=49.0367 finalLon=28.11387 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.1894 startLon=28.24343 ] -LOG TID(1) INFO 24.7715 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:23 Routing_CalculatingRoute [ distance=409418 elapsed=0.405128 finalLat=19.11667 finalLon=42.13333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.54847 startLon=44.23055 ] -LOG TID(1) INFO 25.0178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 02:33:30 Routing_CalculatingRoute [ distance=131778 elapsed=0.415213 finalLat=19.35891 finalLon=98.44015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.77907 startLon=98.98445 ] -LOG TID(1) INFO 25.4338 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:02:00 Routing_CalculatingRoute [ distance=21150.2 elapsed=14.2236 finalLat=-34.7018 finalLon=-58.28109 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0.00023 startLat=-34.63248 startLon=-58.41924 ] -LOG TID(1) INFO 25.9367 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:02:46 Routing_CalculatingRoute [ distance=11084.8 elapsed=12.1125 finalLat=-34.57161 finalLon=-58.47039 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.63181 startLon=-58.41919 ] -LOG TID(1) INFO 26.1866 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:27 Routing_CalculatingRoute [ distance=11145.9 elapsed=9.61903 finalLat=-34.57161 finalLon=-58.47039 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.6306 startLon=-58.41911 ] -LOG TID(1) INFO 26.3325 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Jul-2015 19:39:55 Routing_CalculatingRoute [ distance=57563.7 elapsed=1.41051 finalLat=-16.40306 finalLon=-71.53792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.07084 startLon=-71.57932 ] -LOG TID(1) INFO 26.4269 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:06:46 Routing_CalculatingRoute [ distance=181736 elapsed=1.22132 finalLat=33.52761 finalLon=-5.10742 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.02815 startLon=-6.65044 ] -LOG TID(1) INFO 26.4877 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:21 Routing_CalculatingRoute [ distance=12445.8 elapsed=1.98119 finalLat=69.0078 finalLon=33.08618 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=68.91881 startLon=33.09817 ] -LOG TID(1) INFO 26.5753 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:35:43 Routing_CalculatingRoute [ distance=43017.5 elapsed=0.500408 finalLat=10.64847 finalLon=107.23731 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.35267 startLon=107.08143 ] -LOG TID(1) INFO 26.6563 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:37:17 Routing_CalculatingRoute [ distance=100366 elapsed=0.841344 finalLat=10.78953 finalLon=106.67151 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.35274 startLon=107.08161 ] -LOG TID(1) INFO 26.7542 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:35 Routing_CalculatingRoute [ distance=11299.8 elapsed=1.36395 finalLat=50.72144 finalLon=5.91415 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.65794 startLon=5.98639 ] -LOG TID(1) INFO 27.0273 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:33 Routing_CalculatingRoute [ distance=10761 elapsed=1.35095 finalLat=35.69241 finalLon=51.36989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.71665 startLon=51.46533 ] -LOG TID(1) INFO 27.166 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:45 Routing_CalculatingRoute [ distance=10899.7 elapsed=0.659503 finalLat=35.69241 finalLon=51.36989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.7219 startLon=51.46215 ] -LOG TID(1) INFO 27.2747 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:01 Routing_CalculatingRoute [ distance=11085.2 elapsed=0.555655 finalLat=35.69241 finalLon=51.36989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.72339 startLon=51.46124 ] -LOG TID(1) INFO 27.3812 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:09:29 Routing_CalculatingRoute [ distance=10371.2 elapsed=0.953823 finalLat=7.48964 finalLon=99.07739 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.56275 startLon=99.03881 ] -LOG TID(1) INFO 27.477 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:00:37 Routing_CalculatingRoute [ distance=16958.4 elapsed=0.687868 finalLat=7.48964 finalLon=99.07739 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.61605 startLon=99.03363 ] -LOG TID(1) INFO 27.5621 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:03:31 Routing_CalculatingRoute [ distance=488447 elapsed=5.4862 finalLat=47.24976 finalLon=39.69768 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.81988 startLon=44.62153 ] -LOG TID(1) INFO 27.6827 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 15:00:30 Routing_CalculatingRoute [ distance=16149.4 elapsed=1.15073 finalLat=48.06949 finalLon=6.86833 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.03193 startLon=6.96909 ] -LOG TID(1) INFO 27.7511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 16:09:09 Routing_CalculatingRoute [ distance=15239.9 elapsed=1.02821 finalLat=48.03942 finalLon=6.97377 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.07096 startLon=6.868 ] -LOG TID(1) INFO 27.8033 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:45:26 Routing_CalculatingRoute [ distance=4.85404e+06 elapsed=1.93648 finalLat=-34.61595 finalLon=-58.42513 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.42388 startLon=-58.58136 ] -LOG TID(1) INFO 28.2111 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:58:48 Routing_CalculatingRoute [ distance=39501.8 elapsed=2.19043 finalLat=-17.59132 finalLon=-65.93413 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.40328 startLon=-66.14626 ] -LOG TID(1) INFO 28.4509 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:58:48 Routing_CalculatingRoute [ distance=39501.8 elapsed=0.346847 finalLat=-17.59132 finalLon=-65.93413 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.40328 startLon=-66.14626 ] -LOG TID(1) INFO 28.506 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:59:57 Routing_CalculatingRoute [ distance=39915 elapsed=0.651128 finalLat=-17.59132 finalLon=-65.93413 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.4 startLon=-66.14878 ] -LOG TID(1) INFO 28.5898 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:16:13 Routing_CalculatingRoute [ distance=126536 elapsed=1.62487 finalLat=49.48633 finalLon=37.69164 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.82194 startLon=36.58716 ] -LOG TID(1) INFO 28.7067 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:02:47 Routing_CalculatingRoute [ distance=24355.8 elapsed=21.4956 finalLat=55.74525 finalLon=37.5158 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.79268 startLon=37.80836 ] -LOG TID(1) INFO 28.9414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:42:19 Routing_CalculatingRoute [ distance=25990 elapsed=1.14112 finalLat=-16.49752 finalLon=-68.14171 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.41544 startLon=-68.34416 ] -LOG TID(1) INFO 29.1316 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 03:21:09 Routing_CalculatingRoute [ distance=175247 elapsed=1.15995 finalLat=10.94288 finalLon=108.28303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.95524 startLon=106.87523 ] -LOG TID(1) INFO 29.1793 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:38 Routing_CalculatingRoute [ distance=116288 elapsed=0.421173 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.23594 startLon=30.80756 ] -LOG TID(1) INFO 29.2265 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:04 Routing_CalculatingRoute [ distance=106273 elapsed=0.317069 finalLat=12.50536 finalLon=-85.81021 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.93019 startLon=-85.95187 ] -LOG TID(1) INFO 29.2575 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:38:49 Routing_CalculatingRoute [ distance=276919 elapsed=7.22622 finalLat=41.89495 finalLon=12.50086 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77665 startLon=11.24762 ] -LOG TID(1) INFO 29.6461 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:39:29 Routing_CalculatingRoute [ distance=120193 elapsed=4.48348 finalLat=42.93665 finalLon=11.27039 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77665 startLon=11.24762 ] -LOG TID(1) INFO 30.1421 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:03:54 Routing_CalculatingRoute [ distance=197309 elapsed=1.34369 finalLat=38.50837 finalLon=43.37422 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.57464 startLon=44.28362 ] -LOG TID(1) INFO 30.6225 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:03 Routing_CalculatingRoute [ distance=28893.2 elapsed=4.09759 finalLat=34.63253 finalLon=127.32498 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.52424 startLon=127.14487 ] -LOG TID(1) INFO 30.7222 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:38 Routing_CalculatingRoute [ distance=28897 elapsed=0.602124 finalLat=34.63253 finalLon=127.32498 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.52421 startLon=127.14482 ] -LOG TID(1) INFO 30.7735 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:12 Routing_CalculatingRoute [ distance=14284 elapsed=0.504098 finalLat=34.52312 finalLon=127.25696 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.5242 startLon=127.14483 ] -LOG TID(1) INFO 30.8257 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:34 Routing_CalculatingRoute [ distance=14284.4 elapsed=0.505184 finalLat=34.52312 finalLon=127.25696 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.52421 startLon=127.14483 ] -LOG TID(1) INFO 30.8766 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:21 Routing_CalculatingRoute [ distance=59992.7 elapsed=0.775635 finalLat=47.15336 finalLon=-122.2952 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.60699 startLon=-122.33095 ] -LOG TID(1) INFO 30.9795 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 10:27:42 Routing_CalculatingRoute [ distance=13387.1 elapsed=9.68454 finalLat=52.17474 finalLon=20.85459 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.23002 startLon=21.00899 ] -LOG TID(1) INFO 31.1782 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 10:41:47 Routing_CalculatingRoute [ distance=27032.1 elapsed=0.312466 finalLat=34.19904 finalLon=43.87353 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.03323 startLon=44.00516 ] -LOG TID(1) INFO 31.3814 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 13:46:36 Routing_CalculatingRoute [ distance=102265 elapsed=0.352979 finalLat=34.67805 finalLon=43.5497 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.11322 startLon=43.87509 ] -LOG TID(1) INFO 31.479 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 13:46:58 Routing_CalculatingRoute [ distance=102028 elapsed=0.128759 finalLat=34.67805 finalLon=43.5497 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.11523 startLon=43.87425 ] -LOG TID(1) INFO 31.5236 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 13:47:28 Routing_CalculatingRoute [ distance=98496.9 elapsed=0.216453 finalLat=34.88929 finalLon=43.48914 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.11914 startLon=43.87247 ] -LOG TID(1) INFO 31.5624 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 13:47:52 Routing_CalculatingRoute [ distance=98844.2 elapsed=0.131134 finalLat=34.89199 finalLon=43.46994 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.12562 startLon=43.86957 ] -LOG TID(1) INFO 31.5983 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 13:48:34 Routing_CalculatingRoute [ distance=57150 elapsed=0.123292 finalLat=34.58981 finalLon=43.68166 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.1366 startLon=43.86463 ] -LOG TID(1) INFO 31.6418 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Oct-2015 19:02:49 Routing_CalculatingRoute [ distance=213229 elapsed=1.47462 finalLat=35.4197 finalLon=46.4988 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.28931 startLon=47.03566 ] -LOG TID(1) INFO 31.7344 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 17:02:31 Routing_CalculatingRoute [ distance=95697.5 elapsed=0.546449 finalLat=-45.57074 finalLon=-72.06864 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-45.10087 startLon=-72.14933 ] -LOG TID(1) INFO 31.8044 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 19:36:26 Routing_CalculatingRoute [ distance=59926.5 elapsed=0.508653 finalLat=-45.57074 finalLon=-72.06864 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-45.26335 startLon=-72.23824 ] -LOG TID(1) INFO 31.8642 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 20:35:54 Routing_CalculatingRoute [ distance=216471 elapsed=0.477968 finalLat=-46.62388 finalLon=-72.67688 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-45.57487 startLon=-72.06405 ] -LOG TID(1) INFO 31.9266 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 04:32:25 Routing_CalculatingRoute [ distance=162850 elapsed=0.388316 finalLat=35.34171 finalLon=33.32231 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.72041 startLon=32.53259 ] -LOG TID(1) INFO 32.0422 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 04:40:12 Routing_CalculatingRoute [ distance=148794 elapsed=0.0444152 finalLat=35.34171 finalLon=33.32231 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.67222 startLon=32.65918 ] -LOG TID(1) INFO 32.0769 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:32:27 Routing_CalculatingRoute [ distance=61800.1 elapsed=0.125002 finalLat=55.46951 finalLon=22.6919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.22991 startLon=23.53734 ] -LOG TID(1) INFO 32.2246 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:58 Routing_CalculatingRoute [ distance=3.01159e+06 elapsed=28.1951 finalLat=-34.58681 finalLon=-58.46246 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.89186 startLon=-58.06106 ] -LOG TID(1) INFO 32.5669 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Oct-2015 09:44:27 Routing_CalculatingRoute [ distance=649719 elapsed=0.823155 finalLat=-6.08139 finalLon=-49.86703 name=vehicle result=NoError startDirectionX=0 startDirectionY=0.00006 startLat=-1.44747 startLon=-48.48058 ] -LOG TID(1) INFO 32.8632 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:02:21 Routing_CalculatingRoute [ distance=94990.9 elapsed=2.34103 finalLat=36.81275 finalLon=34.63054 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.31712 startLon=33.87762 ] -LOG TID(1) INFO 33.3019 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 02:14:16 Routing_CalculatingRoute [ distance=128020 elapsed=0.533951 finalLat=38.65822 finalLon=35.55462 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.06379 startLon=34.77661 ] -LOG TID(1) INFO 33.6418 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 02:16:20 Routing_CalculatingRoute [ distance=707221 elapsed=0.536704 finalLat=40.88499 finalLon=39.8222 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.07722 startLon=34.79993 ] -LOG TID(1) INFO 34.0821 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 05:10:53 Routing_CalculatingRoute [ distance=55182.2 elapsed=0.328156 finalLat=39.41917 finalLon=37.10124 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.45675 startLon=36.68515 ] -LOG TID(1) INFO 34.2728 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 05:35:13 Routing_CalculatingRoute [ distance=276415 elapsed=0.441419 finalLat=39.72696 finalLon=39.51678 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.55553 startLon=37.02702 ] -LOG TID(1) INFO 34.4815 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:00:20 Routing_CalculatingRoute [ distance=335157 elapsed=0.304316 finalLat=41.92119 finalLon=44.72993 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.69888 startLon=41.72848 ] -LOG TID(1) INFO 34.7107 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:03:05 Routing_CalculatingRoute [ distance=353371 elapsed=0.17433 finalLat=41.72415 finalLon=44.74545 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.71412 startLon=41.73395 ] -LOG TID(1) INFO 34.7981 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:21:15 Routing_CalculatingRoute [ distance=36115.8 elapsed=0.0901607 finalLat=43.12856 finalLon=44.45011 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.26709 startLon=44.39388 ] -LOG TID(1) INFO 34.8613 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:21:55 Routing_CalculatingRoute [ distance=76549.3 elapsed=0.095321 finalLat=43.49307 finalLon=43.61936 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.2674 startLon=44.38144 ] -LOG TID(1) INFO 34.9183 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:22:16 Routing_CalculatingRoute [ distance=15264.3 elapsed=0.0965794 finalLat=43.2332 finalLon=44.28743 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.26779 startLon=44.37599 ] -LOG TID(1) INFO 34.9441 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:57 Routing_CalculatingRoute [ distance=15354.4 elapsed=6.75137 finalLat=51.86685 finalLon=7.54902 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.91457 startLon=7.72757 ] -LOG TID(1) INFO 35.0965 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:38 Routing_CalculatingRoute [ distance=99179.2 elapsed=0.215756 finalLat=23.64684 finalLon=57.48872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.58801 startLon=58.28976 ] -LOG TID(1) INFO 35.1763 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:48 Routing_CalculatingRoute [ distance=99174.9 elapsed=0.0784618 finalLat=23.64684 finalLon=57.48872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.58784 startLon=58.28974 ] -LOG TID(1) INFO 35.2021 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:35:18 Routing_CalculatingRoute [ distance=50177.2 elapsed=0.790076 finalLat=35.15867 finalLon=33.50415 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.93369 startLon=33.60725 ] -LOG TID(1) INFO 35.2352 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:37:10 Routing_CalculatingRoute [ distance=50177.2 elapsed=0.775809 finalLat=35.15867 finalLon=33.50415 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.93369 startLon=33.60725 ] -LOG TID(1) INFO 35.2645 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:39:25 Routing_CalculatingRoute [ distance=50177.2 elapsed=0.628959 finalLat=35.15867 finalLon=33.50415 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.93369 startLon=33.60725 ] -LOG TID(1) INFO 35.2936 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 00:55:37 Routing_CalculatingRoute [ distance=21336 elapsed=0.326097 finalLat=13.89576 finalLon=120.9058 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.9475 startLon=120.72982 ] -LOG TID(1) INFO 35.4874 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:53:16 Routing_CalculatingRoute [ distance=124108 elapsed=1.61331 finalLat=-24.87366 finalLon=152.35871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.21206 startLon=151.90698 ] -LOG TID(1) INFO 35.915 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:54:18 Routing_CalculatingRoute [ distance=64487.9 elapsed=0.897484 finalLat=-24.61222 finalLon=151.66778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.21206 startLon=151.90697 ] -LOG TID(1) INFO 36.1104 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:54:52 Routing_CalculatingRoute [ distance=37234.8 elapsed=0.831567 finalLat=-24.45631 finalLon=151.7958 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.21206 startLon=151.90697 ] -LOG TID(1) INFO 36.2868 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:55:26 Routing_CalculatingRoute [ distance=64487.9 elapsed=0.808612 finalLat=-24.61222 finalLon=151.66778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.21206 startLon=151.90697 ] -LOG TID(1) INFO 36.4659 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:58:51 Routing_CalculatingRoute [ distance=64366.8 elapsed=0.821085 finalLat=-24.61222 finalLon=151.66778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.21195 startLon=151.90579 ] -LOG TID(1) INFO 36.6451 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:20:47 Routing_CalculatingRoute [ distance=16058.5 elapsed=0.610722 finalLat=44.87685 finalLon=-93.32245 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.95337 startLon=-93.41233 ] -LOG TID(1) INFO 36.775 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 16:42:16 Routing_CalculatingRoute [ distance=114925 elapsed=0.620389 finalLat=36.72704 finalLon=9.1815 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.8515 startLon=10.19467 ] -LOG TID(1) INFO 36.9918 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 16:44:19 Routing_CalculatingRoute [ distance=114925 elapsed=0.517484 finalLat=36.72704 finalLon=9.1815 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.8515 startLon=10.19467 ] -LOG TID(1) INFO 37.0347 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:33:51 Routing_CalculatingRoute [ distance=58679.4 elapsed=0.210052 finalLat=55.46951 finalLon=22.6919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.24195 startLon=23.49301 ] -LOG TID(1) INFO 37.076 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:36:19 Routing_CalculatingRoute [ distance=53327.8 elapsed=0.250646 finalLat=55.46951 finalLon=22.6919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.26435 startLon=23.41842 ] -LOG TID(1) INFO 37.1168 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:40:38 Routing_CalculatingRoute [ distance=43965.3 elapsed=0.201119 finalLat=55.46951 finalLon=22.6919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.29511 startLon=23.27883 ] -LOG TID(1) INFO 37.1565 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:15:15 Routing_CalculatingRoute [ distance=10939.5 elapsed=2.54858 finalLat=51.76305 finalLon=-0.22865 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.71704 startLon=-0.28091 ] -LOG TID(1) INFO 37.4589 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:57:15 Routing_CalculatingRoute [ distance=10023.3 elapsed=1.86372 finalLat=51.76305 finalLon=-0.22865 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.74229 startLon=-0.32203 ] -LOG TID(1) INFO 37.8474 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:24:14 Routing_CalculatingRoute [ distance=55393.7 elapsed=4.54406 finalLat=14.60549 finalLon=121.04882 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.27628 startLon=120.73747 ] -LOG TID(1) INFO 38.341 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:28:56 Routing_CalculatingRoute [ distance=53617.4 elapsed=5.32062 finalLat=14.6035 finalLon=121.04955 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.28734 startLon=120.74769 ] -LOG TID(1) INFO 38.4878 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:49:59 Routing_CalculatingRoute [ distance=22581.6 elapsed=0.537593 finalLat=55.46951 finalLon=22.6919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.36864 startLon=22.97447 ] -LOG TID(1) INFO 38.5523 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:50:50 Routing_CalculatingRoute [ distance=29981.3 elapsed=0.311385 finalLat=55.47002 finalLon=22.61378 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.37438 startLon=22.94834 ] -LOG TID(1) INFO 38.6106 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:33:42 Routing_CalculatingRoute [ distance=45082 elapsed=0.441048 finalLat=10.14783 finalLon=-85.45169 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.91447 startLon=-85.63033 ] -LOG TID(1) INFO 38.646 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:37:30 Routing_CalculatingRoute [ distance=43695.1 elapsed=0.366955 finalLat=9.65487 finalLon=-85.06979 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.83481 startLon=-84.94901 ] -LOG TID(1) INFO 38.6645 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:42:22 Routing_CalculatingRoute [ distance=50141.9 elapsed=1.58227 finalLat=-3.36463 finalLon=-39.82855 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.02657 startLon=-39.65299 ] -LOG TID(1) INFO 38.8315 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:48:50 Routing_CalculatingRoute [ distance=26405 elapsed=2.2354 finalLat=-3.19027 finalLon=-39.75507 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.02646 startLon=-39.65534 ] -LOG TID(1) INFO 38.9282 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:49:52 Routing_CalculatingRoute [ distance=219485 elapsed=1.49251 finalLat=55.35513 finalLon=86.08723 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.75321 startLon=87.12695 ] -LOG TID(1) INFO 39.3333 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:51:30 Routing_CalculatingRoute [ distance=219486 elapsed=0.451646 finalLat=55.35513 finalLon=86.08723 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.75323 startLon=87.12698 ] -LOG TID(1) INFO 39.4324 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:27:08 Routing_CalculatingRoute [ distance=297003 elapsed=2.37022 finalLat=-14.06397 finalLon=-75.72905 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-12.13161 startLon=-76.97833 ] -LOG TID(1) INFO 39.5278 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:39 Routing_CalculatingRoute [ distance=15034.6 elapsed=1.0114 finalLat=48.90279 finalLon=2.37201 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.92274 startLon=2.53677 ] -LOG TID(1) INFO 39.6483 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:39 Routing_CalculatingRoute [ distance=15034.4 elapsed=0.655353 finalLat=48.90279 finalLon=2.37201 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.92275 startLon=2.53677 ] -LOG TID(1) INFO 39.7496 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:26:34 Routing_CalculatingRoute [ distance=13651.4 elapsed=2.23921 finalLat=53.31205 finalLon=-6.26266 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.4081 startLon=-6.28587 ] -LOG TID(1) INFO 39.8528 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:20 Routing_CalculatingRoute [ distance=10179.7 elapsed=5.00018 finalLat=59.96564 finalLon=30.31235 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.03228 startLon=30.24564 ] -LOG TID(1) INFO 39.9666 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 05:57:54 Routing_CalculatingRoute [ distance=15469.7 elapsed=0.0862028 finalLat=18.11255 finalLon=-63.03843 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.03846 startLon=-63.09565 ] -LOG TID(1) INFO 40.01 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:19 Routing_CalculatingRoute [ distance=131773 elapsed=0.447205 finalLat=-34.96329 finalLon=-54.94399 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.88455 startLon=-56.16606 ] -LOG TID(1) INFO 40.1498 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:22:24 Routing_CalculatingRoute [ distance=78347.4 elapsed=0.615578 finalLat=34.98291 finalLon=32.40595 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.67275 startLon=32.86492 ] -LOG TID(1) INFO 40.1963 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:02:15 Routing_CalculatingRoute [ distance=58196 elapsed=1.94246 finalLat=-33.03644 finalLon=-68.86567 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-33.53695 startLon=-69.00675 ] -LOG TID(1) INFO 40.5213 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:56 Routing_CalculatingRoute [ distance=26340.1 elapsed=0.65607 finalLat=50.79806 finalLon=14.4176 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.95289 startLon=14.48685 ] -LOG TID(1) INFO 40.7611 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:48 Routing_CalculatingRoute [ distance=14390.3 elapsed=1.78952 finalLat=44.81509 finalLon=20.53582 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.79927 startLon=20.37853 ] -LOG TID(1) INFO 40.9221 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:32 Routing_CalculatingRoute [ distance=14390.1 elapsed=0.222438 finalLat=44.81509 finalLon=20.53582 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.79927 startLon=20.37853 ] -LOG TID(1) INFO 40.9615 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:00 Routing_CalculatingRoute [ distance=14389.9 elapsed=0.211008 finalLat=44.81509 finalLon=20.53582 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.79927 startLon=20.37854 ] -LOG TID(1) INFO 41.0008 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Jul-2015 19:39:55 Routing_CalculatingRoute [ distance=57563.7 elapsed=1.41051 finalLat=-16.40306 finalLon=-71.53792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.07084 startLon=-71.57932 ] -LOG TID(1) INFO 41.0596 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Jul-2015 16:18:18 Routing_CalculatingRoute [ distance=275865 elapsed=9.85358 finalLat=-15.83797 finalLon=-70.02002 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.40396 startLon=-71.53832 ] -LOG TID(1) INFO 41.1474 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:32 Routing_CalculatingRoute [ distance=116287 elapsed=0.333313 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.23594 startLon=30.80756 ] -LOG TID(1) INFO 41.2021 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:50 Routing_CalculatingRoute [ distance=116287 elapsed=0.340149 finalLat=30.0572 finalLon=31.30971 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.23594 startLon=30.80756 ] -LOG TID(1) INFO 41.2429 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:28:25 Routing_CalculatingRoute [ distance=99027.6 elapsed=2.37368 finalLat=47.97657 finalLon=12.45987 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.31504 startLon=11.56019 ] -LOG TID(1) INFO 41.4399 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:33:13 Routing_CalculatingRoute [ distance=99027.6 elapsed=0.487242 finalLat=47.97657 finalLon=12.45987 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.31499 startLon=11.5602 ] -LOG TID(1) INFO 41.694 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:45 Routing_CalculatingRoute [ distance=11405.2 elapsed=3.47258 finalLat=53.88926 finalLon=27.54616 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.92768 startLon=27.67053 ] -LOG TID(1) INFO 42.013 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:21:47 Routing_CalculatingRoute [ distance=49256.2 elapsed=1.56444 finalLat=56.94896 finalLon=24.10345 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.28748 startLon=24.43425 ] -LOG TID(1) INFO 42.1588 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:46:18 Routing_CalculatingRoute [ distance=15551.2 elapsed=0.259637 finalLat=56.94896 finalLon=24.10345 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.01112 startLon=24.30552 ] -LOG TID(1) INFO 42.1901 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:37:50 Routing_CalculatingRoute [ distance=99030.3 elapsed=1.91773 finalLat=47.97657 finalLon=12.45987 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.31504 startLon=11.56023 ] -LOG TID(1) INFO 42.3555 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:52 Routing_CalculatingRoute [ distance=115439 elapsed=0.500949 finalLat=25.60685 finalLon=48.88403 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.3493 startLon=49.54568 ] -LOG TID(1) INFO 42.5769 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:58 Routing_CalculatingRoute [ distance=114252 elapsed=0.174544 finalLat=25.60685 finalLon=48.88403 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.3493 startLon=49.54568 ] -LOG TID(1) INFO 42.6319 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:04 Routing_CalculatingRoute [ distance=114252 elapsed=0.109565 finalLat=25.60685 finalLon=48.88403 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.3493 startLon=49.54568 ] -LOG TID(1) INFO 42.6857 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:10 Routing_CalculatingRoute [ distance=114252 elapsed=0.113965 finalLat=25.60685 finalLon=48.88403 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.3493 startLon=49.54568 ] -LOG TID(1) INFO 42.7417 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:16 Routing_CalculatingRoute [ distance=114252 elapsed=0.108083 finalLat=25.60685 finalLon=48.88403 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.3493 startLon=49.54568 ] -LOG TID(1) INFO 42.7969 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 02:24:29 Routing_CalculatingRoute [ distance=12023.8 elapsed=10.9114 finalLat=35.5503 finalLon=139.74675 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.49212 startLon=139.66326 ] -LOG TID(1) INFO 43.0215 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 02:27:51 Routing_CalculatingRoute [ distance=364691 elapsed=0.212519 finalLat=55.74206 finalLon=-97.86341 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.69153 startLon=-101.70514 ] -LOG TID(1) INFO 43.1871 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:39 Routing_CalculatingRoute [ distance=277985 elapsed=0.361306 finalLat=10.64688 finalLon=107.24376 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.94797 startLon=108.44067 ] -LOG TID(1) INFO 43.2405 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:49:55 Routing_CalculatingRoute [ distance=11628.6 elapsed=0.587792 finalLat=-25.28409 finalLon=-57.63521 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.32081 startLon=-57.54811 ] -LOG TID(1) INFO 43.2939 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:13:47 Routing_CalculatingRoute [ distance=45590.8 elapsed=10.2909 finalLat=48.87012 finalLon=2.78265 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.8881 startLon=2.35302 ] -LOG TID(1) INFO 43.415 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:14:59 Routing_CalculatingRoute [ distance=45591.7 elapsed=39.9171 finalLat=48.87012 finalLon=2.78265 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.88813 startLon=2.35303 ] -LOG TID(1) INFO 43.5378 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:45:09 Routing_CalculatingRoute [ distance=10323.2 elapsed=0.476025 finalLat=43.66652 finalLon=3.86134 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.60341 startLon=3.83593 ] -LOG TID(1) INFO 43.7835 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:51:42 Routing_CalculatingRoute [ distance=87458.4 elapsed=0.472329 finalLat=43.28963 finalLon=3.03143 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.60341 startLon=3.83592 ] -LOG TID(1) INFO 43.91 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:54:12 Routing_CalculatingRoute [ distance=10323.4 elapsed=0.362466 finalLat=43.66652 finalLon=3.86134 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.60341 startLon=3.83592 ] -LOG TID(1) INFO 44.0139 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 03:09:21 Routing_CalculatingRoute [ distance=287850 elapsed=0.20335 finalLat=55.74206 finalLon=-97.86341 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.56228 startLon=-100.9846 ] -LOG TID(1) INFO 44.0538 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:54 Routing_CalculatingRoute [ distance=29295.3 elapsed=2.04215 finalLat=50.84546 finalLon=4.35699 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.88239 startLon=4.71676 ] -LOG TID(1) INFO 44.458 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:47:00 Routing_CalculatingRoute [ distance=29859.5 elapsed=2.63678 finalLat=50.60864 finalLon=10.69264 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.71228 startLon=10.93523 ] -LOG TID(1) INFO 44.5401 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:48:03 Routing_CalculatingRoute [ distance=32388.5 elapsed=0.412239 finalLat=50.64195 finalLon=10.68919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.7134 startLon=10.91092 ] -LOG TID(1) INFO 44.5864 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:42:19 Routing_CalculatingRoute [ distance=25990 elapsed=1.14112 finalLat=-16.49752 finalLon=-68.14171 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.41544 startLon=-68.34416 ] -LOG TID(1) INFO 44.6612 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:00:01 Routing_CalculatingRoute [ distance=14672.3 elapsed=0.441188 finalLat=-3.02953 finalLon=-59.98779 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.12814 startLon=-60.02224 ] -LOG TID(1) INFO 44.8226 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:41 Routing_CalculatingRoute [ distance=28671.8 elapsed=2.0089 finalLat=41.67059 finalLon=44.65316 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.71741 startLon=44.78098 ] -LOG TID(1) INFO 44.9165 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:42 Routing_CalculatingRoute [ distance=28671.8 elapsed=1.22561 finalLat=41.67059 finalLon=44.65316 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.71741 startLon=44.78098 ] -LOG TID(1) INFO 44.9769 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:09:21 Routing_CalculatingRoute [ distance=14291.7 elapsed=2.01768 finalLat=-36.87299 finalLon=174.7699 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-36.77962 startLon=174.77732 ] -LOG TID(1) INFO 45.1544 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 10:17:42 Routing_CalculatingRoute [ distance=405711 elapsed=0.469584 finalLat=54.69152 finalLon=30.94121 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.53668 startLon=25.72279 ] -LOG TID(1) INFO 45.3894 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 10:32:07 Routing_CalculatingRoute [ distance=68310.8 elapsed=0.233779 finalLat=54.05226 finalLon=26.77079 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.42497 startLon=26.00072 ] -LOG TID(1) INFO 45.4577 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 12:26:04 Routing_CalculatingRoute [ distance=206293 elapsed=0.521666 finalLat=54.69061 finalLon=30.97624 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.01322 startLon=28.18489 ] -LOG TID(1) INFO 45.5231 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:57 Routing_CalculatingRoute [ distance=20042.3 elapsed=1.24466 finalLat=56.86975 finalLon=24.34777 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.94389 startLon=24.13222 ] -LOG TID(1) INFO 45.5823 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:09:46 Routing_CalculatingRoute [ distance=18579.5 elapsed=4.5152 finalLat=52.20693 finalLon=20.88436 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.25864 startLon=21.02667 ] -LOG TID(1) INFO 45.8057 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Sep-2015 00:51:54 Routing_CalculatingRoute [ distance=246916 elapsed=0.611348 finalLat=13.54459 finalLon=-86.16482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14905 startLon=-86.30738 ] -LOG TID(1) INFO 45.9446 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:10 Routing_CalculatingRoute [ distance=473659 elapsed=19.1498 finalLat=52.23192 finalLon=21.00673 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.07761 startLon=15.04954 ] -LOG TID(1) INFO 46.1743 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:13 Routing_CalculatingRoute [ distance=473659 elapsed=17.9857 finalLat=52.23192 finalLon=21.00673 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.07761 startLon=15.04954 ] -LOG TID(1) INFO 46.4092 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 15:00:30 Routing_CalculatingRoute [ distance=16149.4 elapsed=1.15073 finalLat=48.06949 finalLon=6.86833 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.03193 startLon=6.96909 ] -LOG TID(1) INFO 46.5268 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 16:09:09 Routing_CalculatingRoute [ distance=15239.9 elapsed=1.02821 finalLat=48.03942 finalLon=6.97377 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.07096 startLon=6.868 ] -LOG TID(1) INFO 46.5768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Oct-2015 12:22:08 Routing_CalculatingRoute [ distance=149147 elapsed=4.56609 finalLat=7.06399 finalLon=125.60831 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.7149 startLon=125.01053 ] -LOG TID(1) INFO 46.8307 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:09:50 Routing_CalculatingRoute [ distance=312232 elapsed=3.72652 finalLat=-32.70342 finalLon=-57.63127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.8725 startLon=-56.16709 ] -LOG TID(1) INFO 46.9401 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:09:52 Routing_CalculatingRoute [ distance=312232 elapsed=1.27467 finalLat=-32.70342 finalLon=-57.63127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.8725 startLon=-56.16709 ] -LOG TID(1) INFO 46.9798 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:19 Routing_CalculatingRoute [ distance=60580.9 elapsed=3.52695 finalLat=36.3973 finalLon=10.14624 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.81238 startLon=10.17382 ] -LOG TID(1) INFO 47.1182 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:00:12 Routing_CalculatingRoute [ distance=242083 elapsed=0.408136 finalLat=35.10014 finalLon=-4.31001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.72225 startLon=-5.80982 ] -LOG TID(1) INFO 47.178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:09:50 Routing_CalculatingRoute [ distance=312232 elapsed=3.72652 finalLat=-32.70342 finalLon=-57.63127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.8725 startLon=-56.16709 ] -LOG TID(1) INFO 47.2324 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:09:52 Routing_CalculatingRoute [ distance=312232 elapsed=1.27467 finalLat=-32.70342 finalLon=-57.63127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.8725 startLon=-56.16709 ] -LOG TID(1) INFO 47.2698 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:09:52 Routing_CalculatingRoute [ distance=312232 elapsed=0.750484 finalLat=-32.70342 finalLon=-57.63127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-34.8725 startLon=-56.16709 ] -LOG TID(1) INFO 47.3089 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:19 Routing_CalculatingRoute [ distance=60580.9 elapsed=3.52695 finalLat=36.3973 finalLon=10.14624 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.81238 startLon=10.17382 ] -LOG TID(1) INFO 47.3638 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:08:14 Routing_CalculatingRoute [ distance=195255 elapsed=0.684564 finalLat=57.30329 finalLon=39.85379 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.50392 startLon=39.12707 ] -LOG TID(1) INFO 47.5191 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:04:24 Routing_CalculatingRoute [ distance=14435.4 elapsed=3.50613 finalLat=42.55704 finalLon=-73.28936 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.58909 startLon=-73.19855 ] -LOG TID(1) INFO 47.6802 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 07:05:20 Routing_CalculatingRoute [ distance=198109 elapsed=1.42191 finalLat=13.76276 finalLon=100.53707 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.57313 startLon=99.95575 ] -LOG TID(1) INFO 48.0542 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Sep-2015 16:12:35 Routing_CalculatingRoute [ distance=29265.5 elapsed=4.79926 finalLat=40.62174 finalLon=22.95134 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.42697 startLon=22.92811 ] -LOG TID(1) INFO 48.3674 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:39:32 Routing_CalculatingRoute [ distance=28324.9 elapsed=0.37144 finalLat=46.62752 finalLon=-85.03759 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.45756 startLon=-84.98009 ] -LOG TID(1) INFO 48.4456 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:40:11 Routing_CalculatingRoute [ distance=19093.8 elapsed=0.205072 finalLat=46.34585 finalLon=-85.03063 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.46053 startLon=-84.98706 ] -LOG TID(1) INFO 48.5236 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:41:27 Routing_CalculatingRoute [ distance=26692.2 elapsed=0.169991 finalLat=46.62752 finalLon=-85.03759 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.46104 startLon=-85 ] -LOG TID(1) INFO 48.6057 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:46:28 Routing_CalculatingRoute [ distance=171123 elapsed=0.290434 finalLat=40.17761 finalLon=44.51259 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.67626 startLon=45.74722 ] -LOG TID(1) INFO 48.7065 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:39 Routing_CalculatingRoute [ distance=151025 elapsed=0.118727 finalLat=40.17761 finalLon=44.51259 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.70519 startLon=45.60506 ] -LOG TID(1) INFO 48.7275 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:00:32 Routing_CalculatingRoute [ distance=93966.3 elapsed=3.67382 finalLat=48.7605 finalLon=8.79612 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.37215 startLon=8.63229 ] -LOG TID(1) INFO 48.8952 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:06:09 Routing_CalculatingRoute [ distance=82967.8 elapsed=0.809846 finalLat=48.7605 finalLon=8.79612 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.27445 startLon=8.61639 ] -LOG TID(1) INFO 49.07 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:10:46 Routing_CalculatingRoute [ distance=12172.4 elapsed=0.746424 finalLat=47.91046 finalLon=-122.29451 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.89067 startLon=-122.2049 ] -LOG TID(1) INFO 49.1738 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:11:50 Routing_CalculatingRoute [ distance=10198.9 elapsed=0.501319 finalLat=47.91425 finalLon=-122.27012 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.89066 startLon=-122.2049 ] -LOG TID(1) INFO 49.2602 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 21:52:19 Routing_CalculatingRoute [ distance=15085.3 elapsed=1.43912 finalLat=18.47028 finalLon=-69.92431 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.52096 startLon=-70.03113 ] -LOG TID(1) INFO 49.3286 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:55 Routing_CalculatingRoute [ distance=24728.3 elapsed=0.297268 finalLat=56.97349 finalLon=23.79524 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.96906 startLon=24.12967 ] -LOG TID(1) INFO 49.4025 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:20:44 Routing_CalculatingRoute [ distance=27540.8 elapsed=1.18434 finalLat=50.35333 finalLon=7.59439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.43565 startLon=7.83845 ] -LOG TID(1) INFO 49.6321 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:34:47 Routing_CalculatingRoute [ distance=27539.1 elapsed=1.29736 finalLat=50.35333 finalLon=7.59439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.43566 startLon=7.83844 ] -LOG TID(1) INFO 49.6954 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:34:47 Routing_CalculatingRoute [ distance=27539.1 elapsed=1.29736 finalLat=50.35333 finalLon=7.59439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.43566 startLon=7.83844 ] -LOG TID(1) INFO 49.7599 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:19 Routing_CalculatingRoute [ distance=60580.9 elapsed=3.52695 finalLat=36.3973 finalLon=10.14624 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.81238 startLon=10.17382 ] -LOG TID(1) INFO 49.8315 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:13 Routing_CalculatingRoute [ distance=22462.6 elapsed=1.42265 finalLat=32.12557 finalLon=34.82306 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.96722 startLon=34.81462 ] -LOG TID(1) INFO 49.8932 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:40:44 Routing_CalculatingRoute [ distance=571693 elapsed=3.47548 finalLat=-3.45965 finalLon=-40.2091 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.12888 startLon=-38.20758 ] -LOG TID(1) INFO 50.3565 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:28 Routing_CalculatingRoute [ distance=12620.1 elapsed=0.759225 finalLat=59.31858 finalLon=18.05919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.3821 startLon=17.97716 ] -LOG TID(1) INFO 50.8059 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 13:43:30 Routing_CalculatingRoute [ distance=327862 elapsed=10.933 finalLat=53.53588 finalLon=-2.6843 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.51419 startLon=-0.09535 ] -LOG TID(1) INFO 51.1713 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:17:11 Routing_CalculatingRoute [ distance=14933.4 elapsed=3.13042 finalLat=44.47792 finalLon=26.16487 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.58426 startLon=26.17804 ] -LOG TID(1) INFO 51.3651 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Sep-2015 04:48:08 Routing_CalculatingRoute [ distance=35793.8 elapsed=10.9467 finalLat=50.48718 finalLon=9.3287 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.56847 startLon=9.6609 ] -LOG TID(1) INFO 51.6414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Sep-2015 11:21:19 Routing_CalculatingRoute [ distance=35403.1 elapsed=5.22659 finalLat=50.57305 finalLon=9.66217 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.49071 startLon=9.36052 ] -LOG TID(1) INFO 51.7377 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 07:21:36 Routing_CalculatingRoute [ distance=34535.1 elapsed=3.52603 finalLat=50.48718 finalLon=9.3287 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.52902 startLon=9.68479 ] -LOG TID(1) INFO 51.8371 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 07:41:05 Routing_CalculatingRoute [ distance=16081.8 elapsed=3.40512 finalLat=50.48718 finalLon=9.3287 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.49819 startLon=9.47352 ] -LOG TID(1) INFO 51.9099 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 05:51:37 Routing_CalculatingRoute [ distance=35426.2 elapsed=5.9046 finalLat=50.48718 finalLon=9.3287 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.56555 startLon=9.65914 ] -LOG TID(1) INFO 51.9917 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:27:58 Routing_CalculatingRoute [ distance=18891.2 elapsed=0.508878 finalLat=46.71594 finalLon=29.62512 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.62315 startLon=29.66591 ] -LOG TID(1) INFO 52.0372 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:45 Routing_CalculatingRoute [ distance=122632 elapsed=2.83876 finalLat=53.63092 finalLon=-7.45792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.61166 startLon=-6.19953 ] -LOG TID(1) INFO 52.1108 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:55 Routing_CalculatingRoute [ distance=18102 elapsed=21.3378 finalLat=-37.67645 finalLon=144.83654 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-37.79104 startLon=144.88101 ] -LOG TID(1) INFO 52.6761 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:10:10 Routing_CalculatingRoute [ distance=26662.8 elapsed=0.904302 finalLat=58.16202 finalLon=56.30271 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.0121 startLon=56.2457 ] -LOG TID(1) INFO 53.1464 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:15:15 Routing_CalculatingRoute [ distance=26611.7 elapsed=1.46183 finalLat=58.01446 finalLon=56.21012 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.15946 startLon=56.30539 ] -LOG TID(1) INFO 53.3384 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:09:37 Routing_CalculatingRoute [ distance=41080.6 elapsed=1.53167 finalLat=24.23414 finalLon=120.8095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.12103 startLon=120.57937 ] -LOG TID(1) INFO 53.4284 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:21 Routing_CalculatingRoute [ distance=41079.3 elapsed=0.774505 finalLat=24.23414 finalLon=120.8095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.12104 startLon=120.57936 ] -LOG TID(1) INFO 53.4888 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:31 Routing_CalculatingRoute [ distance=41087.1 elapsed=0.456882 finalLat=24.23414 finalLon=120.8095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.121 startLon=120.57942 ] -LOG TID(1) INFO 53.5475 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:12 Routing_CalculatingRoute [ distance=52358.2 elapsed=0.437621 finalLat=24.43967 finalLon=120.65353 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.12103 startLon=120.57938 ] -LOG TID(1) INFO 53.6103 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:44 Routing_CalculatingRoute [ distance=59044.1 elapsed=0.362122 finalLat=31.71586 finalLon=35.58664 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.00783 startLon=35.88402 ] -LOG TID(1) INFO 53.6561 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:28 Routing_CalculatingRoute [ distance=59044.1 elapsed=0.169157 finalLat=31.71586 finalLon=35.58664 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.00783 startLon=35.88402 ] -LOG TID(1) INFO 53.6896 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Sep-2015 08:43:58 Routing_CalculatingRoute [ distance=93388.1 elapsed=0.637192 finalLat=-35.68485 finalLon=174.32636 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-36.18997 startLon=174.6348 ] -LOG TID(1) INFO 53.7948 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:34:46 Routing_CalculatingRoute [ distance=36338.1 elapsed=0.588646 finalLat=46.04756 finalLon=14.49399 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.92578 startLon=14.86873 ] -LOG TID(1) INFO 53.8395 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:39:29 Routing_CalculatingRoute [ distance=43977.3 elapsed=0.866232 finalLat=50.95808 finalLon=14.08253 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.0248 startLon=13.70526 ] -LOG TID(1) INFO 54.1235 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:40:39 Routing_CalculatingRoute [ distance=43972.2 elapsed=0.504326 finalLat=50.95872 finalLon=14.08217 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.0248 startLon=13.70526 ] -LOG TID(1) INFO 54.2126 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:53:10 Routing_CalculatingRoute [ distance=20160.3 elapsed=0.232483 finalLat=15.28581 finalLon=44.23125 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43603 startLon=44.21774 ] -LOG TID(1) INFO 54.2625 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:19 Routing_CalculatingRoute [ distance=109144 elapsed=0.338406 finalLat=-36.83364 finalLon=175.79872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-36.48352 startLon=175.34259 ] -LOG TID(1) INFO 54.3227 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:29 Routing_CalculatingRoute [ distance=41092.8 elapsed=0.130649 finalLat=-36.62807 finalLon=175.56184 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-36.48352 startLon=175.34259 ] -LOG TID(1) INFO 54.3568 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:05:58 Routing_CalculatingRoute [ distance=287062 elapsed=0.200447 finalLat=9.93256 finalLon=-84.07956 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.21146 startLon=-85.6112 ] -LOG TID(1) INFO 54.3995 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:45 Routing_CalculatingRoute [ distance=507666 elapsed=10.9705 finalLat=-27.98883 finalLon=-54.84165 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-29.66499 startLon=-51.12166 ] -LOG TID(1) INFO 54.5059 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:56 Routing_CalculatingRoute [ distance=237414 elapsed=2.15937 finalLat=43.3215 finalLon=21.89573 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.81432 startLon=20.47403 ] -LOG TID(1) INFO 54.6634 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:13:28 Routing_CalculatingRoute [ distance=237414 elapsed=0.728552 finalLat=43.3215 finalLon=21.89573 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.81433 startLon=20.47403 ] -LOG TID(1) INFO 54.698 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:08:03 Routing_CalculatingRoute [ distance=39780.7 elapsed=0.748711 finalLat=18.32451 finalLon=-65.65317 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.38006 startLon=-65.97609 ] -LOG TID(1) INFO 54.7406 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:02 Routing_CalculatingRoute [ distance=11093.7 elapsed=0.326646 finalLat=9.93158 finalLon=-84.09953 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.98863 startLon=-84.16533 ] -LOG TID(1) INFO 54.7758 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:08:20 Routing_CalculatingRoute [ distance=14741.3 elapsed=0.600587 finalLat=30.44932 finalLon=-81.63214 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.34405 startLon=-81.66047 ] -LOG TID(1) INFO 55.0353 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:02:02 Routing_CalculatingRoute [ distance=157267 elapsed=1.26165 finalLat=37.93176 finalLon=-121.69602 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.76639 startLon=-120.8222 ] -LOG TID(1) INFO 55.2578 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:09:33 Routing_CalculatingRoute [ distance=49418.5 elapsed=1.00594 finalLat=56.15386 finalLon=10.19969 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.37518 startLon=9.79316 ] -LOG TID(1) INFO 55.7119 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:51:30 Routing_CalculatingRoute [ distance=43242.5 elapsed=1.41702 finalLat=56.46359 finalLon=9.97193 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.14974 startLon=10.19799 ] -LOG TID(1) INFO 55.8519 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:15:02 Routing_CalculatingRoute [ distance=43157.3 elapsed=1.63818 finalLat=56.46359 finalLon=9.97193 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.15241 startLon=10.19727 ] -LOG TID(1) INFO 55.9537 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:34:26 Routing_CalculatingRoute [ distance=32633.9 elapsed=1.35567 finalLat=56.46437 finalLon=9.48154 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.46374 startLon=9.97182 ] -LOG TID(1) INFO 56.0666 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:12:54 Routing_CalculatingRoute [ distance=12360.8 elapsed=22.5064 finalLat=51.50189 finalLon=-0.18697 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.48493 startLon=-0.34147 ] -LOG TID(1) INFO 56.3887 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:18 Routing_CalculatingRoute [ distance=17863.8 elapsed=0.34567 finalLat=41.8236 finalLon=44.75696 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.72303 startLon=44.72883 ] -LOG TID(1) INFO 56.5832 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:25:40 Routing_CalculatingRoute [ distance=31089.1 elapsed=1.21778 finalLat=53.79269 finalLon=9.98081 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.91486 startLon=10.31706 ] -LOG TID(1) INFO 56.7937 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:29:57 Routing_CalculatingRoute [ distance=29118.5 elapsed=0.546679 finalLat=53.79269 finalLon=9.98081 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.90276 startLon=10.30409 ] -LOG TID(1) INFO 56.8618 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:30:54 Routing_CalculatingRoute [ distance=28232.4 elapsed=0.366838 finalLat=53.79269 finalLon=9.98081 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.89984 startLon=10.29251 ] -LOG TID(1) INFO 56.9324 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:09:48 Routing_CalculatingRoute [ distance=27402.1 elapsed=0.181168 finalLat=33.73083 finalLon=35.51555 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.88181 startLon=35.48961 ] -LOG TID(1) INFO 56.9793 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 16:05:06 Routing_CalculatingRoute [ distance=98458.8 elapsed=0.562009 finalLat=56.94718 finalLon=24.11016 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.64626 startLon=25.4546 ] -LOG TID(1) INFO 57.0665 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 16:06:13 Routing_CalculatingRoute [ distance=96468.9 elapsed=0.311955 finalLat=56.9439 finalLon=24.11214 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.65863 startLon=25.46012 ] -LOG TID(1) INFO 57.1146 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 23:45:17 Routing_CalculatingRoute [ distance=20741.7 elapsed=0.841167 finalLat=28.36298 finalLon=-81.6654 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.35665 startLon=-81.5531 ] -LOG TID(1) INFO 57.4246 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 23:57:33 Routing_CalculatingRoute [ distance=10771.3 elapsed=0.437296 finalLat=28.36298 finalLon=-81.6654 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.34334 startLon=-81.60045 ] -LOG TID(1) INFO 57.6164 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:40:42 Routing_CalculatingRoute [ distance=24329.1 elapsed=0.829719 finalLat=28.39081 finalLon=-81.49066 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.35424 startLon=-81.67315 ] -LOG TID(1) INFO 57.8263 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:41:49 Routing_CalculatingRoute [ distance=38144 elapsed=0.805936 finalLat=28.44588 finalLon=-81.39487 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=28.35424 startLon=-81.67315 ] -LOG TID(1) INFO 58.0201 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:28:55 Routing_CalculatingRoute [ distance=49365.3 elapsed=2.52538 finalLat=40.93244 finalLon=-74.42587 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.21055 startLon=-74.60219 ] -LOG TID(1) INFO 58.1393 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:31 Routing_CalculatingRoute [ distance=57013.6 elapsed=0.382198 finalLat=42.23584 finalLon=27.77419 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.52107 startLon=27.44397 ] -LOG TID(1) INFO 58.3464 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:41 Routing_CalculatingRoute [ distance=116256 elapsed=0.133693 finalLat=41.38544 finalLon=22.74768 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.71775 startLon=21.78308 ] -LOG TID(1) INFO 58.4131 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:27 Routing_CalculatingRoute [ distance=77297.9 elapsed=0.691317 finalLat=39.19482 finalLon=-75.55014 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.77315 startLon=-75.48468 ] -LOG TID(1) INFO 58.4387 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:33:37 Routing_CalculatingRoute [ distance=144809 elapsed=1.24678 finalLat=10.31698 finalLon=-84.82353 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.93887 startLon=-84.08289 ] -LOG TID(1) INFO 58.4713 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:36:02 Routing_CalculatingRoute [ distance=89650.3 elapsed=0.317552 finalLat=32.1672 finalLon=35.08436 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.81756 startLon=35.37552 ] -LOG TID(1) INFO 58.4948 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:49:27 Routing_CalculatingRoute [ distance=78036.9 elapsed=0.333774 finalLat=32.1672 finalLon=35.08436 name=vehicle result=NoError startDirectionX=-0.00014 startDirectionY=-0 startLat=31.80842 startLon=35.23972 ] -LOG TID(1) INFO 58.5306 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:51:04 Routing_CalculatingRoute [ distance=78498.2 elapsed=0.308864 finalLat=32.1672 finalLon=35.08436 name=vehicle result=NoError startDirectionX=-0.00066 startDirectionY=-0 startLat=31.8064 startLon=35.23359 ] -LOG TID(1) INFO 58.5611 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:08:47 Routing_CalculatingRoute [ distance=14448.2 elapsed=0.192212 finalLat=20.65712 finalLon=96.93066 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=20.74113 startLon=96.87754 ] -LOG TID(1) INFO 58.653 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:25 Routing_CalculatingRoute [ distance=180648 elapsed=2.25947 finalLat=45.65262 finalLon=25.61019 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.44467 startLon=26.16848 ] -LOG TID(1) INFO 58.79 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:18:17 Routing_CalculatingRoute [ distance=299052 elapsed=1.32802 finalLat=53.19863 finalLon=50.11399 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.08923 startLon=46.56905 ] -LOG TID(1) INFO 59.3446 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:37:30 Routing_CalculatingRoute [ distance=199342 elapsed=1.16447 finalLat=53.19929 finalLon=50.1751 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.19331 startLon=47.95526 ] -LOG TID(1) INFO 59.5526 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 04:23:16 Routing_CalculatingRoute [ distance=59662.9 elapsed=0.269264 finalLat=-45.23226 finalLon=167.81177 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-45.42248 startLon=167.72885 ] -LOG TID(1) INFO 59.638 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:46 Routing_CalculatingRoute [ distance=100825 elapsed=3.9099 finalLat=46.06872 finalLon=23.57042 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.7654 startLon=23.55797 ] -LOG TID(1) INFO 59.7461 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 01:53:57 Routing_CalculatingRoute [ distance=562816 elapsed=3.24186 finalLat=17.40593 finalLon=102.80029 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.75932 startLon=100.57014 ] -LOG TID(1) INFO 60.0529 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 07:10:28 Routing_CalculatingRoute [ distance=16108.4 elapsed=2.22385 finalLat=13.69791 finalLon=100.5376 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.80421 startLon=100.55745 ] -LOG TID(1) INFO 60.1779 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:00:01 Routing_CalculatingRoute [ distance=14672.3 elapsed=0.441188 finalLat=-3.02953 finalLon=-59.98779 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.12814 startLon=-60.02224 ] -LOG TID(1) INFO 60.2589 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:10:52 Routing_CalculatingRoute [ distance=12145.3 elapsed=0.249135 finalLat=-3.02953 finalLon=-59.98779 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.10982 startLon=-60.02658 ] -LOG TID(1) INFO 60.309 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Aug-2015 20:52:46 Routing_CalculatingRoute [ distance=67019.5 elapsed=0.593375 finalLat=51.89992 finalLon=-8.46796 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.42211 startLon=-8.68913 ] -LOG TID(1) INFO 60.3833 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:23 Routing_CalculatingRoute [ distance=33071.5 elapsed=4.17156 finalLat=-33.35995 finalLon=-70.75872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-33.55352 startLon=-70.63254 ] -LOG TID(1) INFO 60.4841 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:13:08 Routing_CalculatingRoute [ distance=63982.8 elapsed=0.614139 finalLat=53.52505 finalLon=10.31393 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.8687 startLon=10.67024 ] -LOG TID(1) INFO 60.575 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:29:45 Routing_CalculatingRoute [ distance=17963.9 elapsed=0.769569 finalLat=47.41131 finalLon=9.34057 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.47814 startLon=9.50559 ] -LOG TID(1) INFO 60.6829 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:47:54 Routing_CalculatingRoute [ distance=26493.9 elapsed=1.14107 finalLat=47.54527 finalLon=9.18165 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.48093 startLon=9.48253 ] -LOG TID(1) INFO 60.8125 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:28:32 Routing_CalculatingRoute [ distance=12127.1 elapsed=0.677764 finalLat=47.53885 finalLon=9.18362 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61901 startLon=9.26594 ] -LOG TID(1) INFO 60.924 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:12:25 Routing_CalculatingRoute [ distance=210910 elapsed=3.39802 finalLat=32.85757 finalLon=-97.03559 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.96604 startLon=-98.50979 ] -LOG TID(1) INFO 61.7165 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:13 Routing_CalculatingRoute [ distance=50049.9 elapsed=1.61229 finalLat=47.31809 finalLon=8.79227 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19102 startLon=8.48541 ] -LOG TID(1) INFO 61.9168 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 20:10:23 Routing_CalculatingRoute [ distance=12925.7 elapsed=0.240562 finalLat=42.87163 finalLon=74.53808 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.82116 startLon=74.624 ] -LOG TID(1) INFO 61.9949 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:02 Routing_CalculatingRoute [ distance=25445.1 elapsed=2.47859 finalLat=-36.78784 finalLon=174.7702 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-36.93082 startLon=174.64471 ] -LOG TID(1) INFO 62.0997 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:35:28 Routing_CalculatingRoute [ distance=203279 elapsed=2.28862 finalLat=50.07439 finalLon=14.43035 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.85069 startLon=16.05429 ] -LOG TID(1) INFO 62.4658 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:14:48 Routing_CalculatingRoute [ distance=65497 elapsed=1.53471 finalLat=50.08743 finalLon=14.42125 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.74131 startLon=15.03727 ] -LOG TID(1) INFO 62.6471 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:36:27 Routing_CalculatingRoute [ distance=18435.6 elapsed=1.02901 finalLat=50.07937 finalLon=14.43001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.98208 startLon=14.6049 ] -LOG TID(1) INFO 62.7748 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 01:09:09 Routing_CalculatingRoute [ distance=20238 elapsed=8.2612 finalLat=33.77097 finalLon=-118.18772 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.74026 startLon=-118.36093 ] -LOG TID(1) INFO 62.9742 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 02:43:04 Routing_CalculatingRoute [ distance=41327.3 elapsed=5.72584 finalLat=34.07147 finalLon=-118.25196 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.77162 startLon=-118.18602 ] -LOG TID(1) INFO 63.2256 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:00:00 Routing_CalculatingRoute [ distance=43745.1 elapsed=9.11007 finalLat=33.82263 finalLon=-117.92369 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.07034 startLon=-118.25181 ] -LOG TID(1) INFO 63.47 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:35:32 Routing_CalculatingRoute [ distance=13424.6 elapsed=1.31683 finalLat=53.36172 finalLon=13.063 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.27892 startLon=12.98724 ] -LOG TID(1) INFO 63.5726 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:28:01 Routing_CalculatingRoute [ distance=11552.8 elapsed=9.99339 finalLat=53.35082 finalLon=-6.25421 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.42812 startLon=-6.24415 ] -LOG TID(1) INFO 63.6622 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 18:09:53 Routing_CalculatingRoute [ distance=28295.7 elapsed=8.53364 finalLat=58.11157 finalLon=59.87755 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.88064 startLon=59.84365 ] -LOG TID(1) INFO 63.8792 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:29:43 Routing_CalculatingRoute [ distance=140817 elapsed=1.73484 finalLat=60.31788 finalLon=24.96614 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.57072 startLon=27.12612 ] -LOG TID(1) INFO 64.2397 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:57:04 Routing_CalculatingRoute [ distance=16532.4 elapsed=0.695712 finalLat=60.31788 finalLon=24.96614 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.26337 startLon=25.17835 ] -LOG TID(1) INFO 64.3511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:02:54 Routing_CalculatingRoute [ distance=16531.9 elapsed=0.726874 finalLat=60.31788 finalLon=24.96614 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.2633 startLon=25.17842 ] -LOG TID(1) INFO 64.4489 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:25:20 Routing_CalculatingRoute [ distance=69461.8 elapsed=0.515492 finalLat=41.84474 finalLon=44.72049 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.36079 startLon=44.72028 ] -LOG TID(1) INFO 64.5181 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:59 Routing_CalculatingRoute [ distance=90309 elapsed=3.25102 finalLat=50.74811 finalLon=4.27673 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.19838 startLon=3.50919 ] -LOG TID(1) INFO 64.8637 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 11:14:46 Routing_CalculatingRoute [ distance=38548.8 elapsed=0.387932 finalLat=48.87258 finalLon=20.40419 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.93418 startLon=20.38334 ] -LOG TID(1) INFO 65.0241 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Sep-2015 18:30:44 Routing_CalculatingRoute [ distance=27048.5 elapsed=12.7683 finalLat=53.3929 finalLon=7.96549 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.4089 startLon=8.30297 ] -LOG TID(1) INFO 65.3527 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Sep-2015 18:31:34 Routing_CalculatingRoute [ distance=25103.5 elapsed=3.39392 finalLat=53.27639 finalLon=8.48248 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.40891 startLon=8.30302 ] -LOG TID(1) INFO 65.5012 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 08:53:46 Routing_CalculatingRoute [ distance=101681 elapsed=6.71063 finalLat=36.51845 finalLon=140.60242 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.81115 startLon=140.39106 ] -LOG TID(1) INFO 65.7385 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:22:45 Routing_CalculatingRoute [ distance=103129 elapsed=2.09462 finalLat=33.29269 finalLon=72.76303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.5828 startLon=72.79805 ] -LOG TID(1) INFO 65.9441 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:34:42 Routing_CalculatingRoute [ distance=95901.7 elapsed=1.56514 finalLat=33.29269 finalLon=72.76303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.64 startLon=72.76466 ] -LOG TID(1) INFO 65.9756 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:46:58 Routing_CalculatingRoute [ distance=82285.8 elapsed=2.19313 finalLat=33.29269 finalLon=72.76303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.73538 startLon=72.73705 ] -LOG TID(1) INFO 66.0098 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:07 Routing_CalculatingRoute [ distance=50813.8 elapsed=1.11896 finalLat=47.31524 finalLon=8.79956 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19104 startLon=8.48542 ] -LOG TID(1) INFO 66.1279 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:16:38 Routing_CalculatingRoute [ distance=129505 elapsed=2.77773 finalLat=33.29269 finalLon=72.76303 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.11622 startLon=72.62827 ] -LOG TID(1) INFO 66.1825 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:18:00 Routing_CalculatingRoute [ distance=28366.3 elapsed=1.21998 finalLat=33.28357 finalLon=72.77761 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.14671 startLon=72.62882 ] -LOG TID(1) INFO 66.2178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 18:23:33 Routing_CalculatingRoute [ distance=11829 elapsed=0.140444 finalLat=12.09467 finalLon=-68.85576 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.15889 startLon=-68.90972 ] -LOG TID(1) INFO 66.2495 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 18:02:47 Routing_CalculatingRoute [ distance=14543.5 elapsed=0.102328 finalLat=40.17301 finalLon=44.43705 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.17473 startLon=44.54243 ] -LOG TID(1) INFO 66.3013 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 18:03:08 Routing_CalculatingRoute [ distance=14543.5 elapsed=0.0656687 finalLat=40.17301 finalLon=44.43705 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.17473 startLon=44.54243 ] -LOG TID(1) INFO 66.3244 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 18:04:54 Routing_CalculatingRoute [ distance=15485.8 elapsed=0.10867 finalLat=40.12997 finalLon=44.44369 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.17473 startLon=44.54243 ] -LOG TID(1) INFO 66.3518 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 18:06:55 Routing_CalculatingRoute [ distance=12917.3 elapsed=0.0831343 finalLat=40.14062 finalLon=44.47088 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.17473 startLon=44.54243 ] -LOG TID(1) INFO 66.3753 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 05:53:01 Routing_CalculatingRoute [ distance=36443.5 elapsed=0.142564 finalLat=44.7523 finalLon=33.85348 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.97374 startLon=34.13528 ] -LOG TID(1) INFO 66.4562 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 09:23:25 Routing_CalculatingRoute [ distance=83912.1 elapsed=0.194994 finalLat=44.49707 finalLon=34.15869 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.61299 startLon=33.52134 ] -LOG TID(1) INFO 66.5033 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 17:49:34 Routing_CalculatingRoute [ distance=19445.3 elapsed=0.168637 finalLat=44.96335 finalLon=35.23813 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.05981 startLon=35.194 ] -LOG TID(1) INFO 66.5266 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 16:26:57 Routing_CalculatingRoute [ distance=14524.4 elapsed=1.89308 finalLat=48.13462 finalLon=-1.55818 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.1056 startLon=-1.7055 ] -LOG TID(1) INFO 66.6308 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 16:27:07 Routing_CalculatingRoute [ distance=14557.6 elapsed=1.75095 finalLat=48.13462 finalLon=-1.55818 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.10553 startLon=-1.70583 ] -LOG TID(1) INFO 66.7367 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 16:27:36 Routing_CalculatingRoute [ distance=18057 elapsed=2.2977 finalLat=48.13462 finalLon=-1.55818 name=vehicle result=NoError startDirectionX=-0.00013 startDirectionY=0 startLat=48.1054 startLon=-1.70664 ] -LOG TID(1) INFO 66.8181 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 11:00:30 Routing_CalculatingRoute [ distance=38809.9 elapsed=0.11254 finalLat=21.17183 finalLon=102.72329 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.08218 startLon=102.50565 ] -LOG TID(1) INFO 66.8548 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 00:33:12 Routing_CalculatingRoute [ distance=63596.2 elapsed=0.188277 finalLat=21.21816 finalLon=102.90853 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.07133 startLon=102.54022 ] -LOG TID(1) INFO 66.8644 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:11:15 Routing_CalculatingRoute [ distance=99074.2 elapsed=4.19791 finalLat=48.2581 finalLon=7.45346 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.9381 startLon=7.68116 ] -LOG TID(1) INFO 67.0048 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:46 Routing_CalculatingRoute [ distance=99074.2 elapsed=2.35013 finalLat=48.2581 finalLon=7.45346 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.9381 startLon=7.68115 ] -LOG TID(1) INFO 67.0544 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:23 Routing_CalculatingRoute [ distance=660974 elapsed=7.50695 finalLat=11.91625 finalLon=123.15649 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.4953 startLon=121.0413 ] -LOG TID(1) INFO 67.4516 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:02:23 Routing_CalculatingRoute [ distance=51804.5 elapsed=5.32117 finalLat=42.90099 finalLon=-122.13576 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.76021 startLon=-122.4888 ] -LOG TID(1) INFO 67.5275 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:15:12 Routing_CalculatingRoute [ distance=25494.7 elapsed=2.35273 finalLat=14.41364 finalLon=121.0434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.59924 startLon=121.03334 ] -LOG TID(1) INFO 67.7391 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:10:52 Routing_CalculatingRoute [ distance=12145.3 elapsed=0.249135 finalLat=-3.02953 finalLon=-59.98779 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.10982 startLon=-60.02658 ] -LOG TID(1) INFO 67.8204 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:56:58 Routing_CalculatingRoute [ distance=91280.4 elapsed=1.74238 finalLat=-3.77865 finalLon=-38.54062 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.41876 startLon=-39.03445 ] -LOG TID(1) INFO 68.0847 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:12:20 Routing_CalculatingRoute [ distance=10111.6 elapsed=1.77265 finalLat=-7.12645 finalLon=-34.86641 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-7.18582 startLon=-34.87933 ] -LOG TID(1) INFO 68.3156 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:07:20 Routing_CalculatingRoute [ distance=182783 elapsed=17.6504 finalLat=-3.75774 finalLon=-38.53066 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.82947 startLon=-39.55749 ] -LOG TID(1) INFO 68.4827 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:29:07 Routing_CalculatingRoute [ distance=89770.3 elapsed=0.96949 finalLat=45.03367 finalLon=35.37536 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.32647 startLon=36.36248 ] -LOG TID(1) INFO 68.5326 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 06:32:27 Routing_CalculatingRoute [ distance=10513.7 elapsed=4.30932 finalLat=49.4797 finalLon=8.28416 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.52533 startLon=8.36199 ] -LOG TID(1) INFO 68.6892 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 19:45:59 Routing_CalculatingRoute [ distance=10605.3 elapsed=2.692 finalLat=49.4797 finalLon=8.28416 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.525 startLon=8.36128 ] -LOG TID(1) INFO 68.7573 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 21:21:56 Routing_CalculatingRoute [ distance=10876.1 elapsed=2.17904 finalLat=49.52495 finalLon=8.36184 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.48438 startLon=8.28644 ] -LOG TID(1) INFO 68.8399 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:16:10 Routing_CalculatingRoute [ distance=11590.4 elapsed=0.459623 finalLat=-25.29395 finalLon=-57.56098 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.35399 startLon=-57.62486 ] -LOG TID(1) INFO 68.9007 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 16:18:40 Routing_CalculatingRoute [ distance=76119.8 elapsed=0.835048 finalLat=44.37022 finalLon=22.49424 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.86187 startLon=22.29586 ] -LOG TID(1) INFO 68.9455 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:15:23 Routing_CalculatingRoute [ distance=163779 elapsed=1.26602 finalLat=55.69315 finalLon=12.54444 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.17125 startLon=10.55462 ] -LOG TID(1) INFO 69.2974 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:53:35 Routing_CalculatingRoute [ distance=56937 elapsed=0.449727 finalLat=41.90944 finalLon=-73.90422 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.35284 startLon=-73.72542 ] -LOG TID(1) INFO 69.5855 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:13:13 Routing_CalculatingRoute [ distance=18143.1 elapsed=1.18023 finalLat=-33.59303 finalLon=-70.7028 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-33.57535 startLon=-70.56103 ] -LOG TID(1) INFO 69.6974 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:17 Routing_CalculatingRoute [ distance=14834.4 elapsed=2.26295 finalLat=55.90838 finalLon=43.08594 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.88995 startLon=42.93579 ] -LOG TID(1) INFO 69.8856 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 02:05:27 Routing_CalculatingRoute [ distance=12696.9 elapsed=0.210937 finalLat=16.24869 finalLon=-61.34354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.3313 startLon=-61.36635 ] -LOG TID(1) INFO 69.9504 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 14:00:18 Routing_CalculatingRoute [ distance=20304 elapsed=0.329377 finalLat=40.53495 finalLon=-74.51309 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.49518 startLon=-74.69704 ] -LOG TID(1) INFO 69.9956 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Oct-2015 17:56:15 Routing_CalculatingRoute [ distance=81681 elapsed=0.658413 finalLat=36.66689 finalLon=9.43984 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.81918 startLon=10.17898 ] -LOG TID(1) INFO 70.095 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 07:03:36 Routing_CalculatingRoute [ distance=25830.4 elapsed=2.11049 finalLat=47.58005 finalLon=14.03261 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61118 startLon=13.78641 ] -LOG TID(1) INFO 70.4091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 07:04:28 Routing_CalculatingRoute [ distance=27021 elapsed=1.66858 finalLat=47.58035 finalLon=14.0512 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61118 startLon=13.78641 ] -LOG TID(1) INFO 70.5709 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 10:23:33 Routing_CalculatingRoute [ distance=15161.1 elapsed=2.73811 finalLat=47.58005 finalLon=14.03261 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.5668 startLon=13.88379 ] -LOG TID(1) INFO 70.7284 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 18:29:58 Routing_CalculatingRoute [ distance=25814.5 elapsed=3.5014 finalLat=47.57755 finalLon=14.03038 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61146 startLon=13.78658 ] -LOG TID(1) INFO 70.8981 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 09:19:59 Routing_CalculatingRoute [ distance=20591.6 elapsed=3.9762 finalLat=47.58017 finalLon=13.97605 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61161 startLon=13.78643 ] -LOG TID(1) INFO 71.0858 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 07:03:36 Routing_CalculatingRoute [ distance=25830.4 elapsed=2.11049 finalLat=47.58005 finalLon=14.03261 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.61118 startLon=13.78641 ] -LOG TID(1) INFO 71.2497 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:04:29 Routing_CalculatingRoute [ distance=626881 elapsed=0.427806 finalLat=21.12719 finalLon=94.85048 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.85491 startLon=96.11626 ] -LOG TID(1) INFO 71.4628 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:05:33 Routing_CalculatingRoute [ distance=623539 elapsed=0.21152 finalLat=21.17686 finalLon=94.88261 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.85471 startLon=96.11647 ] -LOG TID(1) INFO 71.5155 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:06:53 Routing_CalculatingRoute [ distance=622012 elapsed=0.192017 finalLat=21.18578 finalLon=94.89367 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.85456 startLon=96.11635 ] -LOG TID(1) INFO 71.5654 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:57:46 Routing_CalculatingRoute [ distance=79225.7 elapsed=1.04038 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.00636 startLon=-123.13434 ] -LOG TID(1) INFO 71.9571 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 23:37:55 Routing_CalculatingRoute [ distance=83901.6 elapsed=1.25608 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.92421 startLon=-123.23861 ] -LOG TID(1) INFO 72.0133 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 00:31:55 Routing_CalculatingRoute [ distance=32130.2 elapsed=0.907369 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.69036 startLon=-123.41032 ] -LOG TID(1) INFO 72.0691 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 00:32:00 Routing_CalculatingRoute [ distance=32090.9 elapsed=0.515655 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=-0.00061 startDirectionY=0 startLat=48.69036 startLon=-123.41093 ] -LOG TID(1) INFO 72.1239 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 00:32:36 Routing_CalculatingRoute [ distance=32084.5 elapsed=0.359203 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=48.69025 startLon=-123.4111 ] -LOG TID(1) INFO 72.1762 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 00:39:39 Routing_CalculatingRoute [ distance=32073.9 elapsed=0.756096 finalLat=48.42722 finalLon=-123.37506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.68944 startLon=-123.4125 ] -LOG TID(1) INFO 72.233 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:12 Routing_CalculatingRoute [ distance=155858 elapsed=1.17156 finalLat=55.00779 finalLon=60.29747 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.08584 startLon=60.72531 ] -LOG TID(1) INFO 72.6055 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:31 Routing_CalculatingRoute [ distance=225276 elapsed=0.701646 finalLat=54.42239 finalLon=61.18658 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.0859 startLon=60.72532 ] -LOG TID(1) INFO 72.7679 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:57 Routing_CalculatingRoute [ distance=155861 elapsed=0.397287 finalLat=55.00783 finalLon=60.29717 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.08593 startLon=60.72538 ] -LOG TID(1) INFO 72.8582 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:16:30 Routing_CalculatingRoute [ distance=14292.2 elapsed=1.94145 finalLat=42.43041 finalLon=-71.07115 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.46354 startLon=-70.94161 ] -LOG TID(1) INFO 73.1068 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:16:47 Routing_CalculatingRoute [ distance=38340 elapsed=3.15274 finalLat=32.8363 finalLon=-97.00361 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.74872 startLon=-97.36393 ] -LOG TID(1) INFO 73.5316 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:03:19 Routing_CalculatingRoute [ distance=11548.2 elapsed=0.224213 finalLat=45.3519 finalLon=-66.03087 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00003 startLat=45.27373 startLon=-66.06205 ] -LOG TID(1) INFO 73.6898 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:04:10 Routing_CalculatingRoute [ distance=11778.2 elapsed=0.262146 finalLat=45.3519 finalLon=-66.03087 name=vehicle result=NoError startDirectionX=0.00068 startDirectionY=-0 startLat=45.26942 startLon=-66.05961 ] -LOG TID(1) INFO 73.7235 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:44:43 Routing_CalculatingRoute [ distance=370133 elapsed=0.3908 finalLat=28.42233 finalLon=-81.46143 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.81346 startLon=-80.12414 ] -LOG TID(1) INFO 74.1529 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:23 Routing_CalculatingRoute [ distance=84975 elapsed=1.03808 finalLat=37.99685 finalLon=23.64155 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.49308 startLon=23.63376 ] -LOG TID(1) INFO 74.536 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:15:37 Routing_CalculatingRoute [ distance=84975 elapsed=0.996832 finalLat=37.99685 finalLon=23.64155 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.49308 startLon=23.63376 ] -LOG TID(1) INFO 74.633 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 20:28:24 Routing_CalculatingRoute [ distance=65515 elapsed=0.647239 finalLat=43.89425 finalLon=3.51104 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.61734 startLon=3.35585 ] -LOG TID(1) INFO 74.7875 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 20:29:40 Routing_CalculatingRoute [ distance=65515 elapsed=0.396032 finalLat=43.89425 finalLon=3.51104 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.61735 startLon=3.35587 ] -LOG TID(1) INFO 74.8466 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 20:32:43 Routing_CalculatingRoute [ distance=65446.4 elapsed=0.938542 finalLat=43.89425 finalLon=3.51104 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.61736 startLon=3.35587 ] -LOG TID(1) INFO 74.9057 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:14:44 Routing_CalculatingRoute [ distance=460964 elapsed=1.17069 finalLat=32.07743 finalLon=23.96 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.10144 startLon=20.08098 ] -LOG TID(1) INFO 74.9831 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:33:24 Routing_CalculatingRoute [ distance=11850.4 elapsed=0.108291 finalLat=12.07667 finalLon=-68.8796 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.13761 startLon=-68.8349 ] -LOG TID(1) INFO 75.0015 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:29:46 Routing_CalculatingRoute [ distance=19157.4 elapsed=0.0886803 finalLat=12.18905 finalLon=-68.9587 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.0805 startLon=-68.87063 ] -LOG TID(1) INFO 75.0203 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Oct-2015 12:36:37 Routing_CalculatingRoute [ distance=77550.3 elapsed=0.482924 finalLat=21.13171 finalLon=94.86236 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.45984 startLon=95.38801 ] -LOG TID(1) INFO 75.0542 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Oct-2015 13:59:08 Routing_CalculatingRoute [ distance=36162.6 elapsed=0.192923 finalLat=21.13172 finalLon=94.86238 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.28136 startLon=95.09632 ] -LOG TID(1) INFO 75.086 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:00:22 Routing_CalculatingRoute [ distance=109776 elapsed=6.17099 finalLat=42.14154 finalLon=24.71954 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.53752 startLon=25.40113 ] -LOG TID(1) INFO 75.3329 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 17:16:15 Routing_CalculatingRoute [ distance=13294.1 elapsed=0.206966 finalLat=21.36202 finalLon=-157.88931 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.28392 startLon=-157.83177 ] -LOG TID(1) INFO 75.3977 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:57:52 Routing_CalculatingRoute [ distance=15010.2 elapsed=0.232515 finalLat=21.28329 finalLon=-157.83343 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.35835 startLon=-157.89238 ] -LOG TID(1) INFO 75.423 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:57:58 Routing_CalculatingRoute [ distance=15010.2 elapsed=0.0962725 finalLat=21.28329 finalLon=-157.83343 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.35835 startLon=-157.89238 ] -LOG TID(1) INFO 75.4413 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:58:01 Routing_CalculatingRoute [ distance=15009.8 elapsed=0.0532839 finalLat=21.28329 finalLon=-157.83343 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00001 startLat=21.35834 startLon=-157.89237 ] -LOG TID(1) INFO 75.4594 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:58:03 Routing_CalculatingRoute [ distance=15009.3 elapsed=0.0794583 finalLat=21.28329 finalLon=-157.83343 name=vehicle result=NoError startDirectionX=0.00001 startDirectionY=-0 startLat=21.35835 startLon=-157.89237 ] -LOG TID(1) INFO 75.4775 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:58:04 Routing_CalculatingRoute [ distance=15008.9 elapsed=0.0596055 finalLat=21.28329 finalLon=-157.83343 name=vehicle result=NoError startDirectionX=0.00001 startDirectionY=-0 startLat=21.35835 startLon=-157.89237 ] -LOG TID(1) INFO 75.4959 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:59:46 Routing_CalculatingRoute [ distance=723165 elapsed=0.43772 finalLat=51.16202 finalLon=71.3995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.00887 startLon=63.29842 ] -LOG TID(1) INFO 75.5371 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:05:39 Routing_CalculatingRoute [ distance=719454 elapsed=0.344246 finalLat=51.16202 finalLon=71.3995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.02354 startLon=63.34856 ] -LOG TID(1) INFO 75.5773 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:34:54 Routing_CalculatingRoute [ distance=103757 elapsed=0.265046 finalLat=32.56667 finalLon=35.68333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.98994 startLon=35.86784 ] -LOG TID(1) INFO 75.6321 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 20:23:12 Routing_CalculatingRoute [ distance=425852 elapsed=0.42753 finalLat=-14.4438 finalLon=-67.53105 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.51067 startLon=-68.12691 ] -LOG TID(1) INFO 75.8018 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:37 Routing_CalculatingRoute [ distance=99074.2 elapsed=2.66324 finalLat=48.2581 finalLon=7.45346 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.9381 startLon=7.68115 ] -LOG TID(1) INFO 75.8686 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:20:57 Routing_CalculatingRoute [ distance=32989 elapsed=3.37017 finalLat=33.69764 finalLon=73.00124 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.5287 startLon=73.15631 ] -LOG TID(1) INFO 76.0494 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:56:03 Routing_CalculatingRoute [ distance=13810 elapsed=2.82019 finalLat=50.78102 finalLon=5.46482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.73243 startLon=5.57994 ] -LOG TID(1) INFO 76.1955 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 00:36:58 Routing_CalculatingRoute [ distance=24238.9 elapsed=1.22306 finalLat=-16.5477 finalLon=-49.27534 name=vehicle result=NoError startDirectionX=0.00001 startDirectionY=0 startLat=-16.68581 startLon=-49.2063 ] -LOG TID(1) INFO 76.2873 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 00:39:42 Routing_CalculatingRoute [ distance=24172.8 elapsed=0.948878 finalLat=-16.5477 finalLon=-49.27534 name=vehicle result=NoError startDirectionX=0.00001 startDirectionY=0 startLat=-16.6856 startLon=-49.20529 ] -LOG TID(1) INFO 76.3614 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:08:03 Routing_CalculatingRoute [ distance=12237.2 elapsed=0.185553 finalLat=25.30828 finalLon=51.43851 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.28564 startLon=51.53701 ] -LOG TID(1) INFO 76.4011 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:57:03 Routing_CalculatingRoute [ distance=39449 elapsed=0.272206 finalLat=45.36005 finalLon=-75.65785 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.28018 startLon=-75.28282 ] -LOG TID(1) INFO 76.483 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:16:49 Routing_CalculatingRoute [ distance=12357.1 elapsed=4.48502 finalLat=48.72933 finalLon=4.22804 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.8061 startLon=4.2604 ] -LOG TID(1) INFO 76.5438 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:41:19 Routing_CalculatingRoute [ distance=22730.6 elapsed=0.346502 finalLat=31.99958 finalLon=34.87126 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.06453 startLon=34.76463 ] -LOG TID(1) INFO 76.5943 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:30 Routing_CalculatingRoute [ distance=551430 elapsed=2.14517 finalLat=40.54814 finalLon=69.20923 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.80587 startLon=64.4206 ] -LOG TID(1) INFO 76.8243 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:49 Routing_CalculatingRoute [ distance=551430 elapsed=0.535889 finalLat=40.54814 finalLon=69.20923 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.80587 startLon=64.4206 ] -LOG TID(1) INFO 76.8847 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:56 Routing_CalculatingRoute [ distance=95032.1 elapsed=0.580458 finalLat=47.49592 finalLon=19.05219 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.74524 startLon=18.11278 ] -LOG TID(1) INFO 77.1938 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:08 Routing_CalculatingRoute [ distance=51486.1 elapsed=0.368902 finalLat=47.7857 finalLon=18.74038 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.74524 startLon=18.11278 ] -LOG TID(1) INFO 77.3063 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 14:30:33 Routing_CalculatingRoute [ distance=15242 elapsed=0.936197 finalLat=32.83852 finalLon=13.15076 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.83746 startLon=13.23082 ] -LOG TID(1) INFO 77.3559 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:24 Routing_CalculatingRoute [ distance=12399 elapsed=0.587082 finalLat=51.01683 finalLon=12.57282 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.07928 startLon=12.51321 ] -LOG TID(1) INFO 77.4692 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:26:57 Routing_CalculatingRoute [ distance=14856.5 elapsed=1.12976 finalLat=59.89281 finalLon=10.52547 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.79088 startLon=10.48538 ] -LOG TID(1) INFO 77.7055 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:09 Routing_CalculatingRoute [ distance=16062.2 elapsed=0.245925 finalLat=59.49234 finalLon=24.84189 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.41136 startLon=24.66557 ] -LOG TID(1) INFO 77.8511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:54 Routing_CalculatingRoute [ distance=30597.5 elapsed=0.834417 finalLat=38.08673 finalLon=23.97747 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.97622 startLon=23.79225 ] -LOG TID(1) INFO 78.0472 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:28:44 Routing_CalculatingRoute [ distance=16034.6 elapsed=0.904227 finalLat=51.14753 finalLon=-114.07894 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.05421 startLon=-114.1188 ] -LOG TID(1) INFO 78.135 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:53:39 Routing_CalculatingRoute [ distance=17273.6 elapsed=0.713314 finalLat=51.14753 finalLon=-114.07894 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.04515 startLon=-114.11239 ] -LOG TID(1) INFO 78.206 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 05:54:36 Routing_CalculatingRoute [ distance=24752.9 elapsed=0.88779 finalLat=51.04726 finalLon=-114.13122 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.13107 startLon=-114.01013 ] -LOG TID(1) INFO 78.2889 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 06:00:50 Routing_CalculatingRoute [ distance=22848.7 elapsed=0.677055 finalLat=51.04726 finalLon=-114.13122 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00084 startLat=51.1391 startLon=-114.01344 ] -LOG TID(1) INFO 78.3593 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 06:16:57 Routing_CalculatingRoute [ distance=10134.4 elapsed=0.713642 finalLat=51.04726 finalLon=-114.13122 name=vehicle result=NoError startDirectionX=-0.00104 startDirectionY=-0 startLat=51.0377 startLon=-114.01902 ] -LOG TID(1) INFO 78.4277 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Sep-2015 07:51:41 Routing_CalculatingRoute [ distance=122197 elapsed=0.230737 finalLat=40.97806 finalLon=47.84792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.4193 startLon=46.91707 ] -LOG TID(1) INFO 78.5848 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Sep-2015 09:54:35 Routing_CalculatingRoute [ distance=20058.5 elapsed=0.205692 finalLat=40.92677 finalLon=47.98643 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.94792 startLon=47.82209 ] -LOG TID(1) INFO 78.6335 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Sep-2015 10:30:41 Routing_CalculatingRoute [ distance=27018.6 elapsed=0.190346 finalLat=40.98949 finalLon=47.86694 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.8798 startLon=48.06929 ] -LOG TID(1) INFO 78.6704 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Sep-2015 12:41:39 Routing_CalculatingRoute [ distance=37300.6 elapsed=0.138092 finalLat=40.78491 finalLon=48.14842 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.9584 startLon=47.86684 ] -LOG TID(1) INFO 78.7089 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Sep-2015 18:32:37 Routing_CalculatingRoute [ distance=28095.7 elapsed=0.296424 finalLat=40.37543 finalLon=49.83285 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.48529 startLon=49.55726 ] -LOG TID(1) INFO 78.7893 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 06:30:40 Routing_CalculatingRoute [ distance=69399.8 elapsed=8.2074 finalLat=42.81992 finalLon=0.4156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.22546 startLon=0.08849 ] -LOG TID(1) INFO 79.1538 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:48:28 Routing_CalculatingRoute [ distance=25829.9 elapsed=0.273772 finalLat=49.00063 finalLon=20.75037 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.94986 startLon=20.55639 ] -LOG TID(1) INFO 79.3216 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:08:10 Routing_CalculatingRoute [ distance=94602.4 elapsed=1.33264 finalLat=47.90412 finalLon=20.53145 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.31604 startLon=21.08235 ] -LOG TID(1) INFO 79.4602 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:08:12 Routing_CalculatingRoute [ distance=94572.4 elapsed=0.383764 finalLat=47.90412 finalLon=20.53145 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.31582 startLon=21.08212 ] -LOG TID(1) INFO 79.523 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:16:18 Routing_CalculatingRoute [ distance=86384.9 elapsed=1.36012 finalLat=47.90412 finalLon=20.53145 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.26706 startLon=20.99965 ] -LOG TID(1) INFO 79.594 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:30:15 Routing_CalculatingRoute [ distance=74125.3 elapsed=0.427112 finalLat=47.90412 finalLon=20.53145 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.17436 startLon=20.91377 ] -LOG TID(1) INFO 79.6777 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:54 Routing_CalculatingRoute [ distance=52690.1 elapsed=0.369314 finalLat=59.3892 finalLon=24.03808 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.43516 startLon=24.74837 ] -LOG TID(1) INFO 79.7677 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:53:41 Routing_CalculatingRoute [ distance=10347.1 elapsed=0.832943 finalLat=-25.26424 finalLon=-57.56612 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.32873 startLon=-57.57501 ] -LOG TID(1) INFO 79.8206 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:28 Routing_CalculatingRoute [ distance=117145 elapsed=4.58234 finalLat=41.89107 finalLon=23.11642 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.6464 startLon=23.36995 ] -LOG TID(1) INFO 79.9699 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:16 Routing_CalculatingRoute [ distance=12045.4 elapsed=3.38472 finalLat=34.59959 finalLon=135.40298 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.58229 startLon=135.46787 ] -LOG TID(1) INFO 80.4847 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:50 Routing_CalculatingRoute [ distance=48456 elapsed=2.51248 finalLat=50.54978 finalLon=5.3241 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.87643 startLon=5.28073 ] -LOG TID(1) INFO 80.8108 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Sep-2015 02:12:53 Routing_CalculatingRoute [ distance=28419.3 elapsed=3.96814 finalLat=25.09986 finalLon=102.92746 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.04093 startLon=102.71215 ] -LOG TID(1) INFO 81.2731 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:53 Routing_CalculatingRoute [ distance=11065.6 elapsed=0.760921 finalLat=52.5885 finalLon=10.37356 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.59294 startLon=10.53433 ] -LOG TID(1) INFO 81.5594 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:33:21 Routing_CalculatingRoute [ distance=57603.7 elapsed=0.824477 finalLat=36.14767 finalLon=-115.15527 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.69317 startLon=-115.37273 ] -LOG TID(1) INFO 81.6258 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:16:02 Routing_CalculatingRoute [ distance=204718 elapsed=0.322967 finalLat=15.62613 finalLon=-91.88649 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.69494 startLon=-91.27167 ] -LOG TID(1) INFO 81.6574 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:30 Routing_CalculatingRoute [ distance=102597 elapsed=0.954608 finalLat=45.8084 finalLon=6.51716 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.36895 startLon=6.4822 ] -LOG TID(1) INFO 82.1625 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:19:32 Routing_CalculatingRoute [ distance=56130.2 elapsed=0.555117 finalLat=46.02379 finalLon=6.24909 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.36912 startLon=6.4818 ] -LOG TID(1) INFO 82.3235 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:20:30 Routing_CalculatingRoute [ distance=49266.8 elapsed=0.573719 finalLat=46.07762 finalLon=6.4081 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.36912 startLon=6.4818 ] -LOG TID(1) INFO 82.4846 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Sep-2015 13:37:16 Routing_CalculatingRoute [ distance=192376 elapsed=0.397187 finalLat=20.05424 finalLon=102.21491 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.62222 startLon=101.10951 ] -LOG TID(1) INFO 82.5537 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 04:13:56 Routing_CalculatingRoute [ distance=190660 elapsed=0.288495 finalLat=20.05424 finalLon=102.21491 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.61777 startLon=101.11662 ] -LOG TID(1) INFO 82.5751 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 04:23:39 Routing_CalculatingRoute [ distance=449029 elapsed=0.453899 finalLat=17.9641 finalLon=102.61337 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.62223 startLon=101.10951 ] -LOG TID(1) INFO 82.6073 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 04:27:35 Routing_CalculatingRoute [ distance=529372 elapsed=0.407936 finalLat=19.49807 finalLon=103.98601 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.62223 startLon=101.10951 ] -LOG TID(1) INFO 82.6366 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 19:46:12 Routing_CalculatingRoute [ distance=195881 elapsed=2.04705 finalLat=43.236 finalLon=25.02409 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.14088 startLon=24.72691 ] -LOG TID(1) INFO 82.8207 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:35:03 Routing_CalculatingRoute [ distance=21472.8 elapsed=2.59888 finalLat=55.3284 finalLon=8.76478 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.15542 startLon=8.77815 ] -LOG TID(1) INFO 83.0318 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:47:55 Routing_CalculatingRoute [ distance=70494.1 elapsed=2.05716 finalLat=43.22403 finalLon=5.54069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.04307 startLon=6.13419 ] -LOG TID(1) INFO 83.3598 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:48:14 Routing_CalculatingRoute [ distance=72120.5 elapsed=0.804883 finalLat=43.22403 finalLon=5.54069 name=vehicle result=NoError startDirectionX=0.00016 startDirectionY=0 startLat=43.04474 startLon=6.13594 ] -LOG TID(1) INFO 83.4337 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:17:26 Routing_CalculatingRoute [ distance=62948.5 elapsed=0.49913 finalLat=43.22403 finalLon=5.54069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.10748 startLon=6.12839 ] -LOG TID(1) INFO 83.5179 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:47:05 Routing_CalculatingRoute [ distance=62972.9 elapsed=0.481276 finalLat=43.22403 finalLon=5.54069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.10726 startLon=6.12857 ] -LOG TID(1) INFO 83.5922 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:54:35 Routing_CalculatingRoute [ distance=59868.7 elapsed=0.688235 finalLat=43.22403 finalLon=5.54069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.12626 startLon=6.08145 ] -LOG TID(1) INFO 83.6748 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:22:26 Routing_CalculatingRoute [ distance=42876.4 elapsed=2.2184 finalLat=43.52984 finalLon=5.44748 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.24773 startLon=5.54797 ] -LOG TID(1) INFO 83.8303 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:19:06 Routing_CalculatingRoute [ distance=100593 elapsed=0.815352 finalLat=45.18248 finalLon=5.72107 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.88294 startLon=4.86771 ] -LOG TID(1) INFO 84.0023 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 21:17:28 Routing_CalculatingRoute [ distance=50077.2 elapsed=4.51077 finalLat=-23.26594 finalLon=-51.05224 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-23.384 startLon=-51.44971 ] -LOG TID(1) INFO 84.1265 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:00:48 Routing_CalculatingRoute [ distance=41302.1 elapsed=5.6195 finalLat=-23.6013 finalLon=-51.64418 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-23.41408 startLon=-51.43146 ] -LOG TID(1) INFO 84.254 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Aug-2015 19:19:21 Routing_CalculatingRoute [ distance=105160 elapsed=7.54945 finalLat=58.58668 finalLon=7.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.99568 startLon=7.09149 ] -LOG TID(1) INFO 84.432 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:22:18 Routing_CalculatingRoute [ distance=1.1e+06 elapsed=1.98783 finalLat=25.05153 finalLon=102.70177 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=24.78105 startLon=110.49043 ] -LOG TID(1) INFO 85.265 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:15:19 Routing_CalculatingRoute [ distance=27398.8 elapsed=0.145494 finalLat=41.93889 finalLon=21.61499 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.02159 startLon=21.35166 ] -LOG TID(1) INFO 85.4105 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:19 Routing_CalculatingRoute [ distance=28098.7 elapsed=0.107245 finalLat=41.89472 finalLon=21.33114 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.02157 startLon=21.35166 ] -LOG TID(1) INFO 85.4497 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:32 Routing_CalculatingRoute [ distance=40758.5 elapsed=0.11108 finalLat=41.79942 finalLon=21.31758 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.02156 startLon=21.35163 ] -LOG TID(1) INFO 85.4839 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 22:52:36 Routing_CalculatingRoute [ distance=107566 elapsed=1.34724 finalLat=36.03716 finalLon=-114.80134 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.26328 startLon=-115.60926 ] -LOG TID(1) INFO 85.5201 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 00:04:21 Routing_CalculatingRoute [ distance=63964.7 elapsed=0.505739 finalLat=36.03716 finalLon=-114.80134 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00079 startLat=36.20274 startLon=-115.24319 ] -LOG TID(1) INFO 85.5602 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 00:04:26 Routing_CalculatingRoute [ distance=63704.9 elapsed=0.41301 finalLat=36.03716 finalLon=-114.80134 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00203 startLat=36.20175 startLon=-115.24318 ] -LOG TID(1) INFO 85.5985 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 00:10:22 Routing_CalculatingRoute [ distance=54551 elapsed=0.632929 finalLat=36.03716 finalLon=-114.80134 name=vehicle result=NoError startDirectionX=0.0009 startDirectionY=-0 startLat=36.1741 startLon=-115.166 ] -LOG TID(1) INFO 85.6421 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:20:54 Routing_CalculatingRoute [ distance=460968 elapsed=0.532457 finalLat=32.07743 finalLon=23.96 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.10142 startLon=20.08094 ] -LOG TID(1) INFO 85.7101 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:21:00 Routing_CalculatingRoute [ distance=460967 elapsed=0.372678 finalLat=32.07743 finalLon=23.96 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.10142 startLon=20.08094 ] -LOG TID(1) INFO 85.7611 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:27:04 Routing_CalculatingRoute [ distance=139501 elapsed=0.449474 finalLat=43.85951 finalLon=18.43114 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.59972 startLon=19.4951 ] -LOG TID(1) INFO 85.8881 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:05 Routing_CalculatingRoute [ distance=498808 elapsed=3.41898 finalLat=37.96843 finalLon=23.64973 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.5728 startLon=22.96172 ] -LOG TID(1) INFO 86.3144 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:22 Routing_CalculatingRoute [ distance=17313.3 elapsed=0.268896 finalLat=5.2008 finalLon=103.20539 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.06754 startLon=103.27792 ] -LOG TID(1) INFO 86.3785 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:47:28 Routing_CalculatingRoute [ distance=151340 elapsed=0.541198 finalLat=44.44982 finalLon=-73.17814 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.70252 startLon=-72.31043 ] -LOG TID(1) INFO 86.4828 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:48:13 Routing_CalculatingRoute [ distance=20192.7 elapsed=0.21463 finalLat=43.71671 finalLon=-72.41239 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.70397 startLon=-72.31113 ] -LOG TID(1) INFO 86.4991 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:48:28 Routing_CalculatingRoute [ distance=18770.1 elapsed=0.169464 finalLat=43.70425 finalLon=-72.41198 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.70407 startLon=-72.31121 ] -LOG TID(1) INFO 86.515 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:56:54 Routing_CalculatingRoute [ distance=136276 elapsed=0.231628 finalLat=44.45135 finalLon=-73.18106 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.66103 startLon=-72.36314 ] -LOG TID(1) INFO 86.5337 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Jul-2015 15:23:36 Routing_CalculatingRoute [ distance=22277.4 elapsed=1.10484 finalLat=44.6071 finalLon=4.24231 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.53417 startLon=4.19446 ] -LOG TID(1) INFO 86.6004 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:31 Routing_CalculatingRoute [ distance=176429 elapsed=4.79305 finalLat=43.40881 finalLon=24.61811 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.76604 startLon=23.19747 ] -LOG TID(1) INFO 86.8002 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 13-Oct-2015 19:01:37 Routing_CalculatingRoute [ distance=13568.3 elapsed=2.65468 finalLat=50.02515 finalLon=5.37386 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.09572 startLon=5.28512 ] -LOG TID(1) INFO 86.9479 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:21:03 Routing_CalculatingRoute [ distance=383071 elapsed=3.66972 finalLat=42.69772 finalLon=23.32258 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.50949 startLon=27.47415 ] -LOG TID(1) INFO 87.0885 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:21:40 Routing_CalculatingRoute [ distance=20388.9 elapsed=6.53249 finalLat=44.0363 finalLon=1.21873 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.91293 startLon=1.27411 ] -LOG TID(1) INFO 87.2982 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:19 Routing_CalculatingRoute [ distance=20389.3 elapsed=0.726228 finalLat=44.0363 finalLon=1.21873 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.91292 startLon=1.27412 ] -LOG TID(1) INFO 87.3912 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:51:52 Routing_CalculatingRoute [ distance=300658 elapsed=1.32269 finalLat=40.23384 finalLon=-111.65853 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.60563 startLon=-109.59045 ] -LOG TID(1) INFO 87.6375 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:12:42 Routing_CalculatingRoute [ distance=18627.1 elapsed=0.691588 finalLat=38.4598 finalLon=-109.82068 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.61428 startLon=-109.81585 ] -LOG TID(1) INFO 87.6788 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:36:36 Routing_CalculatingRoute [ distance=116698 elapsed=0.418214 finalLat=38.99523 finalLon=-110.16172 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.33655 startLon=-109.85662 ] -LOG TID(1) INFO 87.7243 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:56:50 Routing_CalculatingRoute [ distance=107768 elapsed=0.260207 finalLat=38.99039 finalLon=-110.1331 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.38869 startLon=-109.86951 ] -LOG TID(1) INFO 87.7597 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:35:44 Routing_CalculatingRoute [ distance=313097 elapsed=0.581546 finalLat=40.21418 finalLon=-111.65845 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.52247 startLon=-109.79988 ] -LOG TID(1) INFO 87.8081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:06:10 Routing_CalculatingRoute [ distance=50764.2 elapsed=0.208545 finalLat=38.99039 finalLon=-110.1331 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.77216 startLon=-109.74762 ] -LOG TID(1) INFO 87.8414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:23:28 Routing_CalculatingRoute [ distance=10716.9 elapsed=0.128349 finalLat=49.33567 finalLon=6.75528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.28325 startLon=6.76617 ] -LOG TID(1) INFO 87.9226 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:23:48 Routing_CalculatingRoute [ distance=10442.3 elapsed=0.068062 finalLat=49.32742 finalLon=6.67449 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.2872 startLon=6.76087 ] -LOG TID(1) INFO 87.9471 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:10:19 Routing_CalculatingRoute [ distance=26641.8 elapsed=0.873528 finalLat=42.53278 finalLon=-90.43457 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.64038 startLon=-90.62392 ] -LOG TID(1) INFO 88.1403 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Aug-2015 13:04:26 Routing_CalculatingRoute [ distance=131521 elapsed=1.28427 finalLat=55.3871 finalLon=14.06568 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.26743 startLon=14.58844 ] -LOG TID(1) INFO 88.6415 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Aug-2015 13:49:30 Routing_CalculatingRoute [ distance=12419.5 elapsed=0.724187 finalLat=56.26905 finalLon=14.50935 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.25303 startLon=14.62023 ] -LOG TID(1) INFO 88.7768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Aug-2015 13:51:20 Routing_CalculatingRoute [ distance=12419.5 elapsed=0.749367 finalLat=56.26905 finalLon=14.50935 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.25303 startLon=14.61995 ] -LOG TID(1) INFO 88.9018 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:25:38 Routing_CalculatingRoute [ distance=1.17773e+06 elapsed=6.96392 finalLat=43.10009 finalLon=-79.11395 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.6819 startLon=-86.16625 ] -LOG TID(1) INFO 89.052 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 15:01:11 Routing_CalculatingRoute [ distance=935737 elapsed=2.54653 finalLat=43.65293 finalLon=-79.38492 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.21503 startLon=-84.85179 ] -LOG TID(1) INFO 89.21 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 09:16:33 Routing_CalculatingRoute [ distance=91948.1 elapsed=1.49642 finalLat=50.77636 finalLon=6.08387 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.73138 startLon=7.10335 ] -LOG TID(1) INFO 89.4621 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:21:34 Routing_CalculatingRoute [ distance=45737.5 elapsed=1.6033 finalLat=51.869 finalLon=9.81031 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.8332 startLon=10.29389 ] -LOG TID(1) INFO 89.89 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:23:14 Routing_CalculatingRoute [ distance=69188 elapsed=1.80165 finalLat=51.50521 finalLon=9.89845 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.83319 startLon=10.29389 ] -LOG TID(1) INFO 90.1423 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:20:09 Routing_CalculatingRoute [ distance=597081 elapsed=8.76953 finalLat=53.56114 finalLon=49.3052 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.30989 startLon=47.89046 ] -LOG TID(1) INFO 90.8107 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:21:45 Routing_CalculatingRoute [ distance=13940.4 elapsed=0.503865 finalLat=1.34949 finalLon=103.8674 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.31706 startLon=103.77764 ] -LOG TID(1) INFO 90.9166 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:23:47 Routing_CalculatingRoute [ distance=14516.8 elapsed=0.361326 finalLat=1.36775 finalLon=103.85938 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.31708 startLon=103.77763 ] -LOG TID(1) INFO 90.9487 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:40:59 Routing_CalculatingRoute [ distance=146873 elapsed=2.23005 finalLat=9.21308 finalLon=-66.00233 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.46106 startLon=-64.81875 ] -LOG TID(1) INFO 90.987 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:41:07 Routing_CalculatingRoute [ distance=146873 elapsed=0.264588 finalLat=9.21308 finalLon=-66.00233 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.46106 startLon=-64.81875 ] -LOG TID(1) INFO 91.0337 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 09:25:16 Routing_CalculatingRoute [ distance=128180 elapsed=0.580611 finalLat=63.61592 finalLon=-19.99345 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=64.14204 startLon=-21.95339 ] -LOG TID(1) INFO 91.1241 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 12:12:56 Routing_CalculatingRoute [ distance=29886.4 elapsed=0.305035 finalLat=63.53201 finalLon=-19.51079 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=63.62231 startLon=-19.98961 ] -LOG TID(1) INFO 91.1376 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 13:19:03 Routing_CalculatingRoute [ distance=28147.7 elapsed=0.319369 finalLat=63.40234 finalLon=-19.13058 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=63.52929 startLon=-19.51302 ] -LOG TID(1) INFO 91.1498 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 14:21:52 Routing_CalculatingRoute [ distance=20554 elapsed=0.292925 finalLat=63.40402 finalLon=-19.04778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=63.40417 startLon=-19.12931 ] -LOG TID(1) INFO 91.1613 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 14:22:17 Routing_CalculatingRoute [ distance=18058.7 elapsed=0.0831415 finalLat=63.40402 finalLon=-19.04778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=63.40417 startLon=-19.12931 ] -LOG TID(1) INFO 91.1699 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 14:22:23 Routing_CalculatingRoute [ distance=18058.7 elapsed=0.0797121 finalLat=63.40402 finalLon=-19.04778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=63.40417 startLon=-19.12931 ] -LOG TID(1) INFO 91.1866 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:31:08 Routing_CalculatingRoute [ distance=34348 elapsed=0.281572 finalLat=14.65 finalLon=-90.73333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.58728 startLon=-90.55292 ] -LOG TID(1) INFO 91.2298 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:23:39 Routing_CalculatingRoute [ distance=13447.5 elapsed=0.262288 finalLat=14.62476 finalLon=-90.51708 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.53501 startLon=-90.5557 ] -LOG TID(1) INFO 91.2716 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:39:29 Routing_CalculatingRoute [ distance=43977.3 elapsed=0.866232 finalLat=50.95808 finalLon=14.08253 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.0248 startLon=13.70526 ] -LOG TID(1) INFO 91.3536 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:40:39 Routing_CalculatingRoute [ distance=43972.2 elapsed=0.504326 finalLat=50.95872 finalLon=14.08217 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.0248 startLon=13.70526 ] -LOG TID(1) INFO 91.4472 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:24:04 Routing_CalculatingRoute [ distance=177828 elapsed=1.26436 finalLat=60.23906 finalLon=25.0685 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.60512 startLon=27.84936 ] -LOG TID(1) INFO 91.705 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:20:52 Routing_CalculatingRoute [ distance=83600.3 elapsed=0.3652 finalLat=41.64098 finalLon=69.94125 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.33898 startLon=69.1811 ] -LOG TID(1) INFO 91.8788 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:09 Routing_CalculatingRoute [ distance=83604.8 elapsed=0.182786 finalLat=41.64098 finalLon=69.94125 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.33887 startLon=69.18116 ] -LOG TID(1) INFO 91.9513 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:17:36 Routing_CalculatingRoute [ distance=412110 elapsed=3.28442 finalLat=39.80793 finalLon=46.69772 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.38701 startLon=49.98209 ] -LOG TID(1) INFO 92.1308 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 05:04:27 Routing_CalculatingRoute [ distance=28305.8 elapsed=1.05791 finalLat=42.95968 finalLon=-88.06152 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.07946 startLon=-87.88164 ] -LOG TID(1) INFO 92.3841 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 13:18:11 Routing_CalculatingRoute [ distance=33266.4 elapsed=1.03504 finalLat=43.98736 finalLon=18.17933 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.85454 startLon=18.40076 ] -LOG TID(1) INFO 92.5341 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 13-Sep-2015 10:14:29 Routing_CalculatingRoute [ distance=22766 elapsed=3.92384 finalLat=50.82463 finalLon=6.97907 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.72281 startLon=6.89259 ] -LOG TID(1) INFO 92.6897 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 13-Sep-2015 10:14:31 Routing_CalculatingRoute [ distance=23082.8 elapsed=2.01642 finalLat=50.82463 finalLon=6.97907 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.72048 startLon=6.89516 ] -LOG TID(1) INFO 92.8805 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Sep-2015 12:28:48 Routing_CalculatingRoute [ distance=172138 elapsed=5.72388 finalLat=23.11561 finalLon=113.23989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.42076 startLon=114.23513 ] -LOG TID(1) INFO 93.5885 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Oct-2015 10:24:24 Routing_CalculatingRoute [ distance=10781.8 elapsed=0.762263 finalLat=50.57028 finalLon=3.06375 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.64145 startLon=3.06847 ] -LOG TID(1) INFO 93.8089 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Oct-2015 10:24:24 Routing_CalculatingRoute [ distance=10781.8 elapsed=0.762263 finalLat=50.57028 finalLon=3.06375 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.64145 startLon=3.06847 ] -LOG TID(1) INFO 93.8829 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:43:05 Routing_CalculatingRoute [ distance=45381.6 elapsed=1.66354 finalLat=29.78794 finalLon=-95.53021 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.07196 startLon=-95.4502 ] -LOG TID(1) INFO 94.6047 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:43:31 Routing_CalculatingRoute [ distance=10135.9 elapsed=1.59889 finalLat=48.15197 finalLon=11.51103 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.12975 startLon=11.61205 ] -LOG TID(1) INFO 94.8949 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:43:05 Routing_CalculatingRoute [ distance=35164.1 elapsed=1.88649 finalLat=30.21018 finalLon=-95.45532 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.95623 startLon=-95.53922 ] -LOG TID(1) INFO 95.2589 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:46:52 Routing_CalculatingRoute [ distance=20408.1 elapsed=1.09833 finalLat=30.07189 finalLon=-95.45031 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.9587 startLon=-95.54062 ] -LOG TID(1) INFO 95.5612 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:23:36 Routing_CalculatingRoute [ distance=17215.3 elapsed=1.61153 finalLat=6.62292 finalLon=3.32034 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=6.54133 startLon=3.22276 ] -LOG TID(1) INFO 95.8007 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:49 Routing_CalculatingRoute [ distance=17215.3 elapsed=0.706644 finalLat=6.62292 finalLon=3.32034 name=vehicle result=NoError startDirectionX=0 startDirectionY=0.00002 startLat=6.54135 startLon=3.22277 ] -LOG TID(1) INFO 95.8488 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:09 Routing_CalculatingRoute [ distance=12741 elapsed=0.388244 finalLat=44.43609 finalLon=-73.11622 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.50652 startLon=-73.17961 ] -LOG TID(1) INFO 95.8929 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 13:09:53 Routing_CalculatingRoute [ distance=23073.6 elapsed=1.73844 finalLat=34.88631 finalLon=135.54034 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.79776 startLon=135.65691 ] -LOG TID(1) INFO 96.4456 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 13:10:58 Routing_CalculatingRoute [ distance=15371.4 elapsed=1.90715 finalLat=34.68448 finalLon=135.65093 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.79778 startLon=135.65691 ] -LOG TID(1) INFO 96.7693 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Sep-2015 07:03:32 Routing_CalculatingRoute [ distance=36269 elapsed=0.725954 finalLat=40.03554 finalLon=23.36001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.9459 startLon=23.67309 ] -LOG TID(1) INFO 96.9736 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:52:14 Routing_CalculatingRoute [ distance=568057 elapsed=7.51054 finalLat=26.01673 finalLon=-97.47931 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.35939 startLon=-97.75087 ] -LOG TID(1) INFO 97.6966 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 07:39:29 Routing_CalculatingRoute [ distance=43977.3 elapsed=0.866232 finalLat=50.95808 finalLon=14.08253 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.0248 startLon=13.70526 ] -LOG TID(1) INFO 97.8721 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:57:03 Routing_CalculatingRoute [ distance=39449 elapsed=0.272206 finalLat=45.36005 finalLon=-75.65785 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.28018 startLon=-75.28282 ] -LOG TID(1) INFO 97.978 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:24:07 Routing_CalculatingRoute [ distance=11719.5 elapsed=1.00807 finalLat=40.65204 finalLon=-73.87163 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.61167 startLon=-73.97937 ] -LOG TID(1) INFO 98.2789 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:29:49 Routing_CalculatingRoute [ distance=32555.5 elapsed=2.30436 finalLat=43.61366 finalLon=-116.41688 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.64687 startLon=-116.7226 ] -LOG TID(1) INFO 98.354 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:47:46 Routing_CalculatingRoute [ distance=41278.6 elapsed=0.106885 finalLat=35.90983 finalLon=14.50287 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.07184 startLon=14.26064 ] -LOG TID(1) INFO 98.4133 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:07:20 Routing_CalculatingRoute [ distance=24734.8 elapsed=0.0945463 finalLat=35.91023 finalLon=14.50274 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.98631 startLon=14.33994 ] -LOG TID(1) INFO 98.4396 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:33:23 Routing_CalculatingRoute [ distance=24710.9 elapsed=0.132989 finalLat=35.91023 finalLon=14.50274 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=-0 startLat=35.9768 startLon=14.34584 ] -LOG TID(1) INFO 98.4623 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:24:56 Routing_CalculatingRoute [ distance=109622 elapsed=3.8297 finalLat=49.25779 finalLon=4.03192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.63685 startLon=4.98054 ] -LOG TID(1) INFO 98.5406 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 05:33:18 Routing_CalculatingRoute [ distance=12934.7 elapsed=1.16036 finalLat=31.23055 finalLon=121.65125 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.20915 startLon=121.53565 ] -LOG TID(1) INFO 98.7972 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:55 Routing_CalculatingRoute [ distance=27825.5 elapsed=1.50943 finalLat=48.13552 finalLon=11.56793 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.19509 startLon=11.86149 ] -LOG TID(1) INFO 99.0649 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 03:55:00 Routing_CalculatingRoute [ distance=200288 elapsed=0.359289 finalLat=55.74206 finalLon=-97.86341 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.57416 startLon=-99.77563 ] -LOG TID(1) INFO 99.1905 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:09 Routing_CalculatingRoute [ distance=12741 elapsed=0.388244 finalLat=44.43609 finalLon=-73.11622 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.50652 startLon=-73.17961 ] -LOG TID(1) INFO 99.2194 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:55:02 Routing_CalculatingRoute [ distance=67183.7 elapsed=0.598756 finalLat=60.86068 finalLon=7.11969 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.62806 startLon=6.40517 ] -LOG TID(1) INFO 99.4138 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:50:20 Routing_CalculatingRoute [ distance=585655 elapsed=0.405318 finalLat=52.10505 finalLon=-101.27055 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.47332 startLon=-98.1467 ] -LOG TID(1) INFO 99.5468 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Sep-2015 13:36:05 Routing_CalculatingRoute [ distance=14521.4 elapsed=3.75677 finalLat=45.09092 finalLon=5.67858 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.18235 startLon=5.72972 ] -LOG TID(1) INFO 99.7302 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:03:35 Routing_CalculatingRoute [ distance=28162.7 elapsed=10.5733 finalLat=34.8345 finalLon=134.6941 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.84968 startLon=134.94672 ] -LOG TID(1) INFO 99.9833 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 06:15:16 Routing_CalculatingRoute [ distance=46302.2 elapsed=1.20006 finalLat=52.82466 finalLon=117.27154 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.5138 startLon=116.99929 ] -LOG TID(1) INFO 100.147 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:02:15 Routing_CalculatingRoute [ distance=44390.1 elapsed=0.586485 finalLat=52.51407 finalLon=117.01371 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.82173 startLon=117.27562 ] -LOG TID(1) INFO 100.23 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:08:10 Routing_CalculatingRoute [ distance=43123.7 elapsed=0.590525 finalLat=52.51407 finalLon=117.01371 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.81459 startLon=117.26616 ] -LOG TID(1) INFO 100.355 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:21:06 Routing_CalculatingRoute [ distance=46412.9 elapsed=0.637037 finalLat=52.82142 finalLon=117.28647 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.50527 startLon=117.00197 ] -LOG TID(1) INFO 100.437 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:55:43 Routing_CalculatingRoute [ distance=344181 elapsed=0.362332 finalLat=52.10505 finalLon=-101.27055 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.58982 startLon=-100.83914 ] -LOG TID(1) INFO 100.491 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:05:30 Routing_CalculatingRoute [ distance=324401 elapsed=0.0835399 finalLat=52.10505 finalLon=-101.27055 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.52221 startLon=-101.1181 ] -LOG TID(1) INFO 100.517 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 14-Sep-2015 18:09:43 Routing_CalculatingRoute [ distance=570430 elapsed=0.130964 finalLat=19.56972 finalLon=57.70119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.6001 startLon=58.37463 ] -LOG TID(1) INFO 100.556 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 14-Sep-2015 18:09:45 Routing_CalculatingRoute [ distance=570430 elapsed=0.135535 finalLat=19.56972 finalLon=57.70119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.6001 startLon=58.37463 ] -LOG TID(1) INFO 100.59 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:24:53 Routing_CalculatingRoute [ distance=88950.4 elapsed=0.916356 finalLat=18.47141 finalLon=-69.80726 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.90104 startLon=-70.28197 ] -LOG TID(1) INFO 100.653 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:56:09 Routing_CalculatingRoute [ distance=10007.7 elapsed=0.727036 finalLat=46.87425 finalLon=-71.33045 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.83026 startLon=-71.25651 ] -LOG TID(1) INFO 100.727 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:29:19 Routing_CalculatingRoute [ distance=18540.4 elapsed=0.779327 finalLat=40.66295 finalLon=-73.95178 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.78305 startLon=-73.92936 ] -LOG TID(1) INFO 100.892 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:36:14 Routing_CalculatingRoute [ distance=10475.5 elapsed=0.550598 finalLat=40.66127 finalLon=-73.95411 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.73382 startLon=-73.92386 ] -LOG TID(1) INFO 101.03 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 18:09:53 Routing_CalculatingRoute [ distance=28295.7 elapsed=8.53364 finalLat=58.11157 finalLon=59.87755 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=57.88064 startLon=59.84365 ] -LOG TID(1) INFO 101.114 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:56 Routing_CalculatingRoute [ distance=15748.5 elapsed=0.787127 finalLat=46.03403 finalLon=14.48342 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.95646 startLon=14.41923 ] -LOG TID(1) INFO 101.19 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:03 Routing_CalculatingRoute [ distance=69266.8 elapsed=1.1043 finalLat=50.73445 finalLon=7.08142 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.20729 startLon=6.78744 ] -LOG TID(1) INFO 101.408 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:31:36 Routing_CalculatingRoute [ distance=16265.9 elapsed=1.64419 finalLat=51.3637 finalLon=7.5696 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.46335 startLon=7.5228 ] -LOG TID(1) INFO 101.626 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:19:02 Routing_CalculatingRoute [ distance=16363.1 elapsed=0.113668 finalLat=41.96249 finalLon=21.62279 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.08426 startLon=21.70238 ] -LOG TID(1) INFO 101.708 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:56 Routing_CalculatingRoute [ distance=15748.5 elapsed=0.787127 finalLat=46.03403 finalLon=14.48342 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.95646 startLon=14.41923 ] -LOG TID(1) INFO 101.743 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:03 Routing_CalculatingRoute [ distance=115835 elapsed=2.06469 finalLat=46.16297 finalLon=16.83194 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.43627 startLon=16.8547 ] -LOG TID(1) INFO 101.94 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 14:18:09 Routing_CalculatingRoute [ distance=54968.9 elapsed=3.70142 finalLat=45.50204 finalLon=-73.55872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.40291 startLon=-74.13937 ] -LOG TID(1) INFO 102.021 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 14:20:06 Routing_CalculatingRoute [ distance=54981.1 elapsed=2.84869 finalLat=45.50204 finalLon=-73.55872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.4028 startLon=-74.13939 ] -LOG TID(1) INFO 102.1 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:24:47 Routing_CalculatingRoute [ distance=155859 elapsed=0.859758 finalLat=55.00783 finalLon=60.29717 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=56.08596 startLon=60.72534 ] -LOG TID(1) INFO 102.2 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:14 Routing_CalculatingRoute [ distance=17583.4 elapsed=0.160419 finalLat=42.59498 finalLon=21.42898 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.46957 startLon=21.46219 ] -LOG TID(1) INFO 102.28 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:36 Routing_CalculatingRoute [ distance=15327.3 elapsed=1.11775 finalLat=43.677 finalLon=-79.71342 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77572 startLon=-79.69299 ] -LOG TID(1) INFO 102.368 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 12-Aug-2015 04:49:55 Routing_CalculatingRoute [ distance=14598.7 elapsed=0.56253 finalLat=18.49848 finalLon=-69.86915 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.55153 startLon=-69.92618 ] -LOG TID(1) INFO 102.456 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:09 Routing_CalculatingRoute [ distance=28398.7 elapsed=2.92706 finalLat=43.05188 finalLon=-89.50913 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.93813 startLon=-89.71397 ] -LOG TID(1) INFO 102.667 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:17 Routing_CalculatingRoute [ distance=28104.5 elapsed=0.2808 finalLat=43.05188 finalLon=-89.50913 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.93591 startLon=-89.71202 ] -LOG TID(1) INFO 102.754 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:25:21 Routing_CalculatingRoute [ distance=28000.1 elapsed=0.279243 finalLat=43.05188 finalLon=-89.50913 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.93525 startLon=-89.71111 ] -LOG TID(1) INFO 102.856 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:15 Routing_CalculatingRoute [ distance=16283 elapsed=1.09393 finalLat=12.3405 finalLon=-1.47989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.39202 startLon=-1.56473 ] -LOG TID(1) INFO 103.091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:42 Routing_CalculatingRoute [ distance=118412 elapsed=0.367492 finalLat=11.9268 finalLon=-2.51001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.3209 startLon=-1.57553 ] -LOG TID(1) INFO 103.141 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:20 Routing_CalculatingRoute [ distance=83149.9 elapsed=0.326684 finalLat=12.06085 finalLon=-2.22621 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.32092 startLon=-1.57558 ] -LOG TID(1) INFO 103.179 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:36 Routing_CalculatingRoute [ distance=118412 elapsed=0.447247 finalLat=11.9268 finalLon=-2.51001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.32087 startLon=-1.5756 ] -LOG TID(1) INFO 103.217 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 01:36:54 Routing_CalculatingRoute [ distance=69845.8 elapsed=0.819435 finalLat=43.7339 finalLon=-122.44847 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00133 startLat=44.04675 startLon=-123.09435 ] -LOG TID(1) INFO 103.28 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:19:13 Routing_CalculatingRoute [ distance=16182.1 elapsed=10.0446 finalLat=60.37692 finalLon=5.34004 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.28847 startLon=5.22917 ] -LOG TID(1) INFO 103.447 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:34 Routing_CalculatingRoute [ distance=27532.9 elapsed=1.484 finalLat=39.31511 finalLon=-84.43439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.1655 startLon=-84.54057 ] -LOG TID(1) INFO 103.783 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:37:49 Routing_CalculatingRoute [ distance=31309.6 elapsed=1.677 finalLat=39.31511 finalLon=-84.43439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.1092 startLon=-84.53301 ] -LOG TID(1) INFO 103.916 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:37:11 Routing_CalculatingRoute [ distance=134595 elapsed=0.51468 finalLat=34.51528 finalLon=36.19611 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.80366 startLon=35.49682 ] -LOG TID(1) INFO 103.983 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:11:27 Routing_CalculatingRoute [ distance=34303.1 elapsed=0.408617 finalLat=2.96996 finalLon=101.84185 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=3.15278 startLon=101.70888 ] -LOG TID(1) INFO 104.044 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:19:02 Routing_CalculatingRoute [ distance=16363.1 elapsed=0.113668 finalLat=41.96249 finalLon=21.62279 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.08426 startLon=21.70238 ] -LOG TID(1) INFO 104.073 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:30:09 Routing_CalculatingRoute [ distance=14613.2 elapsed=0.578598 finalLat=60.21607 finalLon=24.75346 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.17288 startLon=24.94051 ] -LOG TID(1) INFO 104.327 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:30:14 Routing_CalculatingRoute [ distance=14613.2 elapsed=0.180708 finalLat=60.21607 finalLon=24.75346 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.17286 startLon=24.94048 ] -LOG TID(1) INFO 104.444 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:55 Routing_CalculatingRoute [ distance=41667.3 elapsed=7.90293 finalLat=45.62421 finalLon=-73.76982 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.46033 startLon=-73.47088 ] -LOG TID(1) INFO 104.548 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:42 Routing_CalculatingRoute [ distance=41700.4 elapsed=0.902043 finalLat=45.62429 finalLon=-73.7694 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.46032 startLon=-73.4709 ] -LOG TID(1) INFO 104.641 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:18 Routing_CalculatingRoute [ distance=46780.2 elapsed=1.9363 finalLat=43.5971 finalLon=1.89243 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.61312 startLon=1.4461 ] -LOG TID(1) INFO 104.937 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 03:28:47 Routing_CalculatingRoute [ distance=14404.6 elapsed=0.373605 finalLat=3.13268 finalLon=101.68789 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=3.23773 startLon=101.68153 ] -LOG TID(1) INFO 105.026 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 02:07:52 Routing_CalculatingRoute [ distance=16791.2 elapsed=0.189612 finalLat=5.82097 finalLon=-55.16486 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.69297 startLon=-55.21417 ] -LOG TID(1) INFO 105.101 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:30:13 Routing_CalculatingRoute [ distance=11607.1 elapsed=1.23278 finalLat=44.64029 finalLon=-63.56831 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.66431 startLon=-63.67593 ] -LOG TID(1) INFO 105.128 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:32:05 Routing_CalculatingRoute [ distance=12334.2 elapsed=0.802472 finalLat=44.88075 finalLon=-0.46491 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.84178 startLon=-0.57429 ] -LOG TID(1) INFO 105.453 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:21:02 Routing_CalculatingRoute [ distance=193985 elapsed=1.05715 finalLat=43.47396 finalLon=-1.56946 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.84177 startLon=-0.57429 ] -LOG TID(1) INFO 105.737 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:31:40 Routing_CalculatingRoute [ distance=92905.6 elapsed=2.3259 finalLat=55.92878 finalLon=-3.17227 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.86128 startLon=-4.44065 ] -LOG TID(1) INFO 106.14 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:31:40 Routing_CalculatingRoute [ distance=92905.7 elapsed=0.496811 finalLat=55.92878 finalLon=-3.17227 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.86128 startLon=-4.44065 ] -LOG TID(1) INFO 106.226 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:32:19 Routing_CalculatingRoute [ distance=123852 elapsed=0.583927 finalLat=60.08928 finalLon=10.87123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=60.79433 startLon=11.06838 ] -LOG TID(1) INFO 106.467 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:47 Routing_CalculatingRoute [ distance=161987 elapsed=0.629303 finalLat=58.37659 finalLon=25.58442 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.44143 startLon=24.7363 ] -LOG TID(1) INFO 106.635 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:50 Routing_CalculatingRoute [ distance=161987 elapsed=0.28247 finalLat=58.37659 finalLon=25.58442 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.44143 startLon=24.7363 ] -LOG TID(1) INFO 106.689 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 14:49:32 Routing_CalculatingRoute [ distance=21929.3 elapsed=1.46844 finalLat=7.37946 finalLon=79.87415 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.20961 startLon=79.84052 ] -LOG TID(1) INFO 106.825 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:12:17 Routing_CalculatingRoute [ distance=175423 elapsed=3.35458 finalLat=42.45859 finalLon=59.60578 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.52605 startLon=60.49655 ] -LOG TID(1) INFO 106.924 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:12:17 Routing_CalculatingRoute [ distance=175423 elapsed=3.35458 finalLat=42.45859 finalLon=59.60578 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.52605 startLon=60.49655 ] -LOG TID(1) INFO 106.964 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 17:50:48 Routing_CalculatingRoute [ distance=17933.4 elapsed=0.301069 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.9773 startLon=-79.55012 ] -LOG TID(1) INFO 107.041 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 18:32:35 Routing_CalculatingRoute [ distance=14517.3 elapsed=0.184492 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=9.09084 startLon=-79.61884 ] -LOG TID(1) INFO 107.05 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 18:32:38 Routing_CalculatingRoute [ distance=14517.4 elapsed=0.16067 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=9.09084 startLon=-79.61884 ] -LOG TID(1) INFO 107.057 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 18:32:41 Routing_CalculatingRoute [ distance=14517.5 elapsed=0.139266 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=9.09084 startLon=-79.61885 ] -LOG TID(1) INFO 107.064 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 18:32:44 Routing_CalculatingRoute [ distance=14517.6 elapsed=0.152752 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=9.09084 startLon=-79.61885 ] -LOG TID(1) INFO 107.072 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 18:32:47 Routing_CalculatingRoute [ distance=14517.7 elapsed=0.166989 finalLat=9.06591 finalLon=-79.64673 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=9.09084 startLon=-79.61885 ] -LOG TID(1) INFO 107.085 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:56:05 Routing_CalculatingRoute [ distance=456010 elapsed=2.77682 finalLat=43.05512 finalLon=-75.84284 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.72679 startLon=-73.99401 ] -LOG TID(1) INFO 107.536 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 22:46:30 Routing_CalculatingRoute [ distance=28585.4 elapsed=0.305 finalLat=5.66693 finalLon=-0.177 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.52898 startLon=-0.3198 ] -LOG TID(1) INFO 107.639 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 17:11:04 Routing_CalculatingRoute [ distance=85363.2 elapsed=0.603524 finalLat=9.06432 finalLon=7.48931 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.06836 startLon=7.93772 ] -LOG TID(1) INFO 107.833 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 17:56:58 Routing_CalculatingRoute [ distance=38259.3 elapsed=0.4413 finalLat=9.06432 finalLon=7.48931 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.99926 startLon=7.67172 ] -LOG TID(1) INFO 107.922 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:31:59 Routing_CalculatingRoute [ distance=37612 elapsed=0.78357 finalLat=54.00171 finalLon=9.37464 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.00246 startLon=9.76694 ] -LOG TID(1) INFO 108.052 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 10:00:01 Routing_CalculatingRoute [ distance=45135 elapsed=0.344067 finalLat=32.55559 finalLon=35.84932 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.21975 startLon=35.8902 ] -LOG TID(1) INFO 108.102 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 10:00:01 Routing_CalculatingRoute [ distance=45135 elapsed=0.344067 finalLat=32.55559 finalLon=35.84932 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.21975 startLon=35.8902 ] -LOG TID(1) INFO 108.126 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:22:37 Routing_CalculatingRoute [ distance=46939.1 elapsed=1.60236 finalLat=58.01417 finalLon=11.82223 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.11145 startLon=12.15082 ] -LOG TID(1) INFO 108.363 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:56 Routing_CalculatingRoute [ distance=52088.6 elapsed=1.42078 finalLat=57.80361 finalLon=12.16498 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.11145 startLon=12.15082 ] -LOG TID(1) INFO 108.59 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 22:46:30 Routing_CalculatingRoute [ distance=28585.4 elapsed=0.305 finalLat=5.66693 finalLon=-0.177 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.52898 startLon=-0.3198 ] -LOG TID(1) INFO 108.655 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:43 Routing_CalculatingRoute [ distance=328049 elapsed=10.7404 finalLat=-25.5169 finalLon=-54.61686 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.27246 startLon=-57.57892 ] -LOG TID(1) INFO 108.717 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:30:21 Routing_CalculatingRoute [ distance=328049 elapsed=3.96625 finalLat=-25.5169 finalLon=-54.61686 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.27246 startLon=-57.57892 ] -LOG TID(1) INFO 108.774 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:07:44 Routing_CalculatingRoute [ distance=11861.3 elapsed=0.688734 finalLat=41.41686 finalLon=-81.73026 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.50364 startLon=-81.68422 ] -LOG TID(1) INFO 108.979 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:56:38 Routing_CalculatingRoute [ distance=11873.9 elapsed=0.771464 finalLat=41.50413 finalLon=-81.68427 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.41748 startLon=-81.73009 ] -LOG TID(1) INFO 109.123 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 01:39:52 Routing_CalculatingRoute [ distance=111622 elapsed=1.56842 finalLat=34.74646 finalLon=-92.28961 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.87418 startLon=-91.19655 ] -LOG TID(1) INFO 109.425 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 01:40:30 Routing_CalculatingRoute [ distance=107502 elapsed=0.492251 finalLat=34.81088 finalLon=-92.24528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.87273 startLon=-91.19672 ] -LOG TID(1) INFO 109.503 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 05:03:42 Routing_CalculatingRoute [ distance=98310.4 elapsed=0.404809 finalLat=35.25064 finalLon=-91.73625 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.87466 startLon=-91.19651 ] -LOG TID(1) INFO 109.619 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 05:05:06 Routing_CalculatingRoute [ distance=48150.3 elapsed=0.290012 finalLat=35.00815 finalLon=-90.78983 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.87472 startLon=-91.19656 ] -LOG TID(1) INFO 109.682 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 15:41:38 Routing_CalculatingRoute [ distance=68098.4 elapsed=0.313084 finalLat=43.84064 finalLon=-69.50977 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.19518 startLon=-69.08018 ] -LOG TID(1) INFO 109.728 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:33:24 Routing_CalculatingRoute [ distance=85791.8 elapsed=2.00906 finalLat=36.50138 finalLon=40.74699 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.05176 startLon=41.19669 ] -LOG TID(1) INFO 109.794 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 10:29:44 Routing_CalculatingRoute [ distance=132600 elapsed=8.41424 finalLat=36.11439 finalLon=138.03192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.91942 startLon=138.44546 ] -LOG TID(1) INFO 110.806 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 13:56:20 Routing_CalculatingRoute [ distance=21453.2 elapsed=0.191439 finalLat=42.42425 finalLon=18.77127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.38891 startLon=18.59841 ] -LOG TID(1) INFO 110.965 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 13:58:25 Routing_CalculatingRoute [ distance=42308.8 elapsed=0.340334 finalLat=42.45372 finalLon=18.53705 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.38954 startLon=18.59839 ] -LOG TID(1) INFO 110.995 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 14:39:28 Routing_CalculatingRoute [ distance=31704.2 elapsed=0.344757 finalLat=42.45372 finalLon=18.53705 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0.00018 startLat=42.43221 startLon=18.76935 ] -LOG TID(1) INFO 111.017 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 15:19:50 Routing_CalculatingRoute [ distance=13496.8 elapsed=0.136146 finalLat=42.45139 finalLon=18.53635 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.45191 startLon=18.65014 ] -LOG TID(1) INFO 111.043 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 15:23:28 Routing_CalculatingRoute [ distance=11058.5 elapsed=0.131512 finalLat=42.4503 finalLon=18.53679 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.44133 startLon=18.62317 ] -LOG TID(1) INFO 111.064 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Aug-2015 13:56:20 Routing_CalculatingRoute [ distance=21453.2 elapsed=0.191439 finalLat=42.42425 finalLon=18.77127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.38891 startLon=18.59841 ] -LOG TID(1) INFO 111.09 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:33:04 Routing_CalculatingRoute [ distance=60094.5 elapsed=0.680543 finalLat=33.18395 finalLon=35.88923 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.51705 startLon=36.317 ] -LOG TID(1) INFO 111.133 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:36:50 Routing_CalculatingRoute [ distance=10412 elapsed=4.35412 finalLat=48.77375 finalLon=-122.4572 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.81862 startLon=-122.35592 ] -LOG TID(1) INFO 111.205 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:53:06 Routing_CalculatingRoute [ distance=14376.1 elapsed=0.489806 finalLat=45.96424 finalLon=14.29633 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.03509 startLon=14.43083 ] -LOG TID(1) INFO 111.261 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 09:10:19 Routing_CalculatingRoute [ distance=52638 elapsed=1.1741 finalLat=49.12045 finalLon=20.06293 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.26458 startLon=20.11851 ] -LOG TID(1) INFO 111.427 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 09:13:18 Routing_CalculatingRoute [ distance=49007.7 elapsed=0.806053 finalLat=49.12045 finalLon=20.06293 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.26917 startLon=20.14679 ] -LOG TID(1) INFO 111.48 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 09:23:42 Routing_CalculatingRoute [ distance=21238.6 elapsed=0.826016 finalLat=49.13859 finalLon=20.22079 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.26665 startLon=20.28754 ] -LOG TID(1) INFO 111.535 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Sep-2015 09:29:40 Routing_CalculatingRoute [ distance=30874.8 elapsed=1.28524 finalLat=49.12045 finalLon=20.06293 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.2254 startLon=20.32357 ] -LOG TID(1) INFO 111.601 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:36:36 Routing_CalculatingRoute [ distance=54644.6 elapsed=1.1638 finalLat=52.73109 finalLon=8.28732 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.33492 startLon=8.02597 ] -LOG TID(1) INFO 111.899 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:36 Routing_CalculatingRoute [ distance=25111.1 elapsed=1.19155 finalLat=39.95873 finalLon=116.25589 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.90252 startLon=116.44744 ] -LOG TID(1) INFO 112.37 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:30:31 Routing_CalculatingRoute [ distance=26046.3 elapsed=0.670169 finalLat=40.08119 finalLon=116.59481 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.90343 startLon=116.46125 ] -LOG TID(1) INFO 112.743 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 17:31:49 Routing_CalculatingRoute [ distance=100467 elapsed=5.6527 finalLat=5.12157 finalLon=9.94917 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.45503 startLon=9.56371 ] -LOG TID(1) INFO 112.945 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 17:32:32 Routing_CalculatingRoute [ distance=190763 elapsed=1.55342 finalLat=5.47585 finalLon=10.42156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.45595 startLon=9.56429 ] -LOG TID(1) INFO 113.034 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 18:43:08 Routing_CalculatingRoute [ distance=170476 elapsed=3.05463 finalLat=5.47585 finalLon=10.42156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.58638 startLon=9.64985 ] -LOG TID(1) INFO 113.078 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 14:34:58 Routing_CalculatingRoute [ distance=15991.9 elapsed=1.52287 finalLat=42.50462 finalLon=-71.12516 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.44491 startLon=-71.25991 ] -LOG TID(1) INFO 113.265 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 17:19:29 Routing_CalculatingRoute [ distance=11819.6 elapsed=1.541 finalLat=42.44872 finalLon=-71.19943 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.5052 startLon=-71.13254 ] -LOG TID(1) INFO 113.373 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 11-Oct-2015 17:48:55 Routing_CalculatingRoute [ distance=22142.6 elapsed=1.70517 finalLat=42.321 finalLon=-71.17457 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.44529 startLon=-71.25978 ] -LOG TID(1) INFO 113.553 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 11-Oct-2015 18:08:11 Routing_CalculatingRoute [ distance=22223.2 elapsed=2.20675 finalLat=42.321 finalLon=-71.17457 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.44488 startLon=-71.25965 ] -LOG TID(1) INFO 113.623 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:52:16 Routing_CalculatingRoute [ distance=20933.7 elapsed=0.143122 finalLat=1.39279 finalLon=103.74674 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.28986 startLon=103.85487 ] -LOG TID(1) INFO 113.697 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:26:37 Routing_CalculatingRoute [ distance=19770.3 elapsed=0.247017 finalLat=1.39279 finalLon=103.74674 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.29244 startLon=103.85381 ] -LOG TID(1) INFO 113.727 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:50:31 Routing_CalculatingRoute [ distance=22099.3 elapsed=0.258667 finalLat=1.39279 finalLon=103.74674 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.33034 startLon=103.8602 ] -LOG TID(1) INFO 113.749 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 09:11:23 Routing_CalculatingRoute [ distance=55400.8 elapsed=0.452784 finalLat=37.56694 finalLon=126.988 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.44985 startLon=126.48814 ] -LOG TID(1) INFO 113.82 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 09:23:39 Routing_CalculatingRoute [ distance=34711.6 elapsed=0.739475 finalLat=37.56464 finalLon=126.98163 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.55995 startLon=126.63578 ] -LOG TID(1) INFO 113.918 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:26:40 Routing_CalculatingRoute [ distance=67428.1 elapsed=0.74448 finalLat=54.23593 finalLon=10.28185 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.83938 startLon=9.94552 ] -LOG TID(1) INFO 114.045 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 12:46:48 Routing_CalculatingRoute [ distance=330236 elapsed=0.125391 finalLat=48.00453 finalLon=-66.67661 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.10772 startLon=-64.85684 ] -LOG TID(1) INFO 114.153 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:06:29 Routing_CalculatingRoute [ distance=330231 elapsed=0.111312 finalLat=48.00452 finalLon=-66.6766 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.10772 startLon=-64.85677 ] -LOG TID(1) INFO 114.188 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:26:59 Routing_CalculatingRoute [ distance=329917 elapsed=0.233125 finalLat=48.00452 finalLon=-66.6766 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.10864 startLon=-64.85294 ] -LOG TID(1) INFO 114.215 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:21:21 Routing_CalculatingRoute [ distance=245385 elapsed=0.0484721 finalLat=48.00452 finalLon=-66.6766 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.64935 startLon=-64.8491 ] -LOG TID(1) INFO 114.245 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:51:35 Routing_CalculatingRoute [ distance=11365.5 elapsed=0.609632 finalLat=49.86909 finalLon=6.16005 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.87427 startLon=6.2899 ] -LOG TID(1) INFO 114.305 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:58:39 Routing_CalculatingRoute [ distance=16475.8 elapsed=0.279528 finalLat=49.8121 finalLon=6.42149 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.87425 startLon=6.28993 ] -LOG TID(1) INFO 114.335 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:32:07 Routing_CalculatingRoute [ distance=56177.7 elapsed=0.256933 finalLat=29.30347 finalLon=47.48736 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.30476 startLon=47.93714 ] -LOG TID(1) INFO 114.4 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:19:25 Routing_CalculatingRoute [ distance=18097.4 elapsed=0.130909 finalLat=29.33383 finalLon=47.64755 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.30234 startLon=47.48942 ] -LOG TID(1) INFO 114.414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:04:44 Routing_CalculatingRoute [ distance=82767.9 elapsed=0.983734 finalLat=44.65261 finalLon=17.95749 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.05725 startLon=18.49111 ] -LOG TID(1) INFO 114.507 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:43:19 Routing_CalculatingRoute [ distance=53670.7 elapsed=0.695862 finalLat=44.65261 finalLon=17.95749 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.95423 startLon=18.21407 ] -LOG TID(1) INFO 114.533 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:44:04 Routing_CalculatingRoute [ distance=52463.2 elapsed=0.252564 finalLat=44.65261 finalLon=17.95749 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.94421 startLon=18.20989 ] -LOG TID(1) INFO 114.556 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:04:10 Routing_CalculatingRoute [ distance=15537.4 elapsed=0.570221 finalLat=44.68193 finalLon=18.03828 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.7628 startLon=18.04064 ] -LOG TID(1) INFO 114.595 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Aug-2015 18:19:20 Routing_CalculatingRoute [ distance=14904.5 elapsed=0.2496 finalLat=55.4966 finalLon=-2.55961 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00084 startLat=55.41328 startLon=-2.50778 ] -LOG TID(1) INFO 114.707 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Aug-2015 18:22:36 Routing_CalculatingRoute [ distance=21989.8 elapsed=0.262151 finalLat=55.4966 finalLon=-2.55961 name=vehicle result=NoError startDirectionX=-0.00008 startDirectionY=-0 startLat=55.36605 startLon=-2.49489 ] -LOG TID(1) INFO 114.791 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Aug-2015 15:06:27 Routing_CalculatingRoute [ distance=170654 elapsed=0.835898 finalLat=53.36271 finalLon=-104.01653 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.83106 startLon=-102.37379 ] -LOG TID(1) INFO 114.853 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:46:30 Routing_CalculatingRoute [ distance=36690.7 elapsed=0.64642 finalLat=18.44657 finalLon=-78.17246 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.45971 startLon=-77.94558 ] -LOG TID(1) INFO 114.924 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:47:46 Routing_CalculatingRoute [ distance=37894.8 elapsed=0.42305 finalLat=18.27868 finalLon=-78.34753 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.27591 startLon=-78.06148 ] -LOG TID(1) INFO 114.946 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:45:34 Routing_CalculatingRoute [ distance=114951 elapsed=0.480486 finalLat=17.87976 finalLon=-77.76335 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.23788 startLon=-78.34656 ] -LOG TID(1) INFO 114.971 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:45:40 Routing_CalculatingRoute [ distance=121804 elapsed=0.220098 finalLat=17.87976 finalLon=-77.76335 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.23788 startLon=-78.34656 ] -LOG TID(1) INFO 114.988 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:48:34 Routing_CalculatingRoute [ distance=117568 elapsed=0.73556 finalLat=17.87976 finalLon=-77.76335 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.30695 startLon=-78.33724 ] -LOG TID(1) INFO 115.001 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:34:43 Routing_CalculatingRoute [ distance=244697 elapsed=0.786088 finalLat=18.10646 finalLon=-76.31747 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.87521 startLon=-77.75847 ] -LOG TID(1) INFO 115.045 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Sep-2015 08:08:22 Routing_CalculatingRoute [ distance=27442 elapsed=0.262255 finalLat=44.49708 finalLon=34.15871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.39655 startLon=33.93961 ] -LOG TID(1) INFO 115.094 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:53:06 Routing_CalculatingRoute [ distance=14376.1 elapsed=0.489806 finalLat=45.96424 finalLon=14.29633 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.03509 startLon=14.43083 ] -LOG TID(1) INFO 115.13 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 11:41:29 Routing_CalculatingRoute [ distance=173120 elapsed=2.84433 finalLat=-6.6973 finalLon=111.44542 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-7.44849 startLon=112.39453 ] -LOG TID(1) INFO 115.621 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:12 Routing_CalculatingRoute [ distance=30995 elapsed=1.80885 finalLat=34.81668 finalLon=135.37387 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.81076 startLon=135.63173 ] -LOG TID(1) INFO 116.021 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 13:09:53 Routing_CalculatingRoute [ distance=23073.6 elapsed=1.73844 finalLat=34.88631 finalLon=135.54034 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.79776 startLon=135.65691 ] -LOG TID(1) INFO 116.217 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 18:39:47 Routing_CalculatingRoute [ distance=40287.8 elapsed=0.995908 finalLat=39.18554 finalLon=-78.1515 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.8635 startLon=-78.16878 ] -LOG TID(1) INFO 116.579 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Aug-2015 13:17:00 Routing_CalculatingRoute [ distance=17488.3 elapsed=0.238488 finalLat=11.89484 finalLon=8.5364 name=vehicle result=NoError startDirectionX=0.0001 startDirectionY=0 startLat=12.00394 startLon=8.56774 ] -LOG TID(1) INFO 116.805 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 03:12:08 Routing_CalculatingRoute [ distance=14782.5 elapsed=14.4706 finalLat=35.69698 finalLon=139.58196 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.70088 startLon=139.69711 ] -LOG TID(1) INFO 117.102 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:30:02 Routing_CalculatingRoute [ distance=357158 elapsed=0.175903 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.15792 startLon=-14.41392 ] -LOG TID(1) INFO 117.228 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 08:48:20 Routing_CalculatingRoute [ distance=32726.2 elapsed=4.3388 finalLat=35.10695 finalLon=137.00701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.92882 startLon=137.14936 ] -LOG TID(1) INFO 118.022 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 08:49:45 Routing_CalculatingRoute [ distance=32726.2 elapsed=0.434622 finalLat=35.10695 finalLon=137.00701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.92882 startLon=137.14936 ] -LOG TID(1) INFO 118.361 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 08:50:51 Routing_CalculatingRoute [ distance=32688.7 elapsed=0.605408 finalLat=35.10695 finalLon=137.00701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.92887 startLon=137.14925 ] -LOG TID(1) INFO 118.719 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 11:45:15 Routing_CalculatingRoute [ distance=32736.7 elapsed=1.15609 finalLat=35.10695 finalLon=137.00701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.92868 startLon=137.14937 ] -LOG TID(1) INFO 119.069 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 18:44:41 Routing_CalculatingRoute [ distance=32750.9 elapsed=1.02146 finalLat=35.10695 finalLon=137.00701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.92868 startLon=137.14957 ] -LOG TID(1) INFO 119.416 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:53:19 Routing_CalculatingRoute [ distance=184291 elapsed=9.38225 finalLat=35.39466 finalLon=-82.41876 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.44103 startLon=-80.87177 ] -LOG TID(1) INFO 119.985 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:53:31 Routing_CalculatingRoute [ distance=184291 elapsed=6.09871 finalLat=35.39466 finalLon=-82.41876 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.44103 startLon=-80.87177 ] -LOG TID(1) INFO 120.096 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:57:02 Routing_CalculatingRoute [ distance=13391.4 elapsed=2.2191 finalLat=35.39466 finalLon=-82.41876 name=vehicle result=NoError startDirectionX=-0.00017 startDirectionY=0 startLat=35.29767 startLon=-82.40712 ] -LOG TID(1) INFO 120.211 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:57:59 Routing_CalculatingRoute [ distance=15238.9 elapsed=2.14064 finalLat=35.39466 finalLon=-82.41876 name=vehicle result=NoError startDirectionX=0.00064 startDirectionY=0 startLat=35.29627 startLon=-82.40936 ] -LOG TID(1) INFO 120.307 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:40:05 Routing_CalculatingRoute [ distance=186340 elapsed=4.17427 finalLat=35.43985 finalLon=-80.87167 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.39368 startLon=-82.41791 ] -LOG TID(1) INFO 120.474 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:40:13 Routing_CalculatingRoute [ distance=186340 elapsed=2.08873 finalLat=35.43985 finalLon=-80.87167 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00002 startLat=35.39366 startLon=-82.41791 ] -LOG TID(1) INFO 120.598 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 13-Sep-2015 15:17:58 Routing_CalculatingRoute [ distance=242334 elapsed=0.605361 finalLat=41.37782 finalLon=19.73975 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.92579 startLon=20.20293 ] -LOG TID(1) INFO 120.742 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Oct-2015 18:11:57 Routing_CalculatingRoute [ distance=62290.8 elapsed=0.378661 finalLat=41.0234 finalLon=19.92218 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.31179 startLon=19.83581 ] -LOG TID(1) INFO 120.777 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 03:23:17 Routing_CalculatingRoute [ distance=17084 elapsed=0.447722 finalLat=43.70693 finalLon=-116.61692 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.58649 startLon=-116.56726 ] -LOG TID(1) INFO 120.821 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 04:20:46 Routing_CalculatingRoute [ distance=21279.3 elapsed=0.312885 finalLat=43.72803 finalLon=-116.62065 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.58616 startLon=-116.56703 ] -LOG TID(1) INFO 120.874 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:38 Routing_CalculatingRoute [ distance=195645 elapsed=4.59043 finalLat=58.38011 finalLon=26.77468 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.41708 startLon=24.63751 ] -LOG TID(1) INFO 120.983 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:35:05 Routing_CalculatingRoute [ distance=13724.9 elapsed=3.5029 finalLat=10.46336 finalLon=-66.84005 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.41157 startLon=-66.87708 ] -LOG TID(1) INFO 121.03 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:37:02 Routing_CalculatingRoute [ distance=17695.6 elapsed=0.963282 finalLat=10.49013 finalLon=-66.82723 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.41156 startLon=-66.87698 ] -LOG TID(1) INFO 121.088 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:40:41 Routing_CalculatingRoute [ distance=106845 elapsed=0.550581 finalLat=19.42036 finalLon=-71.61312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.59532 startLon=-70.93696 ] -LOG TID(1) INFO 121.139 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:19:11 Routing_CalculatingRoute [ distance=41488.6 elapsed=0.606201 finalLat=10.23973 finalLon=-61.4809 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.54669 startLon=-61.43709 ] -LOG TID(1) INFO 121.225 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:31:28 Routing_CalculatingRoute [ distance=41532.5 elapsed=0.834686 finalLat=10.23973 finalLon=-61.4809 name=vehicle result=NoError startDirectionX=0 startDirectionY=0.00053 startLat=10.55238 startLon=-61.41535 ] -LOG TID(1) INFO 121.251 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:31:43 Routing_CalculatingRoute [ distance=41489.7 elapsed=0.478729 finalLat=10.23973 finalLon=-61.4809 name=vehicle result=NoError startDirectionX=0 startDirectionY=0.00058 startLat=10.55367 startLon=-61.41539 ] -LOG TID(1) INFO 121.281 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 09:14:18 Routing_CalculatingRoute [ distance=91758.7 elapsed=2.19315 finalLat=44.47048 finalLon=34.06902 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.54965 startLon=33.52683 ] -LOG TID(1) INFO 121.313 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 18:51:15 Routing_CalculatingRoute [ distance=22071.8 elapsed=1.00121 finalLat=42.59026 finalLon=-84.45565 name=vehicle result=NoError startDirectionX=-0.00035 startDirectionY=-0 startLat=42.72427 startLon=-84.50911 ] -LOG TID(1) INFO 121.388 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 05:33:13 Routing_CalculatingRoute [ distance=10628.1 elapsed=0.170965 finalLat=35.8505 finalLon=14.4814 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.85765 startLon=14.56859 ] -LOG TID(1) INFO 121.464 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:40:19 Routing_CalculatingRoute [ distance=24921.1 elapsed=1.05285 finalLat=48.84666 finalLon=-122.58973 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.96204 startLon=-122.46293 ] -LOG TID(1) INFO 121.533 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 19:38:51 Routing_CalculatingRoute [ distance=265659 elapsed=1.39447 finalLat=10.17047 finalLon=-68.00111 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.3301 startLon=-66.10072 ] -LOG TID(1) INFO 121.626 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Aug-2015 17:26:01 Routing_CalculatingRoute [ distance=85892.4 elapsed=0.411642 finalLat=43.71257 finalLon=15.91272 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.51452 startLon=16.44899 ] -LOG TID(1) INFO 121.823 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 13:10:59 Routing_CalculatingRoute [ distance=21167.4 elapsed=0.627342 finalLat=6.30575 finalLon=1.21578 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=6.13258 startLon=1.21803 ] -LOG TID(1) INFO 121.951 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 13:11:05 Routing_CalculatingRoute [ distance=21167.4 elapsed=0.176154 finalLat=6.30575 finalLon=1.21578 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=6.13258 startLon=1.21803 ] -LOG TID(1) INFO 121.982 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 13:11:11 Routing_CalculatingRoute [ distance=21166.3 elapsed=0.632849 finalLat=6.30575 finalLon=1.21578 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=6.13258 startLon=1.21802 ] -LOG TID(1) INFO 122.015 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 13:11:17 Routing_CalculatingRoute [ distance=21166.3 elapsed=0.155436 finalLat=6.30575 finalLon=1.21578 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=0 startLat=6.13258 startLon=1.21802 ] -LOG TID(1) INFO 122.055 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:01:30 Routing_CalculatingRoute [ distance=57526 elapsed=1.37843 finalLat=42.06519 finalLon=-88.33596 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.93856 startLon=-87.7222 ] -LOG TID(1) INFO 122.776 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:40:51 Routing_CalculatingRoute [ distance=71970.9 elapsed=1.18982 finalLat=42.40947 finalLon=-88.07925 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.92827 startLon=-87.70922 ] -LOG TID(1) INFO 123.061 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:41:20 Routing_CalculatingRoute [ distance=90403 elapsed=0.90566 finalLat=42.31496 finalLon=-88.44754 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.92827 startLon=-87.70922 ] -LOG TID(1) INFO 123.269 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Sep-2015 13:02:11 Routing_CalculatingRoute [ distance=12026.8 elapsed=0.669221 finalLat=49.03419 finalLon=7.9512 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.95347 startLon=7.90315 ] -LOG TID(1) INFO 123.392 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:34:46 Routing_CalculatingRoute [ distance=375584 elapsed=2.13912 finalLat=4.76764 finalLon=7.01887 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.95371 startLon=8.73538 ] -LOG TID(1) INFO 123.54 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 03:58:04 Routing_CalculatingRoute [ distance=18463.5 elapsed=1.00544 finalLat=40.69388 finalLon=-73.82793 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.75939 startLon=-73.98653 ] -LOG TID(1) INFO 123.753 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:41:31 Routing_CalculatingRoute [ distance=23869.2 elapsed=1.42509 finalLat=25.15666 finalLon=51.60132 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.32565 startLon=51.53082 ] -LOG TID(1) INFO 123.821 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:59:41 Routing_CalculatingRoute [ distance=26557.2 elapsed=0.678044 finalLat=47.90081 finalLon=1.89945 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.106 startLon=1.85101 ] -LOG TID(1) INFO 123.896 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:58:37 Routing_CalculatingRoute [ distance=533401 elapsed=1.92612 finalLat=-7.28887 finalLon=110.69882 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.23939 startLon=106.89984 ] -LOG TID(1) INFO 124.406 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 12:20:56 Routing_CalculatingRoute [ distance=66542.9 elapsed=0.389668 finalLat=49.47158 finalLon=5.85073 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.03055 startLon=6.11438 ] -LOG TID(1) INFO 124.489 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:41:19 Routing_CalculatingRoute [ distance=51659.9 elapsed=1.58923 finalLat=41.47995 finalLon=-81.68503 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.67238 startLon=-81.22981 ] -LOG TID(1) INFO 124.754 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 20:44:13 Routing_CalculatingRoute [ distance=69983.8 elapsed=0.333376 finalLat=49.11969 finalLon=6.17636 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.55063 startLon=5.78974 ] -LOG TID(1) INFO 124.838 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:37:32 Routing_CalculatingRoute [ distance=18978.9 elapsed=0.361672 finalLat=18.39384 finalLon=-65.99714 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.46734 startLon=-66.116 ] -LOG TID(1) INFO 124.897 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:38:27 Routing_CalculatingRoute [ distance=57407.4 elapsed=0.244446 finalLat=18.30923 finalLon=-65.78938 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.46732 startLon=-66.11582 ] -LOG TID(1) INFO 124.947 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:38:56 Routing_CalculatingRoute [ distance=98078.8 elapsed=0.242367 finalLat=18.30305 finalLon=-65.3001 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.46732 startLon=-66.11582 ] -LOG TID(1) INFO 124.998 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:40:06 Routing_CalculatingRoute [ distance=44438.3 elapsed=0.29022 finalLat=18.4477 finalLon=-66.07571 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.31295 startLon=-65.77047 ] -LOG TID(1) INFO 125.061 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:43:33 Routing_CalculatingRoute [ distance=32476.9 elapsed=0.23203 finalLat=18.39384 finalLon=-65.99714 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.31295 startLon=-65.77047 ] -LOG TID(1) INFO 125.113 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Aug-2015 17:26:01 Routing_CalculatingRoute [ distance=85892.4 elapsed=0.411642 finalLat=43.71257 finalLon=15.91272 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.51452 startLon=16.44899 ] -LOG TID(1) INFO 125.197 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:42:21 Routing_CalculatingRoute [ distance=237800 elapsed=1.71558 finalLat=36.82615 finalLon=-85.92614 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.22183 startLon=-84.83087 ] -LOG TID(1) INFO 125.527 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:42:57 Routing_CalculatingRoute [ distance=93951.9 elapsed=0.407914 finalLat=37.80923 finalLon=-85.46688 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.22183 startLon=-84.83087 ] -LOG TID(1) INFO 125.626 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:43:05 Routing_CalculatingRoute [ distance=167433 elapsed=1.07147 finalLat=-25.77329 finalLon=-56.22764 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.35021 startLon=-57.46402 ] -LOG TID(1) INFO 125.681 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:12:12 Routing_CalculatingRoute [ distance=12250.2 elapsed=0.197431 finalLat=13.19737 finalLon=-59.55406 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.18553 startLon=-59.63671 ] -LOG TID(1) INFO 125.716 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:29:10 Routing_CalculatingRoute [ distance=12418.1 elapsed=0.0900877 finalLat=13.18543 finalLon=-59.63651 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.19302 startLon=-59.55122 ] -LOG TID(1) INFO 125.731 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:19:37 Routing_CalculatingRoute [ distance=20529.2 elapsed=0.17404 finalLat=13.16913 finalLon=-59.52738 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.2092 startLon=-59.63323 ] -LOG TID(1) INFO 125.748 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:37:13 Routing_CalculatingRoute [ distance=18084 elapsed=0.128276 finalLat=13.16913 finalLon=-59.52738 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.18525 startLon=-59.63785 ] -LOG TID(1) INFO 125.759 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:32:49 Routing_CalculatingRoute [ distance=18946.4 elapsed=0.126366 finalLat=13.19372 finalLon=-59.63819 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.16952 startLon=-59.52706 ] -LOG TID(1) INFO 125.772 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:32:52 Routing_CalculatingRoute [ distance=20112.5 elapsed=0.0848974 finalLat=13.19372 finalLon=-59.63819 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.16952 startLon=-59.52706 ] -LOG TID(1) INFO 125.802 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:42:20 Routing_CalculatingRoute [ distance=35141.6 elapsed=0.785835 finalLat=49.23438 finalLon=6.99638 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.36026 startLon=6.76864 ] -LOG TID(1) INFO 125.901 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:42:24 Routing_CalculatingRoute [ distance=35072.4 elapsed=0.254422 finalLat=49.23438 finalLon=6.99638 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.35963 startLon=6.76849 ] -LOG TID(1) INFO 125.945 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:01:22 Routing_CalculatingRoute [ distance=21215.5 elapsed=4.95716 finalLat=40.68914 finalLon=-74.17264 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.78191 startLon=-74.02196 ] -LOG TID(1) INFO 126.014 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 04:52:15 Routing_CalculatingRoute [ distance=14485 elapsed=0.426448 finalLat=1.28149 finalLon=103.84423 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.31804 startLon=103.94466 ] -LOG TID(1) INFO 126.078 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:49:00 Routing_CalculatingRoute [ distance=10415.8 elapsed=0.836813 finalLat=48.77375 finalLon=-122.4572 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.81868 startLon=-122.35587 ] -LOG TID(1) INFO 126.139 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:46:16 Routing_CalculatingRoute [ distance=15403.8 elapsed=2.64764 finalLat=39.48743 finalLon=-75.05244 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.45828 startLon=-75.22152 ] -LOG TID(1) INFO 126.215 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 12-Aug-2015 06:43:16 Routing_CalculatingRoute [ distance=32197.4 elapsed=0.239078 finalLat=-3.66871 finalLon=38.94274 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.76899 startLon=39.20526 ] -LOG TID(1) INFO 126.25 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 11:35:06 Routing_CalculatingRoute [ distance=54387.7 elapsed=0.700046 finalLat=10.88867 finalLon=-5.60567 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.3123 startLon=-5.70511 ] -LOG TID(1) INFO 126.365 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 20:49:18 Routing_CalculatingRoute [ distance=148530 elapsed=0.487166 finalLat=10.31975 finalLon=-6.07761 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.31024 startLon=-5.68997 ] -LOG TID(1) INFO 126.438 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:07:59 Routing_CalculatingRoute [ distance=79014.2 elapsed=0.721683 finalLat=14.69342 finalLon=-17.44794 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.88497 startLon=-16.8733 ] -LOG TID(1) INFO 126.679 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 04:26:15 Routing_CalculatingRoute [ distance=61007.2 elapsed=1.01584 finalLat=19.76473 finalLon=-70.51872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.4626 startLon=-70.66679 ] -LOG TID(1) INFO 126.728 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 04:26:47 Routing_CalculatingRoute [ distance=67412.9 elapsed=0.623676 finalLat=19.75304 finalLon=-70.41681 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.4626 startLon=-70.66679 ] -LOG TID(1) INFO 126.79 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:58:37 Routing_CalculatingRoute [ distance=533401 elapsed=1.92612 finalLat=-7.28887 finalLon=110.69882 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.23939 startLon=106.89984 ] -LOG TID(1) INFO 126.911 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Sep-2015 17:21:47 Routing_CalculatingRoute [ distance=16423.2 elapsed=0.100952 finalLat=10.83333 finalLon=-4.95 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00008 startLat=10.97558 startLon=-4.91295 ] -LOG TID(1) INFO 126.964 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Sep-2015 13:22:53 Routing_CalculatingRoute [ distance=55876.1 elapsed=0.309112 finalLat=10.64568 finalLon=-4.76336 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.98211 startLon=-4.90152 ] -LOG TID(1) INFO 127.022 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 17:26:44 Routing_CalculatingRoute [ distance=407463 elapsed=1.3754 finalLat=43.5076 finalLon=16.44595 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.80482 startLon=15.97837 ] -LOG TID(1) INFO 127.193 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:35:59 Routing_CalculatingRoute [ distance=17150.8 elapsed=0.908204 finalLat=42.52496 finalLon=-83.35156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.44099 startLon=-83.43946 ] -LOG TID(1) INFO 127.278 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:15:47 Routing_CalculatingRoute [ distance=48096.3 elapsed=2.85464 finalLat=44.11625 finalLon=3.0732 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.29899 startLon=2.69506 ] -LOG TID(1) INFO 127.44 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:50:26 Routing_CalculatingRoute [ distance=11455.2 elapsed=5.76319 finalLat=38.56798 finalLon=140.86354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.564 startLon=140.96321 ] -LOG TID(1) INFO 127.819 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 12:16:35 Routing_CalculatingRoute [ distance=151782 elapsed=0.219145 finalLat=22.93239 finalLon=57.5311 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.66594 startLon=58.59236 ] -LOG TID(1) INFO 127.901 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 03:12:08 Routing_CalculatingRoute [ distance=14782.5 elapsed=14.4706 finalLat=35.69698 finalLon=139.58196 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.70088 startLon=139.69711 ] -LOG TID(1) INFO 128.182 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:37:17 Routing_CalculatingRoute [ distance=19543.3 elapsed=3.11852 finalLat=35.66262 finalLon=139.78241 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.77075 startLon=139.9087 ] -LOG TID(1) INFO 128.498 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:37:18 Routing_CalculatingRoute [ distance=19543.3 elapsed=0.814377 finalLat=35.66262 finalLon=139.78241 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.77075 startLon=139.9087 ] -LOG TID(1) INFO 128.801 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:47:57 Routing_CalculatingRoute [ distance=53151.3 elapsed=0.569115 finalLat=44.88052 finalLon=-93.32588 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.5202 startLon=-93.42274 ] -LOG TID(1) INFO 128.968 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:50:20 Routing_CalculatingRoute [ distance=165154 elapsed=6.89001 finalLat=46.65963 finalLon=-1.43472 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.65557 startLon=-0.27261 ] -LOG TID(1) INFO 129.32 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:47:00 Routing_CalculatingRoute [ distance=29859.5 elapsed=2.63678 finalLat=50.60864 finalLon=10.69264 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.71228 startLon=10.93523 ] -LOG TID(1) INFO 129.393 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:48:03 Routing_CalculatingRoute [ distance=32388.5 elapsed=0.412239 finalLat=50.64195 finalLon=10.68919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.7134 startLon=10.91092 ] -LOG TID(1) INFO 129.438 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:47:00 Routing_CalculatingRoute [ distance=29859.5 elapsed=2.63678 finalLat=50.60864 finalLon=10.69264 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.71228 startLon=10.93523 ] -LOG TID(1) INFO 129.5 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 08:48:03 Routing_CalculatingRoute [ distance=32388.5 elapsed=0.412239 finalLat=50.64195 finalLon=10.68919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.7134 startLon=10.91092 ] -LOG TID(1) INFO 129.551 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 18:51:15 Routing_CalculatingRoute [ distance=22071.8 elapsed=1.00121 finalLat=42.59026 finalLon=-84.45565 name=vehicle result=NoError startDirectionX=-0.00035 startDirectionY=-0 startLat=42.72427 startLon=-84.50911 ] -LOG TID(1) INFO 129.63 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:07:15 Routing_CalculatingRoute [ distance=27688.2 elapsed=0.230667 finalLat=5.88727 finalLon=-55.09225 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.85884 startLon=-55.14043 ] -LOG TID(1) INFO 129.71 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:51:03 Routing_CalculatingRoute [ distance=11455.2 elapsed=5.34115 finalLat=38.56798 finalLon=140.86354 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=38.564 startLon=140.96321 ] -LOG TID(1) INFO 129.831 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:48:45 Routing_CalculatingRoute [ distance=19179.4 elapsed=0.100316 finalLat=40.63327 finalLon=20.59046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.62052 startLon=20.77625 ] -LOG TID(1) INFO 129.915 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:54:23 Routing_CalculatingRoute [ distance=17540.5 elapsed=0.22075 finalLat=40.63327 finalLon=20.59046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.6227 startLon=20.76431 ] -LOG TID(1) INFO 129.933 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:26:22 Routing_CalculatingRoute [ distance=18390.1 elapsed=0.0917582 finalLat=40.63327 finalLon=20.59046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.62292 startLon=20.77121 ] -LOG TID(1) INFO 129.952 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:11:24 Routing_CalculatingRoute [ distance=139994 elapsed=0.172402 finalLat=40.23327 finalLon=20.35318 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.64279 startLon=20.59968 ] -LOG TID(1) INFO 129.986 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:39:20 Routing_CalculatingRoute [ distance=253124 elapsed=0.824066 finalLat=44.11843 finalLon=15.23245 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.34115 startLon=14.28424 ] -LOG TID(1) INFO 130.106 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 19:38:34 Routing_CalculatingRoute [ distance=273996 elapsed=1.28266 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.61357 startLon=-89.98544 ] -LOG TID(1) INFO 130.347 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 19:43:48 Routing_CalculatingRoute [ distance=229811 elapsed=0.815091 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.629 startLon=-89.93746 ] -LOG TID(1) INFO 130.4 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 19:46:49 Routing_CalculatingRoute [ distance=221146 elapsed=0.545268 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.65594 startLon=-89.85075 ] -LOG TID(1) INFO 130.453 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 19:50:57 Routing_CalculatingRoute [ distance=215757 elapsed=0.735525 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.67417 startLon=-89.79749 ] -LOG TID(1) INFO 130.511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 19:57:51 Routing_CalculatingRoute [ distance=204362 elapsed=0.76005 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.72573 startLon=-89.69993 ] -LOG TID(1) INFO 130.563 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 20:09:50 Routing_CalculatingRoute [ distance=191271 elapsed=0.805275 finalLat=34.25761 finalLon=-88.70338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.83776 startLon=-89.67106 ] -LOG TID(1) INFO 130.67 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 18:04:53 Routing_CalculatingRoute [ distance=11791.6 elapsed=0.340016 finalLat=35.88328 finalLon=-114.61752 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.96991 startLon=-114.68184 ] -LOG TID(1) INFO 130.781 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 18:14:50 Routing_CalculatingRoute [ distance=33664.8 elapsed=0.373387 finalLat=35.72204 finalLon=-114.48674 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.96982 startLon=-114.68191 ] -LOG TID(1) INFO 130.878 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 15:48:14 Routing_CalculatingRoute [ distance=55881.7 elapsed=0.428919 finalLat=35.87337 finalLon=-114.65232 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.56883 startLon=-114.37988 ] -LOG TID(1) INFO 131.007 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 16:59:15 Routing_CalculatingRoute [ distance=29895.7 elapsed=0.436091 finalLat=35.23399 finalLon=-114.13938 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.42244 startLon=-114.27826 ] -LOG TID(1) INFO 131.108 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 16:59:52 Routing_CalculatingRoute [ distance=32678.6 elapsed=0.369056 finalLat=35.23425 finalLon=-114.13907 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.42243 startLon=-114.27824 ] -LOG TID(1) INFO 131.18 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 17:04:03 Routing_CalculatingRoute [ distance=33056.3 elapsed=0.474503 finalLat=35.19104 finalLon=-114.06802 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.42249 startLon=-114.27824 ] -LOG TID(1) INFO 131.293 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:07:59 Routing_CalculatingRoute [ distance=79014.2 elapsed=0.721683 finalLat=14.69342 finalLon=-17.44794 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.88497 startLon=-16.8733 ] -LOG TID(1) INFO 131.395 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:53:04 Routing_CalculatingRoute [ distance=51411.9 elapsed=0.313461 finalLat=39.65273 finalLon=-80.00025 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.453 startLon=-79.67092 ] -LOG TID(1) INFO 131.441 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Jul-2015 17:31:01 Routing_CalculatingRoute [ distance=41848.5 elapsed=0.356104 finalLat=43.73317 finalLon=15.90022 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.9714 startLon=15.64738 ] -LOG TID(1) INFO 131.492 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 19:59:32 Routing_CalculatingRoute [ distance=64097.9 elapsed=5.20991 finalLat=45.29093 finalLon=-92.92391 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.49922 startLon=-93.38739 ] -LOG TID(1) INFO 131.582 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 19:59:43 Routing_CalculatingRoute [ distance=64097.9 elapsed=5.37092 finalLat=45.29093 finalLon=-92.92391 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.49922 startLon=-93.38739 ] -LOG TID(1) INFO 131.669 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:37:14 Routing_CalculatingRoute [ distance=17153.6 elapsed=0.993244 finalLat=-8.7817 finalLon=115.1783 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.6908 startLon=115.26198 ] -LOG TID(1) INFO 131.858 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 01:55:26 Routing_CalculatingRoute [ distance=58814.8 elapsed=0.696935 finalLat=38.8642 finalLon=-76.84274 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.16349 startLon=-77.23767 ] -LOG TID(1) INFO 132.223 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 03:20:56 Routing_CalculatingRoute [ distance=58269.2 elapsed=0.726615 finalLat=39.16244 finalLon=-77.20907 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.8646 startLon=-76.84348 ] -LOG TID(1) INFO 132.397 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:48:20 Routing_CalculatingRoute [ distance=36982.2 elapsed=0.372686 finalLat=29.3669 finalLon=47.9658 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.33419 startLon=47.64774 ] -LOG TID(1) INFO 132.465 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:19:40 Routing_CalculatingRoute [ distance=49913.5 elapsed=2.42864 finalLat=41.83754 finalLon=-87.79064 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.80108 startLon=-88.27723 ] -LOG TID(1) INFO 132.884 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:48:19 Routing_CalculatingRoute [ distance=14564.6 elapsed=1.0397 finalLat=41.85003 finalLon=-87.96451 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.87085 startLon=-87.8536 ] -LOG TID(1) INFO 133.081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:49:26 Routing_CalculatingRoute [ distance=12204.3 elapsed=0.661597 finalLat=41.85003 finalLon=-87.96451 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.87158 startLon=-87.84115 ] -LOG TID(1) INFO 133.215 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 04:06:27 Routing_CalculatingRoute [ distance=42175.6 elapsed=0.231872 finalLat=33.8963 finalLon=35.48332 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.56556 startLon=35.37517 ] -LOG TID(1) INFO 133.28 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 04:06:35 Routing_CalculatingRoute [ distance=42175.4 elapsed=0.234223 finalLat=33.8963 finalLon=35.48332 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.56557 startLon=35.37516 ] -LOG TID(1) INFO 133.317 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:57:57 Routing_CalculatingRoute [ distance=199227 elapsed=0.646488 finalLat=44.38442 finalLon=-91.01027 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.24846 startLon=-89.37632 ] -LOG TID(1) INFO 133.598 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:55:58 Routing_CalculatingRoute [ distance=18996.9 elapsed=3.77989 finalLat=5.41479 finalLon=100.47041 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.37469 startLon=100.54053 ] -LOG TID(1) INFO 133.664 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:55:18 Routing_CalculatingRoute [ distance=17424.8 elapsed=0.786391 finalLat=58.14603 finalLon=7.97773 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=58.19391 startLon=8.06811 ] -LOG TID(1) INFO 133.822 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:49:59 Routing_CalculatingRoute [ distance=159171 elapsed=4.86331 finalLat=33.32473 finalLon=-86.81288 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.73185 startLon=-85.8188 ] -LOG TID(1) INFO 134.188 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:52:19 Routing_CalculatingRoute [ distance=159352 elapsed=3.2909 finalLat=33.32473 finalLon=-86.81288 name=vehicle result=NoError startDirectionX=0 startDirectionY=0.00001 startLat=32.73204 startLon=-85.8187 ] -LOG TID(1) INFO 134.277 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 14-Sep-2015 10:26:59 Routing_CalculatingRoute [ distance=201903 elapsed=2.71568 finalLat=28.19944 finalLon=83.97019 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.71545 startLon=85.30532 ] -LOG TID(1) INFO 134.561 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 03:34:46 Routing_CalculatingRoute [ distance=11865.4 elapsed=0.051885 finalLat=13.27338 finalLon=144.74648 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.265 startLon=144.66978 ] -LOG TID(1) INFO 134.592 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 04:34:54 Routing_CalculatingRoute [ distance=11381 elapsed=0.076003 finalLat=13.36415 finalLon=144.76974 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.28077 startLon=144.75078 ] -LOG TID(1) INFO 134.618 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:03:57 Routing_CalculatingRoute [ distance=20403 elapsed=0.501784 finalLat=25.03404 finalLon=-77.52009 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.04098 startLon=-77.36426 ] -LOG TID(1) INFO 134.679 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 18:43:42 Routing_CalculatingRoute [ distance=11348.2 elapsed=0.243336 finalLat=47.65218 finalLon=7.35871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.66344 startLon=7.48116 ] -LOG TID(1) INFO 134.764 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 18:46:32 Routing_CalculatingRoute [ distance=13649.6 elapsed=0.127963 finalLat=47.68351 finalLon=7.45609 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.69073 startLon=7.44837 ] -LOG TID(1) INFO 134.794 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:39:22 Routing_CalculatingRoute [ distance=91797 elapsed=0.219146 finalLat=47.76264 finalLon=6.03775 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.64388 startLon=6.90007 ] -LOG TID(1) INFO 134.915 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:41:12 Routing_CalculatingRoute [ distance=89094.2 elapsed=0.213081 finalLat=47.76347 finalLon=6.03787 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.63187 startLon=6.87398 ] -LOG TID(1) INFO 134.965 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:54:42 Routing_CalculatingRoute [ distance=104648 elapsed=0.578373 finalLat=34.25695 finalLon=35.94833 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.88262 startLon=35.52308 ] -LOG TID(1) INFO 135.002 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:33:04 Routing_CalculatingRoute [ distance=11761.3 elapsed=0.960367 finalLat=47.14164 finalLon=-1.43351 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19409 startLon=-1.46551 ] -LOG TID(1) INFO 135.156 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 23:33:43 Routing_CalculatingRoute [ distance=11761.3 elapsed=0.709259 finalLat=47.14164 finalLon=-1.43351 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19409 startLon=-1.46551 ] -LOG TID(1) INFO 135.249 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:37:49 Routing_CalculatingRoute [ distance=31309.6 elapsed=1.677 finalLat=39.31511 finalLon=-84.43439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.1092 startLon=-84.53301 ] -LOG TID(1) INFO 135.41 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Aug-2015 12:21:22 Routing_CalculatingRoute [ distance=24494.6 elapsed=0.769054 finalLat=47.257 finalLon=-1.91239 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19706 startLon=-1.71964 ] -LOG TID(1) INFO 135.593 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Aug-2015 12:21:45 Routing_CalculatingRoute [ distance=24494.6 elapsed=0.629016 finalLat=47.257 finalLon=-1.91239 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=47.19706 startLon=-1.71964 ] -LOG TID(1) INFO 135.669 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Aug-2015 12:22:02 Routing_CalculatingRoute [ distance=24494.6 elapsed=0.489283 finalLat=47.257 finalLon=-1.91239 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.19706 startLon=-1.71964 ] -LOG TID(1) INFO 135.75 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:46:37 Routing_CalculatingRoute [ distance=92335.7 elapsed=0.213703 finalLat=33.86897 finalLon=35.54294 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.48616 startLon=35.94598 ] -LOG TID(1) INFO 135.803 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:30:02 Routing_CalculatingRoute [ distance=357158 elapsed=0.175903 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.15792 startLon=-14.41392 ] -LOG TID(1) INFO 135.835 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:20:47 Routing_CalculatingRoute [ distance=54596.2 elapsed=1.114 finalLat=35.6732 finalLon=-105.93689 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.87902 startLon=-106.29423 ] -LOG TID(1) INFO 136.04 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:23:54 Routing_CalculatingRoute [ distance=22167.8 elapsed=0.433232 finalLat=42.04158 finalLon=-91.64782 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.12865 startLon=-91.80823 ] -LOG TID(1) INFO 136.124 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:02:01 Routing_CalculatingRoute [ distance=76691.7 elapsed=0.629164 finalLat=42.80097 finalLon=75.3143 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.87773 startLon=74.55964 ] -LOG TID(1) INFO 136.189 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:47:11 Routing_CalculatingRoute [ distance=49979.8 elapsed=0.505448 finalLat=18.57709 finalLon=-72.27807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.45156 startLon=-72.65269 ] -LOG TID(1) INFO 136.29 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:38:23 Routing_CalculatingRoute [ distance=89151.4 elapsed=0.694583 finalLat=49.37222 finalLon=3.1 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.76393 startLon=2.44484 ] -LOG TID(1) INFO 136.348 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:22:31 Routing_CalculatingRoute [ distance=14850.8 elapsed=0.191138 finalLat=25.36947 finalLon=51.55127 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.29151 startLon=51.53706 ] -LOG TID(1) INFO 136.385 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 21:50:41 Routing_CalculatingRoute [ distance=11396 elapsed=5.7267 finalLat=40.77043 finalLon=-74.36338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.80108 startLon=-74.4639 ] -LOG TID(1) INFO 136.431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:21:45 Routing_CalculatingRoute [ distance=73003.4 elapsed=2.54192 finalLat=40.4244 finalLon=-74.38265 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.94889 startLon=-74.07223 ] -LOG TID(1) INFO 136.51 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 06:58:32 Routing_CalculatingRoute [ distance=147577 elapsed=0.634329 finalLat=11.56827 finalLon=104.92244 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.61672 startLon=104.18169 ] -LOG TID(1) INFO 136.626 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 09:09:53 Routing_CalculatingRoute [ distance=11952.2 elapsed=0.371689 finalLat=11.56827 finalLon=104.92244 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.53526 startLon=104.83069 ] -LOG TID(1) INFO 136.668 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:47:11 Routing_CalculatingRoute [ distance=49979.8 elapsed=0.505448 finalLat=18.57709 finalLon=-72.27807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.45156 startLon=-72.65269 ] -LOG TID(1) INFO 136.702 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:47:11 Routing_CalculatingRoute [ distance=49979.8 elapsed=0.505448 finalLat=18.57709 finalLon=-72.27807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.45156 startLon=-72.65269 ] -LOG TID(1) INFO 136.723 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 12-Aug-2015 06:43:16 Routing_CalculatingRoute [ distance=32197.4 elapsed=0.239078 finalLat=-3.66871 finalLon=38.94274 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-3.76899 startLon=39.20526 ] -LOG TID(1) INFO 136.734 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:11:11 Routing_CalculatingRoute [ distance=16909.7 elapsed=0.535019 finalLat=39.18285 finalLon=-76.8175 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.28015 startLon=-76.86248 ] -LOG TID(1) INFO 136.839 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:29:12 Routing_CalculatingRoute [ distance=39511.3 elapsed=0.757132 finalLat=39.40723 finalLon=-76.66792 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.18143 startLon=-76.82108 ] -LOG TID(1) INFO 137.004 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:04:52 Routing_CalculatingRoute [ distance=32029.9 elapsed=5.60265 finalLat=38.84146 finalLon=-77.19579 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.99855 startLon=-77.39751 ] -LOG TID(1) INFO 137.379 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Aug-2015 09:39:58 Routing_CalculatingRoute [ distance=613483 elapsed=0.357121 finalLat=46.95743 finalLon=142.72744 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.79492 startLon=143.1327 ] -LOG TID(1) INFO 137.657 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 06:04:25 Routing_CalculatingRoute [ distance=145098 elapsed=2.09655 finalLat=-6.78556 finalLon=111.72273 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-7.55245 startLon=111.58626 ] -LOG TID(1) INFO 137.811 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 06:04:32 Routing_CalculatingRoute [ distance=143723 elapsed=1.8466 finalLat=-6.78556 finalLon=111.72273 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=-7.55245 startLon=111.58626 ] -LOG TID(1) INFO 137.926 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:30:02 Routing_CalculatingRoute [ distance=357158 elapsed=0.175903 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.15792 startLon=-14.41392 ] -LOG TID(1) INFO 137.986 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 19:58:07 Routing_CalculatingRoute [ distance=122072 elapsed=0.319924 finalLat=52.93286 finalLon=-4.55056 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.05069 startLon=-3.05803 ] -LOG TID(1) INFO 138.031 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 19:59:02 Routing_CalculatingRoute [ distance=94858.6 elapsed=0.173097 finalLat=52.91362 finalLon=-4.16847 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.05071 startLon=-3.05807 ] -LOG TID(1) INFO 138.096 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:04:06 Routing_CalculatingRoute [ distance=42731.4 elapsed=0.60551 finalLat=45.11903 finalLon=-0.72885 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.89718 startLon=-0.49683 ] -LOG TID(1) INFO 138.319 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:33:37 Routing_CalculatingRoute [ distance=23149.6 elapsed=0.090021 finalLat=12.04432 finalLon=106.47271 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.09255 startLon=106.54126 ] -LOG TID(1) INFO 138.341 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:06:53 Routing_CalculatingRoute [ distance=32027.7 elapsed=1.51411 finalLat=38.84146 finalLon=-77.19579 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.99856 startLon=-77.39753 ] -LOG TID(1) INFO 138.436 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:07:54 Routing_CalculatingRoute [ distance=31985.1 elapsed=3.50094 finalLat=38.84146 finalLon=-77.19579 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.99859 startLon=-77.39752 ] -LOG TID(1) INFO 138.579 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:29 Routing_CalculatingRoute [ distance=135860 elapsed=0.558389 finalLat=44.05051 finalLon=-123.09506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.48609 startLon=-121.83117 ] -LOG TID(1) INFO 138.691 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 13:06:07 Routing_CalculatingRoute [ distance=15643.5 elapsed=0.26041 finalLat=18.51831 finalLon=-72.29098 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.5773 startLon=-72.22422 ] -LOG TID(1) INFO 138.758 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 22:56:14 Routing_CalculatingRoute [ distance=67879.9 elapsed=1.93161 finalLat=32.94403 finalLon=-85.95384 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.61671 startLon=-85.46374 ] -LOG TID(1) INFO 138.842 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 22:56:14 Routing_CalculatingRoute [ distance=67879.9 elapsed=1.93161 finalLat=32.94403 finalLon=-85.95384 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.61671 startLon=-85.46374 ] -LOG TID(1) INFO 138.928 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 07:23:34 Routing_CalculatingRoute [ distance=16004.4 elapsed=0.626121 finalLat=59.37932 finalLon=28.19949 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=59.44481 startLon=28.0166 ] -LOG TID(1) INFO 139.012 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:09:01 Routing_CalculatingRoute [ distance=16182.1 elapsed=0.333321 finalLat=44.87253 finalLon=-0.65482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.89725 startLon=-0.4968 ] -LOG TID(1) INFO 139.117 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Sep-2015 21:25:26 Routing_CalculatingRoute [ distance=10713 elapsed=0.749568 finalLat=10.59727 finalLon=-61.33703 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.61265 startLon=-61.26569 ] -LOG TID(1) INFO 139.173 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Sep-2015 21:28:05 Routing_CalculatingRoute [ distance=29117.8 elapsed=0.345387 finalLat=10.64792 finalLon=-61.50755 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.61269 startLon=-61.26566 ] -LOG TID(1) INFO 139.274 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 06:49:19 Routing_CalculatingRoute [ distance=558500 elapsed=0.356634 finalLat=5.40913 finalLon=-4.04222 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.2661 startLon=-3.00405 ] -LOG TID(1) INFO 139.45 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:33:20 Routing_CalculatingRoute [ distance=26360.4 elapsed=0.275527 finalLat=41.82371 finalLon=-71.70701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.82588 startLon=-71.41527 ] -LOG TID(1) INFO 139.548 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:40:45 Routing_CalculatingRoute [ distance=26265.4 elapsed=0.200866 finalLat=41.82371 finalLon=-71.70701 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.82548 startLon=-71.42567 ] -LOG TID(1) INFO 139.571 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:26:37 Routing_CalculatingRoute [ distance=32115.7 elapsed=0.315076 finalLat=41.58669 finalLon=-72.02078 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.78578 startLon=-71.81424 ] -LOG TID(1) INFO 139.689 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:48:31 Routing_CalculatingRoute [ distance=69091.7 elapsed=0.295846 finalLat=41.31315 finalLon=-72.33147 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.71219 startLon=-71.88163 ] -LOG TID(1) INFO 139.768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:57:59 Routing_CalculatingRoute [ distance=47899.2 elapsed=0.133158 finalLat=41.53066 finalLon=-71.42228 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.36411 startLon=-71.80498 ] -LOG TID(1) INFO 139.817 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 09:45:40 Routing_CalculatingRoute [ distance=158155 elapsed=0.147474 finalLat=43.57236 finalLon=104.4274 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.28201 startLon=106.16136 ] -LOG TID(1) INFO 139.869 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 10:36:47 Routing_CalculatingRoute [ distance=217413 elapsed=0.0796433 finalLat=43.57236 finalLon=104.4274 name=vehicle result=NoError startDirectionX=-0.00007 startDirectionY=0 startLat=43.64866 startLon=105.56598 ] -LOG TID(1) INFO 139.877 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 10:36:49 Routing_CalculatingRoute [ distance=217395 elapsed=0.0711032 finalLat=43.57236 finalLon=104.4274 name=vehicle result=NoError startDirectionX=-0.0003 startDirectionY=0 startLat=43.64866 startLon=105.56576 ] -LOG TID(1) INFO 139.884 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 10:36:50 Routing_CalculatingRoute [ distance=217386 elapsed=0.0940689 finalLat=43.57236 finalLon=104.4274 name=vehicle result=NoError startDirectionX=-0.00042 startDirectionY=-0 startLat=43.64865 startLon=105.56564 ] -LOG TID(1) INFO 139.893 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 12:15:49 Routing_CalculatingRoute [ distance=21516.8 elapsed=0.0881847 finalLat=43.5735 finalLon=104.42907 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.57552 startLon=104.68982 ] -LOG TID(1) INFO 139.923 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 22:46:46 Routing_CalculatingRoute [ distance=105002 elapsed=0.942561 finalLat=21.80526 finalLon=-79.98437 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.20652 startLon=-80.64942 ] -LOG TID(1) INFO 140.087 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 22:50:22 Routing_CalculatingRoute [ distance=118702 elapsed=0.372546 finalLat=23.01313 finalLon=-80.83288 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.19532 startLon=-80.58698 ] -LOG TID(1) INFO 140.131 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:26:56 Routing_CalculatingRoute [ distance=63187.5 elapsed=0.225348 finalLat=21.80527 finalLon=-79.98436 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.1066 startLon=-80.3304 ] -LOG TID(1) INFO 140.172 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 23:28:02 Routing_CalculatingRoute [ distance=63169.3 elapsed=0.320067 finalLat=21.80527 finalLon=-79.98436 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.10643 startLon=-80.3304 ] -LOG TID(1) INFO 140.198 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:29:01 Routing_CalculatingRoute [ distance=28564.3 elapsed=0.116098 finalLat=22.66209 finalLon=-79.06809 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.53492 startLon=-79.27823 ] -LOG TID(1) INFO 140.228 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:29:38 Routing_CalculatingRoute [ distance=26865.4 elapsed=0.0950366 finalLat=22.65962 finalLon=-79.06358 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.53725 startLon=-79.26754 ] -LOG TID(1) INFO 140.264 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:14:42 Routing_CalculatingRoute [ distance=18253.1 elapsed=0.527468 finalLat=48.54131 finalLon=135.18157 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.42994 startLon=135.11114 ] -LOG TID(1) INFO 140.331 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 06:49:19 Routing_CalculatingRoute [ distance=558500 elapsed=0.356634 finalLat=5.40913 finalLon=-4.04222 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.2661 startLon=-3.00405 ] -LOG TID(1) INFO 140.373 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Aug-2015 05:59:22 Routing_CalculatingRoute [ distance=25773.9 elapsed=0.30728 finalLat=13.36415 finalLon=144.76974 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.34445 startLon=144.65682 ] -LOG TID(1) INFO 140.391 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Aug-2015 06:52:43 Routing_CalculatingRoute [ distance=17541.3 elapsed=0.162185 finalLat=13.36415 finalLon=144.76974 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.25067 startLon=144.71731 ] -LOG TID(1) INFO 140.398 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Aug-2015 08:18:08 Routing_CalculatingRoute [ distance=21743.2 elapsed=0.21813 finalLat=13.49656 finalLon=144.77122 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.3636 startLon=144.76967 ] -LOG TID(1) INFO 140.421 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:15:33 Routing_CalculatingRoute [ distance=94315.4 elapsed=0.877102 finalLat=23.16123 finalLon=89.22307 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.59316 startLon=89.79793 ] -LOG TID(1) INFO 140.473 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 22:56:14 Routing_CalculatingRoute [ distance=67879.9 elapsed=1.93161 finalLat=32.94403 finalLon=-85.95384 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.61671 startLon=-85.46374 ] -LOG TID(1) INFO 140.586 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 17:15:23 Routing_CalculatingRoute [ distance=27147.2 elapsed=4.46291 finalLat=48.13916 finalLon=-1.96926 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.16084 startLon=-1.693 ] -LOG TID(1) INFO 140.693 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 17:15:23 Routing_CalculatingRoute [ distance=27147.2 elapsed=4.46291 finalLat=48.13916 finalLon=-1.96926 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.16084 startLon=-1.693 ] -LOG TID(1) INFO 140.829 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:06:35 Routing_CalculatingRoute [ distance=186693 elapsed=0.565309 finalLat=43.61188 finalLon=1.45174 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.92467 startLon=1.84304 ] -LOG TID(1) INFO 141.102 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 20:13:28 Routing_CalculatingRoute [ distance=121236 elapsed=3.90934 finalLat=24.23414 finalLon=120.8095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.4712 startLon=120.44031 ] -LOG TID(1) INFO 141.188 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:05:02 Routing_CalculatingRoute [ distance=76963.2 elapsed=0.996684 finalLat=56.21795 finalLon=-4.18619 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.95161 startLon=-3.22366 ] -LOG TID(1) INFO 141.431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:19:31 Routing_CalculatingRoute [ distance=38518.8 elapsed=0.767446 finalLat=56.11813 finalLon=-3.936 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=55.82836 startLon=-4.09179 ] -LOG TID(1) INFO 141.572 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Oct-2015 21:52:36 Routing_CalculatingRoute [ distance=86867.5 elapsed=0.327199 finalLat=41.2964 finalLon=-92.64435 name=vehicle result=NoError startDirectionX=-0.00002 startDirectionY=0 startLat=41.59793 startLon=-93.49211 ] -LOG TID(1) INFO 141.644 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 19:56:33 Routing_CalculatingRoute [ distance=91362.6 elapsed=0.539525 finalLat=38.97865 finalLon=-76.49277 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.51068 startLon=-76.16294 ] -LOG TID(1) INFO 141.876 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 20:04:29 Routing_CalculatingRoute [ distance=84102.4 elapsed=0.32978 finalLat=38.97865 finalLon=-76.49277 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.47923 startLon=-76.21856 ] -LOG TID(1) INFO 141.98 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 20:01:07 Routing_CalculatingRoute [ distance=155910 elapsed=0.672797 finalLat=32.4586 finalLon=35.29846 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.51837 startLon=35.10443 ] -LOG TID(1) INFO 142.071 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 18:12:29 Routing_CalculatingRoute [ distance=17232.8 elapsed=0.438008 finalLat=34.85628 finalLon=-82.24022 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.85133 startLon=-82.39452 ] -LOG TID(1) INFO 142.343 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 18:12:31 Routing_CalculatingRoute [ distance=17209.8 elapsed=0.166386 finalLat=34.85628 finalLon=-82.24022 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.85128 startLon=-82.39428 ] -LOG TID(1) INFO 142.417 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:50:38 Routing_CalculatingRoute [ distance=61837.5 elapsed=0.431365 finalLat=31.89339 finalLon=35.1895 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=31.51863 startLon=35.10441 ] -LOG TID(1) INFO 142.485 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Sep-2015 20:16:50 Routing_CalculatingRoute [ distance=13373 elapsed=0.606142 finalLat=49.44066 finalLon=6.63803 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.52083 startLon=6.73823 ] -LOG TID(1) INFO 142.534 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Sep-2015 20:16:51 Routing_CalculatingRoute [ distance=13373 elapsed=0.179264 finalLat=49.44066 finalLon=6.63803 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.52083 startLon=6.73823 ] -LOG TID(1) INFO 142.566 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:13:15 Routing_CalculatingRoute [ distance=228899 elapsed=3.70234 finalLat=36.16222 finalLon=-86.77434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.98818 startLon=-85.19871 ] -LOG TID(1) INFO 142.866 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:13:21 Routing_CalculatingRoute [ distance=228899 elapsed=0.646884 finalLat=36.16222 finalLon=-86.77434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.98818 startLon=-85.19871 ] -LOG TID(1) INFO 142.946 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:13:27 Routing_CalculatingRoute [ distance=228899 elapsed=0.484861 finalLat=36.16222 finalLon=-86.77434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.98818 startLon=-85.19871 ] -LOG TID(1) INFO 143.024 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:13:33 Routing_CalculatingRoute [ distance=228899 elapsed=0.493782 finalLat=36.16222 finalLon=-86.77434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.98818 startLon=-85.19871 ] -LOG TID(1) INFO 143.1 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:13:39 Routing_CalculatingRoute [ distance=228899 elapsed=0.445385 finalLat=36.16222 finalLon=-86.77434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.98818 startLon=-85.19871 ] -LOG TID(1) INFO 143.174 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:14:58 Routing_CalculatingRoute [ distance=21495.6 elapsed=0.678039 finalLat=34.99424 finalLon=-85.3494 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.9881 startLon=-85.19871 ] -LOG TID(1) INFO 143.286 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:50:58 Routing_CalculatingRoute [ distance=14651.4 elapsed=0.461408 finalLat=47.61179 finalLon=1.51931 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.71916 startLon=1.51966 ] -LOG TID(1) INFO 143.363 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:21:36 Routing_CalculatingRoute [ distance=27659.2 elapsed=0.512239 finalLat=35.98626 finalLon=14.3327 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.85123 startLon=14.49517 ] -LOG TID(1) INFO 143.409 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:08:27 Routing_CalculatingRoute [ distance=166421 elapsed=0.231161 finalLat=16.09628 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.96964 startLon=-88.22225 ] -LOG TID(1) INFO 143.462 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:08:45 Routing_CalculatingRoute [ distance=166432 elapsed=0.119936 finalLat=16.09628 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.96972 startLon=-88.22232 ] -LOG TID(1) INFO 143.48 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:52:27 Routing_CalculatingRoute [ distance=143922 elapsed=0.137723 finalLat=16.09627 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.88271 startLon=-88.3415 ] -LOG TID(1) INFO 143.493 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:54:29 Routing_CalculatingRoute [ distance=93435.9 elapsed=0.076073 finalLat=16.09628 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.52663 startLon=-88.47548 ] -LOG TID(1) INFO 143.505 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:18:39 Routing_CalculatingRoute [ distance=65675.4 elapsed=0.058836 finalLat=16.09628 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.48712 startLon=-88.68101 ] -LOG TID(1) INFO 143.511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:41:14 Routing_CalculatingRoute [ distance=64155.8 elapsed=0.062577 finalLat=16.09628 finalLon=-88.80857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.48928 startLon=-88.69508 ] -LOG TID(1) INFO 143.526 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 01:02:27 Routing_CalculatingRoute [ distance=111058 elapsed=1.43012 finalLat=22.46869 finalLon=120.45089 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=23.28238 startLon=120.39332 ] -LOG TID(1) INFO 143.576 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:23:05 Routing_CalculatingRoute [ distance=52628.8 elapsed=0.397133 finalLat=49.93413 finalLon=6.2072 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.60661 startLon=6.12174 ] -LOG TID(1) INFO 143.659 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 22:56:14 Routing_CalculatingRoute [ distance=67879.9 elapsed=1.93161 finalLat=32.94403 finalLon=-85.95384 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.61671 startLon=-85.46374 ] -LOG TID(1) INFO 143.744 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:22:21 Routing_CalculatingRoute [ distance=30167.2 elapsed=2.10188 finalLat=42.31945 finalLon=140.97191 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.47373 startLon=141.23556 ] -LOG TID(1) INFO 143.973 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:04:33 Routing_CalculatingRoute [ distance=20436.1 elapsed=2.09773 finalLat=42.31945 finalLon=140.97191 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.43291 startLon=141.14012 ] -LOG TID(1) INFO 144.068 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Sep-2015 15:27:33 Routing_CalculatingRoute [ distance=50744.1 elapsed=0.209305 finalLat=11.84713 finalLon=-86.19911 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.07255 startLon=-86.26556 ] -LOG TID(1) INFO 144.122 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 21:55:18 Routing_CalculatingRoute [ distance=15485.7 elapsed=1.68706 finalLat=14.77675 finalLon=-17.38015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.7326 startLon=-17.46126 ] -LOG TID(1) INFO 144.353 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Sep-2015 21:55:39 Routing_CalculatingRoute [ distance=16138.3 elapsed=1.36123 finalLat=14.77675 finalLon=-17.38015 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.7326 startLon=-17.46195 ] -LOG TID(1) INFO 144.513 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:58:45 Routing_CalculatingRoute [ distance=156744 elapsed=1.36089 finalLat=27.6984 finalLon=84.4218 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.71091 startLon=85.31674 ] -LOG TID(1) INFO 144.747 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 09:49:50 Routing_CalculatingRoute [ distance=236599 elapsed=0.516209 finalLat=7.17395 finalLon=79.88713 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.57622 startLon=81.23452 ] -LOG TID(1) INFO 144.917 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 09:50:35 Routing_CalculatingRoute [ distance=240594 elapsed=0.158639 finalLat=7.20943 finalLon=79.83312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.57623 startLon=81.23452 ] -LOG TID(1) INFO 144.971 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:45:50 Routing_CalculatingRoute [ distance=117330 elapsed=0.226323 finalLat=7.2104 finalLon=79.84211 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.7701 startLon=80.57966 ] -LOG TID(1) INFO 145.013 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:49:55 Routing_CalculatingRoute [ distance=114864 elapsed=0.100533 finalLat=7.22715 finalLon=79.84319 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.76727 startLon=80.57727 ] -LOG TID(1) INFO 145.056 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:52:30 Routing_CalculatingRoute [ distance=114993 elapsed=0.0953223 finalLat=7.2246 finalLon=79.84292 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=7.76605 startLon=80.57614 ] -LOG TID(1) INFO 145.099 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 12:34:18 Routing_CalculatingRoute [ distance=245810 elapsed=0.267261 finalLat=5.80472 finalLon=-57.0594 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.76006 startLon=-55.16199 ] -LOG TID(1) INFO 145.165 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Sep-2015 18:38:57 Routing_CalculatingRoute [ distance=12240.4 elapsed=0.401971 finalLat=29.76472 finalLon=-93.63772 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.78198 startLon=-93.75341 ] -LOG TID(1) INFO 145.246 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Sep-2015 19:02:52 Routing_CalculatingRoute [ distance=23509 elapsed=0.235053 finalLat=29.76472 finalLon=-93.63772 name=vehicle result=NoError startDirectionX=0.00034 startDirectionY=0 startLat=29.7615 startLon=-93.57609 ] -LOG TID(1) INFO 145.314 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:39:22 Routing_CalculatingRoute [ distance=91797 elapsed=0.219146 finalLat=47.76264 finalLon=6.03775 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.64388 startLon=6.90007 ] -LOG TID(1) INFO 145.359 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:41:12 Routing_CalculatingRoute [ distance=89094.2 elapsed=0.213081 finalLat=47.76347 finalLon=6.03787 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.63187 startLon=6.87398 ] -LOG TID(1) INFO 145.499 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:38:10 Routing_CalculatingRoute [ distance=245163 elapsed=0.138502 finalLat=12.48894 finalLon=106.02007 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.74411 startLon=106.98647 ] -LOG TID(1) INFO 145.538 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:38:34 Routing_CalculatingRoute [ distance=486396 elapsed=0.215562 finalLat=11.56827 finalLon=104.92243 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.74411 startLon=106.98647 ] -LOG TID(1) INFO 145.598 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:39:29 Routing_CalculatingRoute [ distance=245165 elapsed=0.113876 finalLat=12.48896 finalLon=106.02009 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.74411 startLon=106.98647 ] -LOG TID(1) INFO 145.642 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 14:59:08 Routing_CalculatingRoute [ distance=25214.8 elapsed=0.0433617 finalLat=12.41403 finalLon=-69.88114 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.52309 startLon=-70.0437 ] -LOG TID(1) INFO 145.678 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:20:04 Routing_CalculatingRoute [ distance=44744.1 elapsed=0.379027 finalLat=14.76937 finalLon=-17.3891 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.92126 startLon=-17.12049 ] -LOG TID(1) INFO 145.817 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:19:27 Routing_CalculatingRoute [ distance=123592 elapsed=0.719251 finalLat=38.54444 finalLon=-77.34306 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.64772 startLon=-77.5987 ] -LOG TID(1) INFO 146.173 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:23:08 Routing_CalculatingRoute [ distance=25210.4 elapsed=0.295465 finalLat=12.26921 finalLon=-68.34531 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.12515 startLon=-68.28583 ] -LOG TID(1) INFO 146.274 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:34:10 Routing_CalculatingRoute [ distance=35965.9 elapsed=2.49326 finalLat=41.11306 finalLon=-76.14846 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.99794 startLon=-76.41424 ] -LOG TID(1) INFO 146.582 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:08:05 Routing_CalculatingRoute [ distance=15663.6 elapsed=1.0029 finalLat=53.59251 finalLon=9.85879 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.63633 startLon=10.03942 ] -LOG TID(1) INFO 146.667 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:36:21 Routing_CalculatingRoute [ distance=18201.5 elapsed=7.11744 finalLat=43.26439 finalLon=-0.33273 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.39768 startLon=-0.38539 ] -LOG TID(1) INFO 146.879 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:15:55 Routing_CalculatingRoute [ distance=35031.3 elapsed=0.55923 finalLat=35.37313 finalLon=-94.40999 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.31982 startLon=-94.09534 ] -LOG TID(1) INFO 147.014 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 02:45:41 Routing_CalculatingRoute [ distance=32784.7 elapsed=0.548599 finalLat=35.39003 finalLon=-94.05581 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.32772 startLon=-94.30468 ] -LOG TID(1) INFO 147.094 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 13:23:10 Routing_CalculatingRoute [ distance=10410.9 elapsed=0.360185 finalLat=12.78861 finalLon=44.97778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.82533 startLon=45.03661 ] -LOG TID(1) INFO 147.132 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 04:15:17 Routing_CalculatingRoute [ distance=16681.5 elapsed=0.0157957 finalLat=5.34663 finalLon=-54.88823 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.39906 startLon=-54.76945 ] -LOG TID(1) INFO 147.139 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 04:16:43 Routing_CalculatingRoute [ distance=24563.7 elapsed=0.0112525 finalLat=5.305 finalLon=-54.93204 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.39895 startLon=-54.76955 ] -LOG TID(1) INFO 147.147 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 22:49:41 Routing_CalculatingRoute [ distance=13085.4 elapsed=0.379577 finalLat=12.03183 finalLon=-86.19119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.11098 startLon=-86.25217 ] -LOG TID(1) INFO 147.178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 22:52:40 Routing_CalculatingRoute [ distance=13085.4 elapsed=0.282133 finalLat=12.03183 finalLon=-86.19119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.11098 startLon=-86.25217 ] -LOG TID(1) INFO 147.225 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:39:22 Routing_CalculatingRoute [ distance=91797 elapsed=0.219146 finalLat=47.76264 finalLon=6.03775 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.64388 startLon=6.90007 ] -LOG TID(1) INFO 147.262 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 26-Oct-2015 19:41:12 Routing_CalculatingRoute [ distance=89094.2 elapsed=0.213081 finalLat=47.76347 finalLon=6.03787 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.63187 startLon=6.87398 ] -LOG TID(1) INFO 147.311 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:57:42 Routing_CalculatingRoute [ distance=115258 elapsed=2.39098 finalLat=48.64546 finalLon=-2.01541 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.82855 startLon=-2.43248 ] -LOG TID(1) INFO 147.428 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:25:16 Routing_CalculatingRoute [ distance=54790 elapsed=3.48602 finalLat=45.12303 finalLon=-0.66554 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.8249 startLon=-0.62236 ] -LOG TID(1) INFO 147.633 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 05:40:28 Routing_CalculatingRoute [ distance=100799 elapsed=0.766327 finalLat=45.26663 finalLon=-0.24766 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.8372 startLon=0.48134 ] -LOG TID(1) INFO 147.698 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 20:43:08 Routing_CalculatingRoute [ distance=12739.1 elapsed=0.130852 finalLat=54.34172 finalLon=-5.57901 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.33375 startLon=-5.71699 ] -LOG TID(1) INFO 147.795 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 12:42:29 Routing_CalculatingRoute [ distance=25145.2 elapsed=0.166062 finalLat=54.55262 finalLon=-5.97718 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.40193 startLon=-5.7665 ] -LOG TID(1) INFO 147.852 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 18:11:43 Routing_CalculatingRoute [ distance=132164 elapsed=0.221589 finalLat=54.55262 finalLon=-5.97718 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.50047 startLon=-7.70535 ] -LOG TID(1) INFO 147.897 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 18:13:12 Routing_CalculatingRoute [ distance=136951 elapsed=0.148889 finalLat=54.58229 finalLon=-5.93533 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.50054 startLon=-7.70523 ] -LOG TID(1) INFO 147.946 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 19:57:39 Routing_CalculatingRoute [ distance=28510.3 elapsed=0.146039 finalLat=54.55216 finalLon=-5.97838 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.49276 startLon=-6.29735 ] -LOG TID(1) INFO 147.991 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:41:58 Routing_CalculatingRoute [ distance=49209.5 elapsed=2.4254 finalLat=43.04988 finalLon=141.3343 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.11447 startLon=141.74286 ] -LOG TID(1) INFO 148.342 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:37:30 Routing_CalculatingRoute [ distance=18140.4 elapsed=0.500324 finalLat=44.42285 finalLon=132.06379 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.28782 startLon=132.10095 ] -LOG TID(1) INFO 148.433 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:37:35 Routing_CalculatingRoute [ distance=18140.5 elapsed=0.107966 finalLat=44.42285 finalLon=132.06379 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.28782 startLon=132.10095 ] -LOG TID(1) INFO 148.461 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:38:17 Routing_CalculatingRoute [ distance=69248.3 elapsed=0.485937 finalLat=43.79141 finalLon=131.93835 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.28782 startLon=132.10095 ] -LOG TID(1) INFO 148.543 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:38:46 Routing_CalculatingRoute [ distance=140687 elapsed=0.350729 finalLat=44.1608 finalLon=133.28892 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.28782 startLon=132.10095 ] -LOG TID(1) INFO 148.602 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 20:21:27 Routing_CalculatingRoute [ distance=17635.3 elapsed=0.72382 finalLat=-20.95212 finalLon=55.43721 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.88973 startLon=55.46098 ] -LOG TID(1) INFO 148.696 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:40:17 Routing_CalculatingRoute [ distance=11484.2 elapsed=0.566684 finalLat=48.6865 finalLon=-1.35829 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.61921 startLon=-1.29167 ] -LOG TID(1) INFO 148.752 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:41:23 Routing_CalculatingRoute [ distance=147393 elapsed=0.512345 finalLat=49.29344 finalLon=-0.11551 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.61917 startLon=-1.29165 ] -LOG TID(1) INFO 148.87 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 19:59:29 Routing_CalculatingRoute [ distance=53054.9 elapsed=0.825794 finalLat=13.69776 finalLon=-89.19301 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.98419 startLon=-89.38424 ] -LOG TID(1) INFO 148.976 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 14-Oct-2015 05:37:36 Routing_CalculatingRoute [ distance=394910 elapsed=0.489502 finalLat=47.91847 finalLon=106.9177 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.36838 startLon=102.47672 ] -LOG TID(1) INFO 149.066 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 06:49:19 Routing_CalculatingRoute [ distance=558500 elapsed=0.356634 finalLat=5.40913 finalLon=-4.04222 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.2661 startLon=-3.00405 ] -LOG TID(1) INFO 149.174 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:45:33 Routing_CalculatingRoute [ distance=267912 elapsed=1.7423 finalLat=11.41774 finalLon=-7.48766 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.93765 startLon=-8.41826 ] -LOG TID(1) INFO 149.435 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:29:08 Routing_CalculatingRoute [ distance=19399.3 elapsed=0.356586 finalLat=25.15665 finalLon=51.60131 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.28531 startLon=51.5137 ] -LOG TID(1) INFO 149.479 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 22:31:02 Routing_CalculatingRoute [ distance=16435.5 elapsed=0.113702 finalLat=25.1808 finalLon=51.59591 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.2872 startLon=51.51473 ] -LOG TID(1) INFO 149.543 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:44:29 Routing_CalculatingRoute [ distance=20886.8 elapsed=0.394776 finalLat=43.71927 finalLon=-121.25872 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.70546 startLon=-121.47003 ] -LOG TID(1) INFO 149.592 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:16:21 Routing_CalculatingRoute [ distance=298668 elapsed=1.40768 finalLat=43.3665 finalLon=-124.21789 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.49925 startLon=-121.85976 ] -LOG TID(1) INFO 149.699 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:43:51 Routing_CalculatingRoute [ distance=11742.7 elapsed=0.248947 finalLat=32.22818 finalLon=35.22221 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.19214 startLon=35.29243 ] -LOG TID(1) INFO 149.766 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:31:16 Routing_CalculatingRoute [ distance=17374.4 elapsed=1.41545 finalLat=53.50537 finalLon=13.9889 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.4505 startLon=14.21959 ] -LOG TID(1) INFO 149.804 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:21:30 Routing_CalculatingRoute [ distance=12630.3 elapsed=0.280733 finalLat=53.56901 finalLon=13.90328 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.50805 startLon=14.00792 ] -LOG TID(1) INFO 149.848 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 00:42:45 Routing_CalculatingRoute [ distance=1.19817e+06 elapsed=1.22352 finalLat=16.27881 finalLon=-0.04122 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.65705 startLon=-8.02255 ] -LOG TID(1) INFO 150.01 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:11:35 Routing_CalculatingRoute [ distance=165680 elapsed=1.03387 finalLat=11.41775 finalLon=-7.48768 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.65632 startLon=-8.02161 ] -LOG TID(1) INFO 150.088 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:49:44 Routing_CalculatingRoute [ distance=28527.2 elapsed=0.320103 finalLat=26.03093 finalLon=50.51434 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.23625 startLon=50.54952 ] -LOG TID(1) INFO 150.19 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:48:41 Routing_CalculatingRoute [ distance=28423 elapsed=0.488509 finalLat=42.21049 finalLon=20.74195 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.39646 startLon=20.64794 ] -LOG TID(1) INFO 150.292 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:37:39 Routing_CalculatingRoute [ distance=34089.3 elapsed=0.610639 finalLat=14.76937 finalLon=-17.3891 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.82996 startLon=-17.1368 ] -LOG TID(1) INFO 150.387 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:09:33 Routing_CalculatingRoute [ distance=13363 elapsed=0.620765 finalLat=37.64286 finalLon=-83.7126 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.70635 startLon=-83.66635 ] -LOG TID(1) INFO 150.506 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:52:44 Routing_CalculatingRoute [ distance=35819.9 elapsed=1.50726 finalLat=8.33896 finalLon=-13.06959 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.49305 startLon=-13.27438 ] -LOG TID(1) INFO 150.669 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:52:56 Routing_CalculatingRoute [ distance=61055.7 elapsed=0.694026 finalLat=53.62883 finalLon=11.41482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.79286 startLon=12.17449 ] -LOG TID(1) INFO 150.77 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 19:07:06 Routing_CalculatingRoute [ distance=61118 elapsed=0.974671 finalLat=36.15998 finalLon=-95.88927 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.29912 startLon=-95.32156 ] -LOG TID(1) INFO 150.842 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 20:25:23 Routing_CalculatingRoute [ distance=62493 elapsed=1.11387 finalLat=36.30464 finalLon=-95.32275 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.1602 startLon=-95.88889 ] -LOG TID(1) INFO 150.973 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:56:25 Routing_CalculatingRoute [ distance=30117.2 elapsed=0.237905 finalLat=53.60988 finalLon=9.91604 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.46623 startLon=10.20178 ] -LOG TID(1) INFO 151.078 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:41:32 Routing_CalculatingRoute [ distance=167031 elapsed=0.547561 finalLat=33.95458 finalLon=-81.11824 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.86657 startLon=-80.01493 ] -LOG TID(1) INFO 151.42 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:02:26 Routing_CalculatingRoute [ distance=166064 elapsed=0.546699 finalLat=32.86688 finalLon=-80.01429 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.95485 startLon=-81.11849 ] -LOG TID(1) INFO 151.527 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 20:41:32 Routing_CalculatingRoute [ distance=167031 elapsed=0.547561 finalLat=33.95458 finalLon=-81.11824 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=32.86657 startLon=-80.01493 ] -LOG TID(1) INFO 151.608 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:02:26 Routing_CalculatingRoute [ distance=166064 elapsed=0.546699 finalLat=32.86688 finalLon=-80.01429 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.95485 startLon=-81.11849 ] -LOG TID(1) INFO 151.702 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:43:07 Routing_CalculatingRoute [ distance=12635.1 elapsed=0.677379 finalLat=39.67841 finalLon=-75.65151 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.7019 startLon=-75.55195 ] -LOG TID(1) INFO 151.751 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:34:37 Routing_CalculatingRoute [ distance=13388.7 elapsed=0.277749 finalLat=12.09271 finalLon=-68.23625 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.17171 startLon=-68.28793 ] -LOG TID(1) INFO 151.78 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 12:34:18 Routing_CalculatingRoute [ distance=245810 elapsed=0.267261 finalLat=5.80472 finalLon=-57.0594 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.76006 startLon=-55.16199 ] -LOG TID(1) INFO 151.848 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:00:24 Routing_CalculatingRoute [ distance=31620.7 elapsed=0.694316 finalLat=53.58519 finalLon=9.7612 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.6127 startLon=10.17112 ] -LOG TID(1) INFO 151.944 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:46:07 Routing_CalculatingRoute [ distance=49313.6 elapsed=1.24045 finalLat=39.83786 finalLon=-104.71496 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.92936 startLon=-105.11737 ] -LOG TID(1) INFO 152.303 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:08:17 Routing_CalculatingRoute [ distance=21318.3 elapsed=0.870362 finalLat=39.85012 finalLon=-104.67484 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.77237 startLon=-104.82724 ] -LOG TID(1) INFO 152.396 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 16:15:43 Routing_CalculatingRoute [ distance=145357 elapsed=3.52433 finalLat=52.18082 finalLon=11.26443 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.23533 startLon=11.92152 ] -LOG TID(1) INFO 152.483 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:08:42 Routing_CalculatingRoute [ distance=45451.9 elapsed=1.07995 finalLat=10.59727 finalLon=-61.33703 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.2861 startLon=-61.44881 ] -LOG TID(1) INFO 152.534 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 19:25:07 Routing_CalculatingRoute [ distance=77652 elapsed=1.18993 finalLat=36.00294 finalLon=-95.90504 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.30195 startLon=-95.32368 ] -LOG TID(1) INFO 152.607 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 22:34:04 Routing_CalculatingRoute [ distance=68891.5 elapsed=0.637387 finalLat=36.30843 finalLon=-95.31691 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.08942 startLon=-95.90282 ] -LOG TID(1) INFO 152.763 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:43:07 Routing_CalculatingRoute [ distance=12635.1 elapsed=0.677379 finalLat=39.67841 finalLon=-75.65151 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.7019 startLon=-75.55195 ] -LOG TID(1) INFO 152.819 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 18:17:03 Routing_CalculatingRoute [ distance=19439.6 elapsed=0.077382 finalLat=42.37099 finalLon=20.43478 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.33115 startLon=20.62598 ] -LOG TID(1) INFO 152.848 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:05:33 Routing_CalculatingRoute [ distance=38067 elapsed=0.537769 finalLat=18.57709 finalLon=-72.27807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.5222 startLon=-72.59271 ] -LOG TID(1) INFO 152.88 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:28:51 Routing_CalculatingRoute [ distance=20705.2 elapsed=0.33081 finalLat=18.57709 finalLon=-72.27807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.54169 startLon=-72.43627 ] -LOG TID(1) INFO 152.944 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:47:29 Routing_CalculatingRoute [ distance=21014.6 elapsed=1.53789 finalLat=25.18088 finalLon=51.45147 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=25.339 startLon=51.45495 ] -LOG TID(1) INFO 153.012 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:46:07 Routing_CalculatingRoute [ distance=49313.6 elapsed=1.24045 finalLat=39.83786 finalLon=-104.71496 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.92936 startLon=-105.11737 ] -LOG TID(1) INFO 153.091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:08:17 Routing_CalculatingRoute [ distance=21318.3 elapsed=0.870362 finalLat=39.85012 finalLon=-104.67484 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.77237 startLon=-104.82724 ] -LOG TID(1) INFO 153.185 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:10:28 Routing_CalculatingRoute [ distance=22397.6 elapsed=0.343694 finalLat=5.29171 finalLon=-3.98197 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.31761 startLon=-4.04391 ] -LOG TID(1) INFO 153.294 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:11:42 Routing_CalculatingRoute [ distance=23897.1 elapsed=0.168412 finalLat=5.27947 finalLon=-3.97743 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.31761 startLon=-4.04391 ] -LOG TID(1) INFO 153.33 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 22:13:41 Routing_CalculatingRoute [ distance=24606.5 elapsed=0.217272 finalLat=5.28576 finalLon=-3.96278 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.3176 startLon=-4.04387 ] -LOG TID(1) INFO 153.405 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:57:31 Routing_CalculatingRoute [ distance=20276.8 elapsed=0.615676 finalLat=15.28569 finalLon=44.23117 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43512 startLon=44.21976 ] -LOG TID(1) INFO 153.441 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 15:59:14 Routing_CalculatingRoute [ distance=22083.6 elapsed=0.177643 finalLat=-20.00301 finalLon=57.66049 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00053 startLat=-20.0997 startLon=57.70664 ] -LOG TID(1) INFO 153.466 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 15:59:28 Routing_CalculatingRoute [ distance=16887.6 elapsed=0.235657 finalLat=-20.00301 finalLon=57.66049 name=vehicle result=NoError startDirectionX=-0.00011 startDirectionY=0 startLat=-20.09991 startLon=57.70625 ] -LOG TID(1) INFO 153.502 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:13:25 Routing_CalculatingRoute [ distance=10834.9 elapsed=8.29797 finalLat=3.84732 finalLon=11.56751 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=3.89399 startLon=11.50589 ] -LOG TID(1) INFO 153.712 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:12:43 Routing_CalculatingRoute [ distance=40846.6 elapsed=0.991973 finalLat=13.95832 finalLon=-88.15819 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.68204 startLon=-88.10443 ] -LOG TID(1) INFO 153.878 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:32:43 Routing_CalculatingRoute [ distance=169121 elapsed=0.189725 finalLat=14.45295 finalLon=-87.63641 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.50712 startLon=-87.69153 ] -LOG TID(1) INFO 154 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:07:14 Routing_CalculatingRoute [ distance=23324.1 elapsed=0.258637 finalLat=35.89877 finalLon=14.51348 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.9659 startLon=14.36053 ] -LOG TID(1) INFO 154.04 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:32:43 Routing_CalculatingRoute [ distance=169121 elapsed=0.189725 finalLat=14.45295 finalLon=-87.63641 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.50712 startLon=-87.69153 ] -LOG TID(1) INFO 154.091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:23:35 Routing_CalculatingRoute [ distance=21693.9 elapsed=1.60971 finalLat=42.32318 finalLon=140.94906 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.45403 startLon=140.88181 ] -LOG TID(1) INFO 154.181 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:23:49 Routing_CalculatingRoute [ distance=43319.2 elapsed=0.355244 finalLat=44.64396 finalLon=-63.34497 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.78191 startLon=-63.72932 ] -LOG TID(1) INFO 154.238 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:22:50 Routing_CalculatingRoute [ distance=88134.4 elapsed=0.167502 finalLat=29.27339 finalLon=47.49796 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.10295 startLon=48.12277 ] -LOG TID(1) INFO 154.278 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:35:31 Routing_CalculatingRoute [ distance=20666.4 elapsed=0.182116 finalLat=42.6615 finalLon=20.30533 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.60036 startLon=20.52278 ] -LOG TID(1) INFO 154.303 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:25:42 Routing_CalculatingRoute [ distance=17517.5 elapsed=0.0835612 finalLat=42.4081 finalLon=20.26204 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.48789 startLon=20.32598 ] -LOG TID(1) INFO 154.318 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:26:43 Routing_CalculatingRoute [ distance=64031.4 elapsed=0.157113 finalLat=42.15739 finalLon=20.55185 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.47662 startLon=20.33737 ] -LOG TID(1) INFO 154.411 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:55:36 Routing_CalculatingRoute [ distance=13945 elapsed=1.3901 finalLat=44.00006 finalLon=-123.0075 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.04358 startLon=-122.95421 ] -LOG TID(1) INFO 154.492 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:24:01 Routing_CalculatingRoute [ distance=21693.9 elapsed=0.392033 finalLat=42.32318 finalLon=140.94906 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.45403 startLon=140.88181 ] -LOG TID(1) INFO 154.575 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:27:36 Routing_CalculatingRoute [ distance=21694.5 elapsed=1.03015 finalLat=42.32318 finalLon=140.94906 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.454 startLon=140.88181 ] -LOG TID(1) INFO 154.69 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 16:33:48 Routing_CalculatingRoute [ distance=22588.4 elapsed=0.288171 finalLat=54.60822 finalLon=-5.9189 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=54.72339 startLon=-6.1528 ] -LOG TID(1) INFO 154.773 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:18:21 Routing_CalculatingRoute [ distance=89197.1 elapsed=0.752015 finalLat=33.21649 finalLon=132.56516 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.81291 startLon=132.80968 ] -LOG TID(1) INFO 154.988 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:19:25 Routing_CalculatingRoute [ distance=127408 elapsed=0.812286 finalLat=33.49744 finalLon=133.57516 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.81288 startLon=132.80969 ] -LOG TID(1) INFO 155.152 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 23:49:49 Routing_CalculatingRoute [ distance=26759.4 elapsed=0.407488 finalLat=30.47637 finalLon=-90.85981 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.3923 startLon=-91.08921 ] -LOG TID(1) INFO 155.297 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 23:58:16 Routing_CalculatingRoute [ distance=27147.9 elapsed=0.803626 finalLat=30.47637 finalLon=-90.85981 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.39306 startLon=-91.0894 ] -LOG TID(1) INFO 155.356 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 23:58:40 Routing_CalculatingRoute [ distance=27153 elapsed=0.217353 finalLat=30.47637 finalLon=-90.85981 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.39306 startLon=-91.08935 ] -LOG TID(1) INFO 155.413 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 00:28:35 Routing_CalculatingRoute [ distance=27147.9 elapsed=0.394295 finalLat=30.47637 finalLon=-90.85981 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=30.39306 startLon=-91.0894 ] -LOG TID(1) INFO 155.484 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:13:32 Routing_CalculatingRoute [ distance=11618 elapsed=0.067056 finalLat=13.41655 finalLon=144.73665 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.48332 startLon=144.77206 ] -LOG TID(1) INFO 155.566 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:52:25 Routing_CalculatingRoute [ distance=35529 elapsed=7.3516 finalLat=37.5557 finalLon=-79.07975 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.34572 startLon=-79.19062 ] -LOG TID(1) INFO 155.76 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 15:40:28 Routing_CalculatingRoute [ distance=18531.6 elapsed=1.57998 finalLat=42.7676 finalLon=-71.49486 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.80462 startLon=-71.29922 ] -LOG TID(1) INFO 155.85 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:36:54 Routing_CalculatingRoute [ distance=41112.1 elapsed=3.66948 finalLat=39.76392 finalLon=-104.98704 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.97847 startLon=-105.261 ] -LOG TID(1) INFO 156.036 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:37:03 Routing_CalculatingRoute [ distance=11055.2 elapsed=0.64217 finalLat=51.79913 finalLon=10.61564 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.76438 startLon=10.66533 ] -LOG TID(1) INFO 156.091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:08:09 Routing_CalculatingRoute [ distance=34344.4 elapsed=1.4686 finalLat=39.20026 finalLon=-85.90957 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.29169 startLon=-85.617 ] -LOG TID(1) INFO 156.301 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:08:15 Routing_CalculatingRoute [ distance=36255.4 elapsed=0.240532 finalLat=39.20026 finalLon=-85.90957 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.29169 startLon=-85.617 ] -LOG TID(1) INFO 156.371 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:08:21 Routing_CalculatingRoute [ distance=36255.4 elapsed=0.222532 finalLat=39.20026 finalLon=-85.90957 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.29169 startLon=-85.617 ] -LOG TID(1) INFO 156.582 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 20:21:02 Routing_CalculatingRoute [ distance=37217.6 elapsed=0.712642 finalLat=34.15099 finalLon=-84.06736 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.92602 startLon=-84.13625 ] -LOG TID(1) INFO 156.856 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 01:48:05 Routing_CalculatingRoute [ distance=27960.7 elapsed=0.77718 finalLat=34.03392 finalLon=-84.33708 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.92601 startLon=-84.13626 ] -LOG TID(1) INFO 157.043 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:01:34 Routing_CalculatingRoute [ distance=128281 elapsed=7.51067 finalLat=35.09593 finalLon=132.84151 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.50229 startLon=133.41334 ] -LOG TID(1) INFO 157.477 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 14:53:06 Routing_CalculatingRoute [ distance=15771.8 elapsed=0.491441 finalLat=33.97242 finalLon=-84.07754 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.92275 startLon=-84.13261 ] -LOG TID(1) INFO 157.624 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 01:02:29 Routing_CalculatingRoute [ distance=81517.8 elapsed=2.89538 finalLat=50.4481 finalLon=-104.61582 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.81806 startLon=-105.49246 ] -LOG TID(1) INFO 157.705 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 02:55:19 Routing_CalculatingRoute [ distance=25130.7 elapsed=0.60235 finalLat=50.3544 finalLon=-104.1867 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.50721 startLon=-104.14512 ] -LOG TID(1) INFO 157.758 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 10:57:37 Routing_CalculatingRoute [ distance=132531 elapsed=0.239573 finalLat=8.53757 finalLon=39.2542 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.03371 startLon=40.20181 ] -LOG TID(1) INFO 157.9 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 05:04:24 Routing_CalculatingRoute [ distance=10106.6 elapsed=1.11166 finalLat=52.11024 finalLon=-106.63386 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.18052 startLon=-106.63998 ] -LOG TID(1) INFO 158.022 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 01:11:34 Routing_CalculatingRoute [ distance=63504.4 elapsed=0.0344661 finalLat=49.8121 finalLon=6.42149 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.56758 startLon=5.90724 ] -LOG TID(1) INFO 158.079 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:31:55 Routing_CalculatingRoute [ distance=50307.1 elapsed=0.115388 finalLat=49.60204 finalLon=6.3867 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.56763 startLon=5.90711 ] -LOG TID(1) INFO 158.113 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:34:45 Routing_CalculatingRoute [ distance=47286.3 elapsed=0.139873 finalLat=49.60095 finalLon=6.36933 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.56763 startLon=5.90711 ] -LOG TID(1) INFO 158.183 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:38:12 Routing_CalculatingRoute [ distance=11983.4 elapsed=3.00482 finalLat=38.27276 finalLon=140.76162 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.26387 startLon=140.88739 ] -LOG TID(1) INFO 158.532 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:52:40 Routing_CalculatingRoute [ distance=200699 elapsed=0.701701 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.672 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:52:56 Routing_CalculatingRoute [ distance=200699 elapsed=0.175247 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.692 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:53:02 Routing_CalculatingRoute [ distance=200699 elapsed=0.162561 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.713 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:53:07 Routing_CalculatingRoute [ distance=200699 elapsed=0.148727 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.733 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:53:13 Routing_CalculatingRoute [ distance=200699 elapsed=0.14547 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.754 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:53:19 Routing_CalculatingRoute [ distance=200699 elapsed=0.137275 finalLat=-23.18568 finalLon=26.75662 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=-24.60962 startLon=25.8434 ] -LOG TID(1) INFO 158.787 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:55:31 Routing_CalculatingRoute [ distance=124461 elapsed=0.958729 finalLat=49.62924 finalLon=-1.63844 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.18468 startLon=-0.36355 ] -LOG TID(1) INFO 158.894 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Sep-2015 11:06:44 Routing_CalculatingRoute [ distance=58938.5 elapsed=0.223327 finalLat=40.60985 finalLon=72.78862 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.75635 startLon=73.28489 ] -LOG TID(1) INFO 159.014 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:30:29 Routing_CalculatingRoute [ distance=220959 elapsed=2.01944 finalLat=33.51296 finalLon=36.27308 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.20502 startLon=36.85341 ] -LOG TID(1) INFO 159.121 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:00:49 Routing_CalculatingRoute [ distance=11004.9 elapsed=0.43219 finalLat=42.85993 finalLon=74.57319 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.87421 startLon=74.678 ] -LOG TID(1) INFO 159.178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 23-Oct-2015 23:57:54 Routing_CalculatingRoute [ distance=17496.7 elapsed=1.17413 finalLat=12.60142 finalLon=-7.67376 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.59985 startLon=-7.69245 ] -LOG TID(1) INFO 159.245 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 21:40:18 Routing_CalculatingRoute [ distance=36618.9 elapsed=5.42106 finalLat=49.92528 finalLon=3.98528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.90089 startLon=3.56826 ] -LOG TID(1) INFO 159.29 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 21:41:02 Routing_CalculatingRoute [ distance=36619 elapsed=0.321372 finalLat=49.92528 finalLon=3.98528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.90089 startLon=3.56826 ] -LOG TID(1) INFO 159.329 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 21:41:25 Routing_CalculatingRoute [ distance=36619 elapsed=0.469628 finalLat=49.92528 finalLon=3.98528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.90089 startLon=3.56826 ] -LOG TID(1) INFO 159.407 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 10:03:01 Routing_CalculatingRoute [ distance=13100.6 elapsed=0.397493 finalLat=42.85457 finalLon=74.67909 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.82095 startLon=74.56488 ] -LOG TID(1) INFO 159.465 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:48:42 Routing_CalculatingRoute [ distance=298937 elapsed=0.278377 finalLat=42.61293 finalLon=71.58439 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.82331 startLon=73.84197 ] -LOG TID(1) INFO 159.516 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:59:11 Routing_CalculatingRoute [ distance=16785.2 elapsed=0.0958625 finalLat=62.20811 finalLon=-6.70662 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=62.21492 startLon=-6.86335 ] -LOG TID(1) INFO 159.563 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 04:25:03 Routing_CalculatingRoute [ distance=26534.1 elapsed=1.16098 finalLat=34.46617 finalLon=132.47765 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.34526 startLon=132.3171 ] -LOG TID(1) INFO 159.724 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 04:57:52 Routing_CalculatingRoute [ distance=11334.2 elapsed=1.56993 finalLat=34.46617 finalLon=132.47765 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.38746 startLon=132.43994 ] -LOG TID(1) INFO 159.901 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 01:07:16 Routing_CalculatingRoute [ distance=135313 elapsed=1.85881 finalLat=34.46617 finalLon=132.47765 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.16013 startLon=131.46015 ] -LOG TID(1) INFO 160.08 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 15:29:16 Routing_CalculatingRoute [ distance=36366.7 elapsed=2.19659 finalLat=45.95274 finalLon=-0.89753 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.15886 startLon=-1.12004 ] -LOG TID(1) INFO 160.184 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:07:06 Routing_CalculatingRoute [ distance=38847.4 elapsed=0.497919 finalLat=29.35691 finalLon=48.01226 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.08059 startLon=48.07641 ] -LOG TID(1) INFO 160.224 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:04:24 Routing_CalculatingRoute [ distance=25622.3 elapsed=0.151935 finalLat=29.3488 finalLon=48.00295 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=29.25238 startLon=47.8786 ] -LOG TID(1) INFO 160.263 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:58:21 Routing_CalculatingRoute [ distance=20640.3 elapsed=1.67003 finalLat=40.05777 finalLon=-75.21989 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.02479 startLon=-75.34055 ] -LOG TID(1) INFO 160.667 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:29:25 Routing_CalculatingRoute [ distance=18837.9 elapsed=1.45787 finalLat=40.02467 finalLon=-75.34124 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.05762 startLon=-75.22031 ] -LOG TID(1) INFO 160.873 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:05:38 Routing_CalculatingRoute [ distance=56026.4 elapsed=1.91496 finalLat=15.42259 finalLon=32.83663 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.51279 startLon=32.50323 ] -LOG TID(1) INFO 160.982 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:05:51 Routing_CalculatingRoute [ distance=55973.7 elapsed=0.44019 finalLat=15.42259 finalLon=32.83663 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.51207 startLon=32.50119 ] -LOG TID(1) INFO 161.044 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:07:24 Routing_CalculatingRoute [ distance=55717.8 elapsed=0.615042 finalLat=15.42259 finalLon=32.83663 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.52002 startLon=32.50106 ] -LOG TID(1) INFO 161.171 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:58:28 Routing_CalculatingRoute [ distance=32111.6 elapsed=0.105871 finalLat=-20.27922 finalLon=57.36789 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.45015 startLon=57.31555 ] -LOG TID(1) INFO 161.201 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:44:41 Routing_CalculatingRoute [ distance=27271.8 elapsed=0.148453 finalLat=-20.19504 finalLon=57.48873 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.27922 startLon=57.36855 ] -LOG TID(1) INFO 161.22 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:05:59 Routing_CalculatingRoute [ distance=49430.7 elapsed=0.157037 finalLat=-20.45012 finalLon=57.31498 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.20262 startLon=57.48277 ] -LOG TID(1) INFO 161.249 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:57:29 Routing_CalculatingRoute [ distance=35637 elapsed=2.36038 finalLat=34.53617 finalLon=133.06073 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.53436 startLon=133.34959 ] -LOG TID(1) INFO 161.36 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:57:36 Routing_CalculatingRoute [ distance=35637 elapsed=1.95357 finalLat=34.53617 finalLon=133.06073 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.53436 startLon=133.34959 ] -LOG TID(1) INFO 161.486 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:11:32 Routing_CalculatingRoute [ distance=37379.6 elapsed=0.502075 finalLat=13.44854 finalLon=-89.05869 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.68691 startLon=-89.19063 ] -LOG TID(1) INFO 161.583 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:11:51 Routing_CalculatingRoute [ distance=188462 elapsed=0.731408 finalLat=14.09319 finalLon=-87.20126 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=14.94682 startLon=-88.03816 ] -LOG TID(1) INFO 161.84 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:17:37 Routing_CalculatingRoute [ distance=36443.7 elapsed=0.15863 finalLat=13.44909 finalLon=-89.05697 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.67351 startLon=-89.19365 ] -LOG TID(1) INFO 161.927 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:38:12 Routing_CalculatingRoute [ distance=11983.4 elapsed=3.00482 finalLat=38.27276 finalLon=140.76162 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.26387 startLon=140.88739 ] -LOG TID(1) INFO 162.085 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 14:16:10 Routing_CalculatingRoute [ distance=21265.6 elapsed=1.12831 finalLat=13.72531 finalLon=-88.92358 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.6444 startLon=-88.87297 ] -LOG TID(1) INFO 162.167 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 14:16:13 Routing_CalculatingRoute [ distance=21265.7 elapsed=0.125052 finalLat=13.72531 finalLon=-88.92358 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.6444 startLon=-88.87297 ] -LOG TID(1) INFO 162.215 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:24:15 Routing_CalculatingRoute [ distance=12923.1 elapsed=0.259693 finalLat=41.30839 finalLon=-73.0347 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.37023 startLon=-72.91421 ] -LOG TID(1) INFO 162.339 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:15:54 Routing_CalculatingRoute [ distance=17361.9 elapsed=2.28146 finalLat=38.90983 finalLon=-79.65117 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.92098 startLon=-79.52168 ] -LOG TID(1) INFO 162.449 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:20:04 Routing_CalculatingRoute [ distance=41923.9 elapsed=0.325768 finalLat=37.62506 finalLon=-87.89908 name=vehicle result=NoError startDirectionX=-0.00001 startDirectionY=-0 startLat=37.84685 startLon=-87.5844 ] -LOG TID(1) INFO 162.579 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 03:49:58 Routing_CalculatingRoute [ distance=501864 elapsed=0.582274 finalLat=-18.97467 finalLon=32.67049 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.57128 startLon=29.58363 ] -LOG TID(1) INFO 162.629 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 04:53:55 Routing_CalculatingRoute [ distance=449028 elapsed=0.349514 finalLat=-18.97467 finalLon=32.67049 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.95501 startLon=29.80798 ] -LOG TID(1) INFO 162.66 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 04:59:10 Routing_CalculatingRoute [ distance=169546 elapsed=0.292348 finalLat=-17.83178 finalLon=31.04567 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.06759 startLon=29.8851 ] -LOG TID(1) INFO 162.691 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 09:07:09 Routing_CalculatingRoute [ distance=238291 elapsed=0.262598 finalLat=-18.97467 finalLon=32.67049 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.89458 startLon=31.25992 ] -LOG TID(1) INFO 162.757 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:24:41 Routing_CalculatingRoute [ distance=18075.4 elapsed=0.515396 finalLat=33.79383 finalLon=-84.38743 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.87035 startLon=-84.25956 ] -LOG TID(1) INFO 162.885 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:24:47 Routing_CalculatingRoute [ distance=18393.8 elapsed=0.270174 finalLat=33.79383 finalLon=-84.38743 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.87035 startLon=-84.25956 ] -LOG TID(1) INFO 163.171 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:39:39 Routing_CalculatingRoute [ distance=131165 elapsed=1.37638 finalLat=44.55103 finalLon=-69.63163 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.60016 startLon=-70.33677 ] -LOG TID(1) INFO 163.29 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:12:13 Routing_CalculatingRoute [ distance=45217.6 elapsed=2.76902 finalLat=54.04851 finalLon=13.40268 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.67867 startLon=13.33372 ] -LOG TID(1) INFO 163.331 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:14:02 Routing_CalculatingRoute [ distance=46642.7 elapsed=0.913351 finalLat=54.07791 finalLon=13.42793 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.7099 startLon=13.32959 ] -LOG TID(1) INFO 163.431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 14-Oct-2015 16:40:54 Routing_CalculatingRoute [ distance=44344.9 elapsed=0.309976 finalLat=49.28173 finalLon=1.55719 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.53987 startLon=1.24954 ] -LOG TID(1) INFO 163.604 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Oct-2015 13:22:29 Routing_CalculatingRoute [ distance=50025.8 elapsed=0.3574 finalLat=49.28173 finalLon=1.55719 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.36652 startLon=1.10503 ] -LOG TID(1) INFO 163.711 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:08:16 Routing_CalculatingRoute [ distance=410170 elapsed=2.56702 finalLat=26.64813 finalLon=87.75762 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.69097 startLon=85.34607 ] -LOG TID(1) INFO 164.047 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 03:48:13 Routing_CalculatingRoute [ distance=177793 elapsed=2.52204 finalLat=27.16605 finalLon=86.41636 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.69695 startLon=85.30531 ] -LOG TID(1) INFO 164.159 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:53:43 Routing_CalculatingRoute [ distance=83597.2 elapsed=0.356875 finalLat=46.58725 finalLon=-61.02138 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.05834 startLon=-61.2532 ] -LOG TID(1) INFO 164.191 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:39:37 Routing_CalculatingRoute [ distance=29006.6 elapsed=1.42604 finalLat=27.7371 finalLon=85.5813 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.62112 startLon=85.5532 ] -LOG TID(1) INFO 164.237 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:48:27 Routing_CalculatingRoute [ distance=22883.4 elapsed=0.484906 finalLat=27.6274 finalLon=85.6755 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.62112 startLon=85.5532 ] -LOG TID(1) INFO 164.438 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:59:26 Routing_CalculatingRoute [ distance=54290.9 elapsed=8.12928 finalLat=47.90273 finalLon=1.9086 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.89195 startLon=2.51748 ] -LOG TID(1) INFO 164.54 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:00:13 Routing_CalculatingRoute [ distance=35594 elapsed=0.363476 finalLat=12.80068 finalLon=45.02476 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.75281 startLon=44.82812 ] -LOG TID(1) INFO 164.624 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 23:36:23 Routing_CalculatingRoute [ distance=13228.3 elapsed=0.378301 finalLat=50.49707 finalLon=-104.60786 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.40353 startLon=-104.65046 ] -LOG TID(1) INFO 164.695 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 05:54:18 Routing_CalculatingRoute [ distance=19198.5 elapsed=2.69215 finalLat=26.23569 finalLon=127.75686 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.36135 startLon=127.8004 ] -LOG TID(1) INFO 165.093 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 07:45:34 Routing_CalculatingRoute [ distance=23829.4 elapsed=2.49698 finalLat=26.45963 finalLon=127.90539 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.36117 startLon=127.8004 ] -LOG TID(1) INFO 165.321 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 08:18:27 Routing_CalculatingRoute [ distance=23165.4 elapsed=1.50027 finalLat=26.45963 finalLon=127.90539 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.34672 startLon=127.80076 ] -LOG TID(1) INFO 165.513 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 08:24:50 Routing_CalculatingRoute [ distance=19790.3 elapsed=1.15146 finalLat=26.45963 finalLon=127.90539 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.37246 startLon=127.81675 ] -LOG TID(1) INFO 165.711 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:41:36 Routing_CalculatingRoute [ distance=17194.5 elapsed=1.95078 finalLat=26.46416 finalLon=127.83111 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.36133 startLon=127.80034 ] -LOG TID(1) INFO 165.924 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:31:44 Routing_CalculatingRoute [ distance=19563.6 elapsed=0.608478 finalLat=26.23203 finalLon=50.53668 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.28636 startLon=50.66327 ] -LOG TID(1) INFO 166.027 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:03:09 Routing_CalculatingRoute [ distance=116892 elapsed=2.37928 finalLat=46.30585 finalLon=4.14711 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.98577 startLon=4.76331 ] -LOG TID(1) INFO 166.39 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:16:25 Routing_CalculatingRoute [ distance=210892 elapsed=0.514555 finalLat=37.70807 finalLon=-97.25588 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.99859 startLon=-95.70221 ] -LOG TID(1) INFO 166.459 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:16:39 Routing_CalculatingRoute [ distance=210892 elapsed=0.261734 finalLat=37.70807 finalLon=-97.25588 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.99859 startLon=-95.70224 ] -LOG TID(1) INFO 166.628 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:15:11 Routing_CalculatingRoute [ distance=23736.9 elapsed=1.49659 finalLat=35.46543 finalLon=-97.47431 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.63701 startLon=-97.48815 ] -LOG TID(1) INFO 166.716 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:16:16 Routing_CalculatingRoute [ distance=12888.3 elapsed=0.185353 finalLat=13.20434 finalLon=-61.26869 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.15346 startLon=-61.22377 ] -LOG TID(1) INFO 166.757 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:16:21 Routing_CalculatingRoute [ distance=35875.1 elapsed=0.20437 finalLat=13.28964 finalLon=-61.24139 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.15346 startLon=-61.22377 ] -LOG TID(1) INFO 166.772 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:30:37 Routing_CalculatingRoute [ distance=357158 elapsed=0.146609 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.15792 startLon=-14.41392 ] -LOG TID(1) INFO 166.801 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 18:30:37 Routing_CalculatingRoute [ distance=357158 elapsed=0.146609 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.15792 startLon=-14.41392 ] -LOG TID(1) INFO 166.821 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 03:22:12 Routing_CalculatingRoute [ distance=171678 elapsed=0.0446604 finalLat=38.65053 finalLon=56.90908 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.91372 startLon=58.38152 ] -LOG TID(1) INFO 166.91 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:03:58 Routing_CalculatingRoute [ distance=264479 elapsed=0.738619 finalLat=39.53922 finalLon=-107.33337 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.01617 startLon=-105.26048 ] -LOG TID(1) INFO 167.389 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:08:32 Routing_CalculatingRoute [ distance=109062 elapsed=1.02349 finalLat=35.08412 finalLon=-106.65097 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.07014 startLon=-107.74299 ] -LOG TID(1) INFO 167.598 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:10:37 Routing_CalculatingRoute [ distance=102984 elapsed=0.89476 finalLat=35.02615 finalLon=-106.7108 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.06274 startLon=-107.70518 ] -LOG TID(1) INFO 167.668 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:11:29 Routing_CalculatingRoute [ distance=98383.2 elapsed=0.687322 finalLat=35.11014 finalLon=-106.70095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.06494 startLon=-107.6883 ] -LOG TID(1) INFO 167.738 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:14:45 Routing_CalculatingRoute [ distance=94589.2 elapsed=0.869269 finalLat=35.02615 finalLon=-106.7108 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.07554 startLon=-107.61675 ] -LOG TID(1) INFO 167.797 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:15:31 Routing_CalculatingRoute [ distance=89860.7 elapsed=0.833076 finalLat=35.11014 finalLon=-106.70095 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=35.07503 startLon=-107.5974 ] -LOG TID(1) INFO 167.973 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:58:40 Routing_CalculatingRoute [ distance=108304 elapsed=4.61377 finalLat=39.92256 finalLon=141.09505 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.51011 startLon=141.43384 ] -LOG TID(1) INFO 168.308 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 19:50:45 Routing_CalculatingRoute [ distance=217608 elapsed=1.88459 finalLat=38.27311 finalLon=-98.5822 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.48404 startLon=-100.90035 ] -LOG TID(1) INFO 168.463 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 07:16:29 Routing_CalculatingRoute [ distance=224541 elapsed=1.61302 finalLat=4.26245 finalLon=9.6911 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.08758 startLon=9.74244 ] -LOG TID(1) INFO 168.613 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 07:17:44 Routing_CalculatingRoute [ distance=91883.3 elapsed=1.49712 finalLat=4.46045 finalLon=9.97094 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.08758 startLon=9.74244 ] -LOG TID(1) INFO 169.013 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:23:55 Routing_CalculatingRoute [ distance=83599.2 elapsed=0.257229 finalLat=15.50793 finalLon=-88.02801 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.24915 startLon=-88.55557 ] -LOG TID(1) INFO 169.118 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:58:27 Routing_CalculatingRoute [ distance=27578.5 elapsed=0.545973 finalLat=48.29717 finalLon=4.07462 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.4873 startLon=3.87918 ] -LOG TID(1) INFO 169.205 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 20:42:54 Routing_CalculatingRoute [ distance=24845.2 elapsed=2.80286 finalLat=40.45446 finalLon=-79.982 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.57006 startLon=-79.80448 ] -LOG TID(1) INFO 169.529 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:35:48 Routing_CalculatingRoute [ distance=25262.9 elapsed=1.87652 finalLat=40.57047 finalLon=-79.80426 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.45391 startLon=-79.98174 ] -LOG TID(1) INFO 169.711 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:39:06 Routing_CalculatingRoute [ distance=11826.5 elapsed=0.172516 finalLat=26.18148 finalLon=50.47947 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.23502 startLon=50.55178 ] -LOG TID(1) INFO 169.767 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 12:01:50 Routing_CalculatingRoute [ distance=11311.4 elapsed=0.056732 finalLat=26.16885 finalLon=50.40524 name=vehicle result=NoError startDirectionX=0.00077 startDirectionY=0 startLat=26.18101 startLon=50.48096 ] -LOG TID(1) INFO 169.887 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 23:13:02 Routing_CalculatingRoute [ distance=22685.5 elapsed=0.317006 finalLat=38.06988 finalLon=-84.7149 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.21592 startLon=-84.84112 ] -LOG TID(1) INFO 170.081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:54:48 Routing_CalculatingRoute [ distance=157353 elapsed=0.617127 finalLat=6.49928 finalLon=-58.25437 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=6.28296 startLon=-57.39491 ] -LOG TID(1) INFO 170.18 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:09:44 Routing_CalculatingRoute [ distance=160397 elapsed=0.396765 finalLat=46.88429 finalLon=-60.50506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.05836 startLon=-61.25319 ] -LOG TID(1) INFO 170.205 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:10:07 Routing_CalculatingRoute [ distance=188701 elapsed=0.352663 finalLat=47.02585 finalLon=-60.55864 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.05838 startLon=-61.25316 ] -LOG TID(1) INFO 170.234 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:10:38 Routing_CalculatingRoute [ distance=208336 elapsed=0.349489 finalLat=47.02585 finalLon=-60.55864 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=46.05838 startLon=-61.25316 ] -LOG TID(1) INFO 170.281 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:09:27 Routing_CalculatingRoute [ distance=12569.8 elapsed=1.25644 finalLat=34.25162 finalLon=133.9308 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.25659 startLon=134.04032 ] -LOG TID(1) INFO 170.403 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:13:19 Routing_CalculatingRoute [ distance=13165.2 elapsed=0.801161 finalLat=34.25162 finalLon=133.9308 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00199 startLat=34.25441 startLon=134.0412 ] -LOG TID(1) INFO 170.469 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:15:11 Routing_CalculatingRoute [ distance=11741.7 elapsed=0.836748 finalLat=34.25162 finalLon=133.9308 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00012 startLat=34.25036 startLon=134.03623 ] -LOG TID(1) INFO 170.541 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:36:10 Routing_CalculatingRoute [ distance=13363.4 elapsed=0.838718 finalLat=34.25555 finalLon=134.04192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.25265 startLon=133.93084 ] -LOG TID(1) INFO 170.776 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:06:36 Routing_CalculatingRoute [ distance=24928.6 elapsed=0.507815 finalLat=39.4667 finalLon=-87.41391 name=vehicle result=NoError startDirectionX=0.00015 startDirectionY=0 startLat=39.65873 startLon=-87.40892 ] -LOG TID(1) INFO 170.923 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:07:15 Routing_CalculatingRoute [ distance=25127.3 elapsed=0.60659 finalLat=39.4667 finalLon=-87.41391 name=vehicle result=NoError startDirectionX=0.0007 startDirectionY=0 startLat=39.65708 startLon=-87.40754 ] -LOG TID(1) INFO 171.003 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:07:24 Routing_CalculatingRoute [ distance=25134.9 elapsed=0.620117 finalLat=39.4667 finalLon=-87.41391 name=vehicle result=NoError startDirectionX=0.00075 startDirectionY=0 startLat=39.65709 startLon=-87.40597 ] -LOG TID(1) INFO 171.102 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:33:26 Routing_CalculatingRoute [ distance=58852.7 elapsed=0.363059 finalLat=-8.90329 finalLon=13.22154 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.86473 startLon=13.46944 ] -LOG TID(1) INFO 171.317 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:07:23 Routing_CalculatingRoute [ distance=10280.4 elapsed=1.53054 finalLat=40.58828 finalLon=-79.72982 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.56755 startLon=-79.80276 ] -LOG TID(1) INFO 171.507 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:49:54 Routing_CalculatingRoute [ distance=44365.1 elapsed=0.200577 finalLat=13.22739 finalLon=-87.3589 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.37123 startLon=-87.03748 ] -LOG TID(1) INFO 171.592 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:13:35 Routing_CalculatingRoute [ distance=19705.4 elapsed=0.103416 finalLat=13.22739 finalLon=-87.3589 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.29304 startLon=-87.21755 ] -LOG TID(1) INFO 171.641 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:40:37 Routing_CalculatingRoute [ distance=517470 elapsed=0.566297 finalLat=37.49041 finalLon=71.54935 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.56522 startLon=68.81267 ] -LOG TID(1) INFO 171.717 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:14:35 Routing_CalculatingRoute [ distance=517503 elapsed=0.525072 finalLat=37.4904 finalLon=71.54935 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.56495 startLon=68.81213 ] -LOG TID(1) INFO 171.807 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:13:17 Routing_CalculatingRoute [ distance=13323.4 elapsed=3.94431 finalLat=49.46413 finalLon=1.1123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.39533 startLon=1.18424 ] -LOG TID(1) INFO 171.943 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:14:33 Routing_CalculatingRoute [ distance=13317.8 elapsed=3.69854 finalLat=49.46413 finalLon=1.1123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.39544 startLon=1.18425 ] -LOG TID(1) INFO 171.992 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:21:27 Routing_CalculatingRoute [ distance=11334.4 elapsed=4.74586 finalLat=49.46413 finalLon=1.1123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.40591 startLon=1.16745 ] -LOG TID(1) INFO 172.081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 07:48:10 Routing_CalculatingRoute [ distance=67949 elapsed=0.198292 finalLat=-20.01305 finalLon=57.58452 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.43374 startLon=57.6348 ] -LOG TID(1) INFO 172.132 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:12:17 Routing_CalculatingRoute [ distance=23231.8 elapsed=0.278558 finalLat=-22.14534 finalLon=166.37691 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.27108 startLon=166.45485 ] -LOG TID(1) INFO 172.194 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:45:49 Routing_CalculatingRoute [ distance=27686.6 elapsed=0.269655 finalLat=-22.27042 finalLon=166.45375 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.13678 startLon=166.38388 ] -LOG TID(1) INFO 172.252 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:20:21 Routing_CalculatingRoute [ distance=62230.4 elapsed=1.46114 finalLat=41.57393 finalLon=-72.89271 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.51602 startLon=-73.4034 ] -LOG TID(1) INFO 172.38 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:20:28 Routing_CalculatingRoute [ distance=62230.4 elapsed=0.364237 finalLat=41.57393 finalLon=-72.89271 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.51602 startLon=-73.4034 ] -LOG TID(1) INFO 172.413 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:20:33 Routing_CalculatingRoute [ distance=62230.4 elapsed=0.319087 finalLat=41.57393 finalLon=-72.89271 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.51602 startLon=-73.4034 ] -LOG TID(1) INFO 172.491 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:41:52 Routing_CalculatingRoute [ distance=10640.7 elapsed=0.228024 finalLat=26.26014 finalLon=50.61513 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.2267 startLon=50.64931 ] -LOG TID(1) INFO 172.55 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:18:12 Routing_CalculatingRoute [ distance=176410 elapsed=0.232617 finalLat=-19.82871 finalLon=34.84178 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-19.09181 startLon=33.64972 ] -LOG TID(1) INFO 172.631 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:24:33 Routing_CalculatingRoute [ distance=67798.5 elapsed=0.518937 finalLat=5.15595 finalLon=-52.64306 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.91806 startLon=-52.26812 ] -LOG TID(1) INFO 172.721 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:26:21 Routing_CalculatingRoute [ distance=93821 elapsed=0.807392 finalLat=42.1329 finalLon=-93.94152 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.58967 startLon=-93.63363 ] -LOG TID(1) INFO 172.794 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:47:37 Routing_CalculatingRoute [ distance=17509.1 elapsed=0.343709 finalLat=-22.13673 finalLon=166.382 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.21665 startLon=166.48238 ] -LOG TID(1) INFO 172.84 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:27:33 Routing_CalculatingRoute [ distance=114427 elapsed=0.149682 finalLat=-21.58253 finalLon=165.49858 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.00766 startLon=166.21315 ] -LOG TID(1) INFO 172.855 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:27:24 Routing_CalculatingRoute [ distance=18509.6 elapsed=1.0433 finalLat=39.61176 finalLon=140.21386 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.6752 startLon=140.06602 ] -LOG TID(1) INFO 173.03 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:16:18 Routing_CalculatingRoute [ distance=17425.4 elapsed=0.097269 finalLat=19.2818 finalLon=-81.34583 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.29687 startLon=-81.21453 ] -LOG TID(1) INFO 173.26 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 23:48:12 Routing_CalculatingRoute [ distance=39701.6 elapsed=1.08116 finalLat=52.13158 finalLon=11.63995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.20714 startLon=11.13419 ] -LOG TID(1) INFO 173.31 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:28:14 Routing_CalculatingRoute [ distance=315728 elapsed=0.101182 finalLat=38.17426 finalLon=73.96905 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.49018 startLon=71.53047 ] -LOG TID(1) INFO 173.431 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 04:30:34 Routing_CalculatingRoute [ distance=209735 elapsed=0.474651 finalLat=23.73482 finalLon=90.41046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.59965 startLon=90.0315 ] -LOG TID(1) INFO 173.523 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 05:47:49 Routing_CalculatingRoute [ distance=45218 elapsed=0.192247 finalLat=22.82098 finalLon=89.55119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.60605 startLon=89.84932 ] -LOG TID(1) INFO 173.55 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 06:45:53 Routing_CalculatingRoute [ distance=18013.6 elapsed=0.176072 finalLat=22.82098 finalLon=89.55119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.73988 startLon=89.6378 ] -LOG TID(1) INFO 173.563 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 07:02:30 Routing_CalculatingRoute [ distance=17351.9 elapsed=0.170283 finalLat=22.82098 finalLon=89.55119 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.74087 startLon=89.6349 ] -LOG TID(1) INFO 173.612 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:04 Routing_CalculatingRoute [ distance=94868.9 elapsed=0.369721 finalLat=-16.43689 finalLon=47.15692 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.94726 startLon=46.82885 ] -LOG TID(1) INFO 173.669 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:30 Routing_CalculatingRoute [ distance=176166 elapsed=0.100861 finalLat=-16.09312 finalLon=47.64273 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.9473 startLon=46.82883 ] -LOG TID(1) INFO 173.69 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:45 Routing_CalculatingRoute [ distance=253291 elapsed=0.161591 finalLat=-15.56831 finalLon=47.6208 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.94735 startLon=46.82885 ] -LOG TID(1) INFO 173.712 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:15 Routing_CalculatingRoute [ distance=376950 elapsed=0.156739 finalLat=-14.87753 finalLon=47.98715 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.94734 startLon=46.82885 ] -LOG TID(1) INFO 173.738 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:34 Routing_CalculatingRoute [ distance=563107 elapsed=0.19809 finalLat=-13.67581 finalLon=48.45278 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.94734 startLon=46.82885 ] -LOG TID(1) INFO 173.762 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:28:50 Routing_CalculatingRoute [ distance=664352 elapsed=0.163788 finalLat=-13.19444 finalLon=49.04995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-16.94734 startLon=46.82885 ] -LOG TID(1) INFO 173.796 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 23:48:12 Routing_CalculatingRoute [ distance=39701.6 elapsed=1.08116 finalLat=52.13158 finalLon=11.63995 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.20714 startLon=11.13419 ] -LOG TID(1) INFO 173.865 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 04:30:34 Routing_CalculatingRoute [ distance=209735 elapsed=0.474651 finalLat=23.73482 finalLon=90.41046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=22.59965 startLon=90.0315 ] -LOG TID(1) INFO 174.097 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:43:24 Routing_CalculatingRoute [ distance=34690.2 elapsed=0.313352 finalLat=6.17895 finalLon=-57.23959 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.8974 startLon=-57.13711 ] -LOG TID(1) INFO 174.119 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:45:16 Routing_CalculatingRoute [ distance=34699 elapsed=0.0484382 finalLat=6.17895 finalLon=-57.23959 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.89771 startLon=-57.13717 ] -LOG TID(1) INFO 174.177 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:47:06 Routing_CalculatingRoute [ distance=71615 elapsed=0.0489075 finalLat=6.25782 finalLon=-57.51166 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.89761 startLon=-57.13709 ] -LOG TID(1) INFO 174.217 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:34:51 Routing_CalculatingRoute [ distance=249583 elapsed=0.68923 finalLat=52.44284 finalLon=-109.15491 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.21883 startLon=-106.39222 ] -LOG TID(1) INFO 174.46 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 01:01:40 Routing_CalculatingRoute [ distance=46798.2 elapsed=0.267639 finalLat=-17.54531 finalLon=-149.56949 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.76387 startLon=-149.39895 ] -LOG TID(1) INFO 174.501 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 01:06:39 Routing_CalculatingRoute [ distance=42409.2 elapsed=0.294922 finalLat=-17.54036 finalLon=-149.56649 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.77206 startLon=-149.43878 ] -LOG TID(1) INFO 174.513 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 01:10:06 Routing_CalculatingRoute [ distance=29202.4 elapsed=0.174713 finalLat=-17.59742 finalLon=-149.61172 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.77369 startLon=-149.47229 ] -LOG TID(1) INFO 174.523 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 01:19:11 Routing_CalculatingRoute [ distance=21220.1 elapsed=0.146881 finalLat=-17.59742 finalLon=-149.61172 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.75241 startLon=-149.54198 ] -LOG TID(1) INFO 174.574 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 02:15:44 Routing_CalculatingRoute [ distance=13325.8 elapsed=0.0691983 finalLat=15.27747 finalLon=145.80967 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.21516 startLon=145.71988 ] -LOG TID(1) INFO 174.612 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 12:03:18 Routing_CalculatingRoute [ distance=32190.7 elapsed=0.356539 finalLat=-9.33846 finalLon=34.05063 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-9.18671 startLon=33.90897 ] -LOG TID(1) INFO 174.812 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 06:09:22 Routing_CalculatingRoute [ distance=175416 elapsed=0.121285 finalLat=-22.25786 finalLon=166.47014 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0.00191 startLat=-21.6128 startLon=165.39583 ] -LOG TID(1) INFO 174.858 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 06:18:34 Routing_CalculatingRoute [ distance=175766 elapsed=0.11747 finalLat=-22.25786 finalLon=166.47014 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.61208 startLon=165.39253 ] -LOG TID(1) INFO 174.933 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 20:43:16 Routing_CalculatingRoute [ distance=100967 elapsed=1.13602 finalLat=38.22195 finalLon=-85.55317 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.0301 startLon=-84.54558 ] -LOG TID(1) INFO 175.128 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:08:45 Routing_CalculatingRoute [ distance=19313 elapsed=0.052726 finalLat=-4.66409 finalLon=55.41777 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.75853 startLon=55.47335 ] -LOG TID(1) INFO 175.155 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:09:47 Routing_CalculatingRoute [ distance=26269.3 elapsed=0.116453 finalLat=-4.61995 finalLon=55.4586 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.75848 startLon=55.4733 ] -LOG TID(1) INFO 175.169 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 01:12:06 Routing_CalculatingRoute [ distance=26273.3 elapsed=0.0512977 finalLat=-4.61995 finalLon=55.4586 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.7585 startLon=55.47341 ] -LOG TID(1) INFO 175.179 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 05:57:35 Routing_CalculatingRoute [ distance=10757.5 elapsed=0.141687 finalLat=-4.66409 finalLon=55.41777 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.64101 startLon=55.45073 ] -LOG TID(1) INFO 175.269 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:44:10 Routing_CalculatingRoute [ distance=10153.7 elapsed=1.06549 finalLat=-6.8193 finalLon=39.28587 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.77462 startLon=39.23376 ] -LOG TID(1) INFO 175.427 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:45:21 Routing_CalculatingRoute [ distance=10151.5 elapsed=0.138169 finalLat=-6.8193 finalLon=39.28587 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.77464 startLon=39.23377 ] -LOG TID(1) INFO 175.578 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 03:19:57 Routing_CalculatingRoute [ distance=76241.4 elapsed=0.0677828 finalLat=62.22757 finalLon=-6.59182 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=62.00878 startLon=-6.79782 ] -LOG TID(1) INFO 175.979 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 23:50:48 Routing_CalculatingRoute [ distance=15032.2 elapsed=0.508524 finalLat=17.31351 finalLon=-62.73468 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.36485 startLon=-62.7612 ] -LOG TID(1) INFO 176.001 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 23:50:58 Routing_CalculatingRoute [ distance=15032.2 elapsed=0.415343 finalLat=17.31351 finalLon=-62.73468 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.36485 startLon=-62.7612 ] -LOG TID(1) INFO 176.185 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:27:55 Routing_CalculatingRoute [ distance=13435.6 elapsed=0.0824859 finalLat=15.16297 finalLon=145.76358 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.21011 startLon=145.7165 ] -LOG TID(1) INFO 176.218 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:54:11 Routing_CalculatingRoute [ distance=33209.4 elapsed=0.311063 finalLat=15.42004 finalLon=45.10459 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43911 startLon=45.34514 ] -LOG TID(1) INFO 176.23 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:56:45 Routing_CalculatingRoute [ distance=43834.7 elapsed=0.190905 finalLat=15.4495 finalLon=45.01772 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.43912 startLon=45.34507 ] -LOG TID(1) INFO 176.414 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:01:23 Routing_CalculatingRoute [ distance=15465.7 elapsed=0.132224 finalLat=15.15649 finalLon=145.78442 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.20626 startLon=145.7184 ] -LOG TID(1) INFO 176.46 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Sep-2015 16:31:58 Routing_CalculatingRoute [ distance=91213.3 elapsed=0.250368 finalLat=42.91345 finalLon=-70.80617 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.26191 startLon=-71.55266 ] -LOG TID(1) INFO 176.507 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 11:10:46 Routing_CalculatingRoute [ distance=222021 elapsed=0.20962 finalLat=-10.20884 finalLon=31.18826 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-11.90747 startLon=31.41442 ] -LOG TID(1) INFO 176.65 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:14:24 Routing_CalculatingRoute [ distance=46779.4 elapsed=1.58733 finalLat=-21.13605 finalLon=55.47253 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.34202 startLon=55.48462 ] -LOG TID(1) INFO 176.823 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:00:12 Routing_CalculatingRoute [ distance=39098 elapsed=0.787296 finalLat=38.83502 finalLon=-91.13956 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.76697 startLon=-90.73728 ] -LOG TID(1) INFO 176.946 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 17:35:54 Routing_CalculatingRoute [ distance=14809.4 elapsed=0.868505 finalLat=33.50101 finalLon=36.27426 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.4347 startLon=36.1645 ] -LOG TID(1) INFO 177.012 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Oct-2015 14:50:57 Routing_CalculatingRoute [ distance=15785.8 elapsed=0.823963 finalLat=33.50547 finalLon=36.28919 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.43468 startLon=36.16454 ] -LOG TID(1) INFO 177.074 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 03:49:49 Routing_CalculatingRoute [ distance=51413.6 elapsed=0.219927 finalLat=-21.2253 finalLon=55.55521 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.13608 startLon=55.46985 ] -LOG TID(1) INFO 177.256 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:03:28 Routing_CalculatingRoute [ distance=10739.9 elapsed=0.115399 finalLat=26.206 finalLon=50.6 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=26.22949 startLon=50.55109 ] -LOG TID(1) INFO 177.298 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:01:49 Routing_CalculatingRoute [ distance=16918.3 elapsed=0.213503 finalLat=15.26274 finalLon=145.78562 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.15703 startLon=145.70113 ] -LOG TID(1) INFO 177.611 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 23:42:41 Routing_CalculatingRoute [ distance=17246.1 elapsed=0.039715 finalLat=-5.04361 finalLon=154.58056 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-5.07908 startLon=154.67061 ] -LOG TID(1) INFO 177.63 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 16-Oct-2015 23:42:41 Routing_CalculatingRoute [ distance=17246.1 elapsed=0.039715 finalLat=-5.04361 finalLon=154.58056 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-5.07908 startLon=154.67061 ] -LOG TID(1) INFO 177.67 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:39:12 Routing_CalculatingRoute [ distance=594441 elapsed=0.797019 finalLat=-12.45318 finalLon=31.29141 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.41101 startLon=28.30463 ] -LOG TID(1) INFO 177.721 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:12:34 Routing_CalculatingRoute [ distance=13531.7 elapsed=0.0877011 finalLat=18.03444 finalLon=-63.06425 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.11324 startLon=-63.0387 ] -LOG TID(1) INFO 177.755 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:13:41 Routing_CalculatingRoute [ distance=13275 elapsed=0.133943 finalLat=18.03444 finalLon=-63.06425 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.11157 startLon=-63.03917 ] -LOG TID(1) INFO 177.768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 21:44:10 Routing_CalculatingRoute [ distance=11374.5 elapsed=0.112507 finalLat=18.04284 finalLon=-63.08492 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.09468 startLon=-63.03309 ] -LOG TID(1) INFO 177.794 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:59:21 Routing_CalculatingRoute [ distance=13909.7 elapsed=0.215402 finalLat=18.11255 finalLon=-63.03843 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.04328 startLon=-63.08514 ] -LOG TID(1) INFO 177.881 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 08:34:14 Routing_CalculatingRoute [ distance=29847.8 elapsed=0.757437 finalLat=9.56511 finalLon=36.6311 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.37694 startLon=36.52825 ] -LOG TID(1) INFO 177.929 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 05:45:14 Routing_CalculatingRoute [ distance=13226.6 elapsed=0.48977 finalLat=9.50737 finalLon=36.5603 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.55938 startLon=36.62935 ] -LOG TID(1) INFO 177.975 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 08:34:14 Routing_CalculatingRoute [ distance=29847.8 elapsed=0.757437 finalLat=9.56511 finalLon=36.6311 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.37694 startLon=36.52825 ] -LOG TID(1) INFO 177.994 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 05:45:14 Routing_CalculatingRoute [ distance=13226.6 elapsed=0.48977 finalLat=9.50737 finalLon=36.5603 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.55938 startLon=36.62935 ] -LOG TID(1) INFO 178.125 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 14:31:59 Routing_CalculatingRoute [ distance=154875 elapsed=0.101135 finalLat=37.38443 finalLon=60.50473 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.66371 startLon=61.64896 ] -LOG TID(1) INFO 178.17 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:57:28 Routing_CalculatingRoute [ distance=13354 elapsed=0.130219 finalLat=37.62557 finalLon=61.75925 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.68353 startLon=61.63838 ] -LOG TID(1) INFO 178.182 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:58:24 Routing_CalculatingRoute [ distance=13768.1 elapsed=0.043427 finalLat=37.62557 finalLon=61.75925 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0.00002 startLat=37.68352 startLon=61.63838 ] -LOG TID(1) INFO 178.19 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:59:30 Routing_CalculatingRoute [ distance=52591.3 elapsed=0.156799 finalLat=37.61759 finalLon=62.16549 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.6835 startLon=61.63837 ] -LOG TID(1) INFO 178.212 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:59:44 Routing_CalculatingRoute [ distance=53005.4 elapsed=0.108917 finalLat=37.61759 finalLon=62.16549 name=vehicle result=NoError startDirectionX=-0 startDirectionY=-0 startLat=37.68349 startLon=61.63837 ] -LOG TID(1) INFO 178.243 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:17:45 Routing_CalculatingRoute [ distance=27336 elapsed=1.42796 finalLat=42.02556 finalLon=-91.62499 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.91631 startLon=-91.42521 ] -LOG TID(1) INFO 178.293 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:21:16 Routing_CalculatingRoute [ distance=25807.9 elapsed=1.02902 finalLat=41.94672 finalLon=-91.71859 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=41.91696 startLon=-91.42531 ] -LOG TID(1) INFO 178.35 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:21:41 Routing_CalculatingRoute [ distance=26407.1 elapsed=0.662292 finalLat=41.94672 finalLon=-91.71859 name=vehicle result=NoError startDirectionX=0 startDirectionY=-0 startLat=41.91696 startLon=-91.42531 ] -LOG TID(1) INFO 178.476 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 17:38:37 Routing_CalculatingRoute [ distance=81873.7 elapsed=0.260034 finalLat=-15.39571 finalLon=34.65304 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.77166 startLon=34.98561 ] -LOG TID(1) INFO 178.542 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 17-Oct-2015 17:38:40 Routing_CalculatingRoute [ distance=81873.7 elapsed=0.138104 finalLat=-15.39571 finalLon=34.65304 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.77166 startLon=34.98562 ] -LOG TID(1) INFO 178.66 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 08:34:14 Routing_CalculatingRoute [ distance=29847.8 elapsed=0.757437 finalLat=9.56511 finalLon=36.6311 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.37694 startLon=36.52825 ] -LOG TID(1) INFO 178.836 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 06:21:48 Routing_CalculatingRoute [ distance=15345.4 elapsed=0.102854 finalLat=15.15665 finalLon=145.78449 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.21053 startLon=145.71885 ] -LOG TID(1) INFO 178.857 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:34:44 Routing_CalculatingRoute [ distance=11249.8 elapsed=0.134656 finalLat=15.17376 finalLon=145.78461 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.22698 startLon=145.74631 ] -LOG TID(1) INFO 178.927 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:27:52 Routing_CalculatingRoute [ distance=26339.2 elapsed=0.731523 finalLat=-20.92916 finalLon=55.29338 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.90487 startLon=55.47672 ] -LOG TID(1) INFO 179.189 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 19:59:00 Routing_CalculatingRoute [ distance=13605.3 elapsed=0.274755 finalLat=49.12034 finalLon=4.24297 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.20058 startLon=4.10645 ] -LOG TID(1) INFO 179.36 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 11:03:11 Routing_CalculatingRoute [ distance=87628.5 elapsed=0.0995773 finalLat=-20.90095 finalLon=55.46804 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.22991 startLon=55.64891 ] -LOG TID(1) INFO 179.678 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 04:54:00 Routing_CalculatingRoute [ distance=574002 elapsed=0.299047 finalLat=-13.63692 finalLon=32.6492 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.44319 startLon=28.34506 ] -LOG TID(1) INFO 179.805 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:33:49 Routing_CalculatingRoute [ distance=11335.2 elapsed=0.60949 finalLat=43.60796 finalLon=-116.28157 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.59823 startLon=-116.16618 ] -LOG TID(1) INFO 179.887 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 16:08:58 Routing_CalculatingRoute [ distance=74188.3 elapsed=0.105796 finalLat=-10.73212 finalLon=14.98082 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-10.15422 startLon=14.74195 ] -LOG TID(1) INFO 179.944 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:18:44 Routing_CalculatingRoute [ distance=14417.5 elapsed=0.355008 finalLat=-8.9339 finalLon=13.30802 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.92841 startLon=13.24057 ] -LOG TID(1) INFO 180.035 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:06:55 Routing_CalculatingRoute [ distance=10789.9 elapsed=0.159244 finalLat=38.5317 finalLon=68.75898 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.61346 startLon=68.77976 ] -LOG TID(1) INFO 180.352 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:06:51 Routing_CalculatingRoute [ distance=399722 elapsed=0.367346 finalLat=-22.95435 finalLon=14.50747 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.56977 startLon=17.04844 ] -LOG TID(1) INFO 180.419 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:08:14 Routing_CalculatingRoute [ distance=311974 elapsed=0.256768 finalLat=-22.41742 finalLon=14.97561 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.56962 startLon=17.04862 ] -LOG TID(1) INFO 180.494 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:13:22 Routing_CalculatingRoute [ distance=110076 elapsed=0.151182 finalLat=-13.79717 finalLon=32.8875 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.99379 startLon=33.77852 ] -LOG TID(1) INFO 180.808 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:11:14 Routing_CalculatingRoute [ distance=19632.8 elapsed=0.472439 finalLat=-21.02438 finalLon=55.54355 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-20.94285 startLon=55.64822 ] -LOG TID(1) INFO 180.935 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:22:05 Routing_CalculatingRoute [ distance=22402.8 elapsed=2.34125 finalLat=-25.95183 finalLon=32.46031 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.84163 startLon=32.56789 ] -LOG TID(1) INFO 180.972 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:23:25 Routing_CalculatingRoute [ distance=18161.2 elapsed=0.904503 finalLat=-25.97088 finalLon=32.57179 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.84163 startLon=32.56789 ] -LOG TID(1) INFO 181.008 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:23:45 Routing_CalculatingRoute [ distance=14320.6 elapsed=0.800803 finalLat=-25.9541 finalLon=32.58202 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.84163 startLon=32.56789 ] -LOG TID(1) INFO 181.418 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:37:52 Routing_CalculatingRoute [ distance=14320.6 elapsed=0.978617 finalLat=-25.9541 finalLon=32.58202 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.84163 startLon=32.56789 ] -LOG TID(1) INFO 181.45 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:31:30 Routing_CalculatingRoute [ distance=28259 elapsed=0.228659 finalLat=0.17237 finalLon=30.0857 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.36428 startLon=30.20423 ] -LOG TID(1) INFO 181.518 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 17:43:26 Routing_CalculatingRoute [ distance=30219.2 elapsed=3.07972 finalLat=38.84571 finalLon=-91.94166 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.94694 startLon=-92.10579 ] -LOG TID(1) INFO 181.59 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 18:17:10 Routing_CalculatingRoute [ distance=11647.8 elapsed=2.2398 finalLat=38.91565 finalLon=-92.00054 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.84346 startLon=-91.94082 ] -LOG TID(1) INFO 181.699 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 18:50:11 Routing_CalculatingRoute [ distance=35331 elapsed=0.147939 finalLat=-1.28194 finalLon=36.81683 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-1.3773 startLon=37.01553 ] -LOG TID(1) INFO 181.767 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 19:13:40 Routing_CalculatingRoute [ distance=17428.5 elapsed=0.132597 finalLat=-1.28194 finalLon=36.81683 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-1.33206 startLon=36.92644 ] -LOG TID(1) INFO 182.225 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 05:36:37 Routing_CalculatingRoute [ distance=189394 elapsed=0.0833694 finalLat=-22.60459 finalLon=17.0789 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.93484 startLon=15.85669 ] -LOG TID(1) INFO 182.251 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 08:22:09 Routing_CalculatingRoute [ distance=47007.8 elapsed=0.228839 finalLat=-22.48213 finalLon=17.46913 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-22.6001 startLon=17.08253 ] -LOG TID(1) INFO 182.463 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:51:10 Routing_CalculatingRoute [ distance=299144 elapsed=0.169455 finalLat=38.57627 finalLon=68.78637 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.28612 startLon=69.62824 ] -LOG TID(1) INFO 182.494 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:51:36 Routing_CalculatingRoute [ distance=299144 elapsed=0.075519 finalLat=38.57627 finalLon=68.78637 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=40.28612 startLon=69.62824 ] -LOG TID(1) INFO 182.719 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:56:41 Routing_CalculatingRoute [ distance=47219.4 elapsed=1.09669 finalLat=46.42799 finalLon=4.65298 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.52455 startLon=5.01895 ] -LOG TID(1) INFO 182.871 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:58:35 Routing_CalculatingRoute [ distance=47230.3 elapsed=0.391606 finalLat=46.42794 finalLon=4.6532 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.52455 startLon=5.01895 ] -LOG TID(1) INFO 183.322 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:07:55 Routing_CalculatingRoute [ distance=12945.9 elapsed=0.517488 finalLat=53.5939 finalLon=10.01818 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.5695 startLon=9.87554 ] -LOG TID(1) INFO 183.42 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 07:01:18 Routing_CalculatingRoute [ distance=490121 elapsed=0.268057 finalLat=-14.06024 finalLon=32.04272 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.4216 startLon=28.27942 ] -LOG TID(1) INFO 183.453 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 07:02:34 Routing_CalculatingRoute [ distance=409799 elapsed=0.244083 finalLat=-12.54749 finalLon=27.86004 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.4216 startLon=28.27942 ] -LOG TID(1) INFO 183.497 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 07:03:33 Routing_CalculatingRoute [ distance=359249 elapsed=0.224016 finalLat=-12.81042 finalLon=28.20684 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-15.42161 startLon=28.27942 ] -LOG TID(1) INFO 183.735 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:18:48 Routing_CalculatingRoute [ distance=60793.2 elapsed=0.092586 finalLat=-13.79717 finalLon=32.8875 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-14.02116 startLon=33.35695 ] -LOG TID(1) INFO 183.904 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 05:50:32 Routing_CalculatingRoute [ distance=23366 elapsed=0.433635 finalLat=53.44379 finalLon=10.00252 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.60604 startLon=9.96934 ] -LOG TID(1) INFO 184.022 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 05:17:11 Routing_CalculatingRoute [ distance=35730.4 elapsed=0.844414 finalLat=-25.73313 finalLon=32.6818 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-25.96406 startLon=32.59269 ] -LOG TID(1) INFO 184.283 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:22:46 Routing_CalculatingRoute [ distance=36382.2 elapsed=0.218322 finalLat=36.07526 finalLon=36.63645 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=36.20472 startLon=36.51545 ] -LOG TID(1) INFO 184.376 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:30:43 Routing_CalculatingRoute [ distance=72468.1 elapsed=0.440745 finalLat=-22.5505 finalLon=17.09164 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-21.97116 startLon=16.90976 ] -LOG TID(1) INFO 184.438 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:31:43 Routing_CalculatingRoute [ distance=168273 elapsed=1.51871 finalLat=49.12039 finalLon=1.64046 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.01723 startLon=1.499 ] -LOG TID(1) INFO 184.716 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:33:57 Routing_CalculatingRoute [ distance=421911 elapsed=0.937105 finalLat=44.66299 finalLon=-111.10031 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.4878 startLon=-111.32832 ] -LOG TID(1) INFO 184.971 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:06:01 Routing_CalculatingRoute [ distance=13311.4 elapsed=2.10025 finalLat=51.82119 finalLon=12.18985 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.85334 startLon=12.04495 ] -LOG TID(1) INFO 185.058 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 14:25:20 Routing_CalculatingRoute [ distance=151874 elapsed=0.530375 finalLat=47.33177 finalLon=0.70533 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.07826 startLon=2.3879 ] -LOG TID(1) INFO 185.238 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:34:32 Routing_CalculatingRoute [ distance=411098 elapsed=0.477927 finalLat=-17.97226 finalLon=178.61538 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-18.24778 startLon=178.06836 ] -LOG TID(1) INFO 185.273 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:37:36 Routing_CalculatingRoute [ distance=423765 elapsed=0.345442 finalLat=-18.14527 finalLon=178.43424 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-18.24778 startLon=178.06836 ] -LOG TID(1) INFO 185.299 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:38:57 Routing_CalculatingRoute [ distance=411098 elapsed=0.303307 finalLat=-17.97226 finalLon=178.61538 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-18.24778 startLon=178.06836 ] -LOG TID(1) INFO 185.514 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Oct-2015 16:34:03 Routing_CalculatingRoute [ distance=121816 elapsed=0.364998 finalLat=-27.10814 finalLon=31.08321 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-26.45567 startLon=31.02478 ] -LOG TID(1) INFO 185.533 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Oct-2015 15:42:48 Routing_CalculatingRoute [ distance=121911 elapsed=0.544792 finalLat=-27.10814 finalLon=31.08321 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-26.45559 startLon=31.02425 ] -LOG TID(1) INFO 185.712 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:07:46 Routing_CalculatingRoute [ distance=81087.8 elapsed=0.165482 finalLat=0.65619 finalLon=30.27794 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.54812 startLon=30.88568 ] -LOG TID(1) INFO 185.806 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:07:46 Routing_CalculatingRoute [ distance=81087.8 elapsed=0.165482 finalLat=0.65619 finalLon=30.27794 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.54812 startLon=30.88568 ] -LOG TID(1) INFO 186.054 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:50:40 Routing_CalculatingRoute [ distance=34415.1 elapsed=0.740282 finalLat=-17.9136 finalLon=19.76669 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.91126 startLon=20.02404 ] -LOG TID(1) INFO 186.118 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 04:31:09 Routing_CalculatingRoute [ distance=43647.2 elapsed=0.669413 finalLat=-8.8453 finalLon=13.22953 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-9.04846 startLon=13.40215 ] -LOG TID(1) INFO 186.351 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:57:43 Routing_CalculatingRoute [ distance=21424.4 elapsed=5.40256 finalLat=45.63616 finalLon=0.15428 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.65255 startLon=0.36988 ] -LOG TID(1) INFO 186.511 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:48:26 Routing_CalculatingRoute [ distance=12485.7 elapsed=0.688329 finalLat=15.56386 finalLon=32.52719 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=15.63651 startLon=32.47716 ] -LOG TID(1) INFO 186.791 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:34:50 Routing_CalculatingRoute [ distance=50926.2 elapsed=0.120463 finalLat=-13.79717 finalLon=32.8875 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.97492 startLon=33.29019 ] -LOG TID(1) INFO 186.975 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Oct-2015 14:40:56 Routing_CalculatingRoute [ distance=13803.9 elapsed=0.103068 finalLat=18.0453 finalLon=-63.01935 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=18.09354 startLon=-63.06596 ] -LOG TID(1) INFO 187.06 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 16:11:41 Routing_CalculatingRoute [ distance=50345.1 elapsed=0.331816 finalLat=43.84064 finalLon=-69.50977 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.11356 startLon=-69.25572 ] -LOG TID(1) INFO 187.083 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 16:11:41 Routing_CalculatingRoute [ distance=50345.1 elapsed=0.331816 finalLat=43.84064 finalLon=-69.50977 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.11356 startLon=-69.25572 ] -LOG TID(1) INFO 187.138 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:40:45 Routing_CalculatingRoute [ distance=10082.7 elapsed=0.835774 finalLat=47.26064 finalLon=5.07044 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.33578 startLon=5.03963 ] -LOG TID(1) INFO 187.238 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 16:15:41 Routing_CalculatingRoute [ distance=11414.9 elapsed=0.386927 finalLat=47.34073 finalLon=5.04426 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.26199 startLon=5.07778 ] -LOG TID(1) INFO 187.404 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Aug-2015 04:50:32 Routing_CalculatingRoute [ distance=89262.4 elapsed=1.98027 finalLat=-17.78835 finalLon=177.44192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.65499 startLon=177.79984 ] -LOG TID(1) INFO 187.424 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Aug-2015 05:22:31 Routing_CalculatingRoute [ distance=54034.2 elapsed=0.050913 finalLat=-17.78835 finalLon=177.44192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.72125 startLon=177.76876 ] -LOG TID(1) INFO 187.428 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 29-Aug-2015 05:22:53 Routing_CalculatingRoute [ distance=53939.3 elapsed=0.063074 finalLat=-17.78835 finalLon=177.44192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.72197 startLon=177.76831 ] -LOG TID(1) INFO 187.447 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:33:33 Routing_CalculatingRoute [ distance=23933.4 elapsed=0.996954 finalLat=45.83542 finalLon=1.26449 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.67705 startLon=1.18926 ] -LOG TID(1) INFO 187.516 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:34:46 Routing_CalculatingRoute [ distance=23521.5 elapsed=0.510102 finalLat=45.83653 finalLon=1.25606 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.70395 startLon=1.09354 ] -LOG TID(1) INFO 187.59 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 11:36:18 Routing_CalculatingRoute [ distance=23521.3 elapsed=0.351916 finalLat=45.83653 finalLon=1.25606 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.70396 startLon=1.09354 ] -LOG TID(1) INFO 187.671 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:11:52 Routing_CalculatingRoute [ distance=12242.7 elapsed=0.404151 finalLat=-17.79541 finalLon=31.02212 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.86774 startLon=31.0723 ] -LOG TID(1) INFO 188.18 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 13:21:36 Routing_CalculatingRoute [ distance=60019 elapsed=0.477594 finalLat=48.11189 finalLon=5.13943 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.46158 startLon=4.76659 ] -LOG TID(1) INFO 188.425 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:04:51 Routing_CalculatingRoute [ distance=18335.5 elapsed=0.143824 finalLat=-13.79717 finalLon=32.8875 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.82992 startLon=33.04517 ] -LOG TID(1) INFO 188.594 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:17:33 Routing_CalculatingRoute [ distance=12999.2 elapsed=0.67299 finalLat=-4.0314 finalLon=39.60051 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.08191 startLon=39.66296 ] -LOG TID(1) INFO 188.644 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:28:59 Routing_CalculatingRoute [ distance=110268 elapsed=1.07595 finalLat=49.33139 finalLon=-1.54008 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.55397 startLon=-1.50298 ] -LOG TID(1) INFO 188.701 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:29:21 Routing_CalculatingRoute [ distance=184666 elapsed=0.472317 finalLat=49.36 finalLon=0.07528 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=48.55397 startLon=-1.50298 ] -LOG TID(1) INFO 188.887 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:34:48 Routing_CalculatingRoute [ distance=35128 elapsed=0.960172 finalLat=47.77703 finalLon=1.63052 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.90997 startLon=1.93067 ] -LOG TID(1) INFO 188.995 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:35:25 Routing_CalculatingRoute [ distance=35128 elapsed=0.570368 finalLat=47.77703 finalLon=1.63052 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.90997 startLon=1.93067 ] -LOG TID(1) INFO 189.315 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Oct-2015 08:41:12 Routing_CalculatingRoute [ distance=10682 elapsed=0.166575 finalLat=-4.64055 finalLon=55.47613 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.67649 startLon=55.45207 ] -LOG TID(1) INFO 189.4 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 06:16:29 Routing_CalculatingRoute [ distance=16538.8 elapsed=0.585751 finalLat=12.1359 finalLon=15.03389 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.0731 startLon=15.09994 ] -LOG TID(1) INFO 189.516 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:42:42 Routing_CalculatingRoute [ distance=28580.6 elapsed=0.765546 finalLat=53.62264 finalLon=9.95249 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=53.51466 startLon=9.79618 ] -LOG TID(1) INFO 189.599 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 15:32:20 Routing_CalculatingRoute [ distance=33594.7 elapsed=0.680717 finalLat=52.41747 finalLon=12.15922 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.23655 startLon=12.08634 ] -LOG TID(1) INFO 189.672 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 13:21:42 Routing_CalculatingRoute [ distance=56438.8 elapsed=0.541767 finalLat=15.99613 finalLon=-61.73079 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.32615 startLon=-61.77953 ] -LOG TID(1) INFO 189.795 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Oct-2015 05:00:57 Routing_CalculatingRoute [ distance=21944.7 elapsed=0.310632 finalLat=12.1359 finalLon=15.03389 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.06917 startLon=15.05455 ] -LOG TID(1) INFO 189.973 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 08:33:09 Routing_CalculatingRoute [ distance=29404.5 elapsed=0.142946 finalLat=48.85058 finalLon=-0.55103 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.05107 startLon=-0.50108 ] -LOG TID(1) INFO 190.242 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:56:03 Routing_CalculatingRoute [ distance=10161.8 elapsed=0.344419 finalLat=46.23139 finalLon=-1.13667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=46.16614 startLon=-1.1617 ] -LOG TID(1) INFO 190.581 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:00:35 Routing_CalculatingRoute [ distance=18669.5 elapsed=3.92347 finalLat=50.1993 finalLon=2.75887 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.29974 startLon=2.8611 ] -LOG TID(1) INFO 191.16 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:22:35 Routing_CalculatingRoute [ distance=48706.3 elapsed=0.20052 finalLat=16.50977 finalLon=-61.46699 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0 startLat=16.26388 startLon=-61.27085 ] -LOG TID(1) INFO 191.417 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:12:31 Routing_CalculatingRoute [ distance=115426 elapsed=0.33544 finalLat=-9.64357 finalLon=13.25192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.81117 startLon=13.24779 ] -LOG TID(1) INFO 191.692 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:18:49 Routing_CalculatingRoute [ distance=42578.5 elapsed=0.681104 finalLat=47.02391 finalLon=4.83804 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.31938 startLon=5.03541 ] -LOG TID(1) INFO 191.808 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Aug-2015 15:12:10 Routing_CalculatingRoute [ distance=63504.9 elapsed=2.42059 finalLat=50.7555 finalLon=2.2482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.3199 startLon=2.15902 ] -LOG TID(1) INFO 192.09 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Aug-2015 15:12:10 Routing_CalculatingRoute [ distance=63504.9 elapsed=2.42059 finalLat=50.7555 finalLon=2.2482 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.3199 startLon=2.15902 ] -LOG TID(1) INFO 192.232 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 25-Sep-2015 07:11:14 Routing_CalculatingRoute [ distance=13214.6 elapsed=0.519981 finalLat=50.46135 finalLon=3.03333 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=50.53345 startLon=2.93712 ] -LOG TID(1) INFO 192.349 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 14:14:25 Routing_CalculatingRoute [ distance=10445.7 elapsed=0.208357 finalLat=2.0333 finalLon=45.31329 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=2.08132 startLon=45.36563 ] -LOG TID(1) INFO 192.508 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:22:19 Routing_CalculatingRoute [ distance=12778.5 elapsed=0.320855 finalLat=-17.822 finalLon=31.09254 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-17.79004 startLon=31.01911 ] -LOG TID(1) INFO 192.539 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 09:52:49 Routing_CalculatingRoute [ distance=11321.8 elapsed=0.163275 finalLat=-8.81759 finalLon=13.23263 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-8.86852 startLon=13.2818 ] -LOG TID(1) INFO 193.091 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:57:43 Routing_CalculatingRoute [ distance=21424.4 elapsed=5.40256 finalLat=45.63616 finalLon=0.15428 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.65255 startLon=0.36988 ] -LOG TID(1) INFO 193.157 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:57:43 Routing_CalculatingRoute [ distance=21424.4 elapsed=5.40256 finalLat=45.63616 finalLon=0.15428 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.65255 startLon=0.36988 ] -LOG TID(1) INFO 194.264 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:53:08 Routing_CalculatingRoute [ distance=160796 elapsed=0.480377 finalLat=-0.2833 finalLon=36.0666 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-1.28315 startLon=36.81561 ] -LOG TID(1) INFO 194.514 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 08:59:42 Routing_CalculatingRoute [ distance=35140.4 elapsed=0.587806 finalLat=0.04135 finalLon=32.46141 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.28769 startLon=32.56673 ] -LOG TID(1) INFO 194.563 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 13:46:43 Routing_CalculatingRoute [ distance=153941 elapsed=1.61634 finalLat=52.15899 finalLon=-4.46647 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.50354 startLon=-3.13854 ] -LOG TID(1) INFO 195.283 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:05:01 Routing_CalculatingRoute [ distance=25989.1 elapsed=0.310437 finalLat=48.94631 finalLon=4.02123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.06808 startLon=3.81131 ] -LOG TID(1) INFO 195.531 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:07:46 Routing_CalculatingRoute [ distance=38059.1 elapsed=0.406988 finalLat=52.91345 finalLon=-4.09937 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.75444 startLon=-3.94117 ] -LOG TID(1) INFO 195.688 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:16:43 Routing_CalculatingRoute [ distance=15477.1 elapsed=0.129073 finalLat=4.88955 finalLon=114.94176 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.9766 startLon=115.02106 ] -LOG TID(1) INFO 195.714 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:16:46 Routing_CalculatingRoute [ distance=15434.7 elapsed=0.053775 finalLat=4.88955 finalLon=114.94176 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.97628 startLon=115.02085 ] -LOG TID(1) INFO 196.133 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Sep-2015 15:39:57 Routing_CalculatingRoute [ distance=13915.9 elapsed=0.100464 finalLat=0.37904 finalLon=9.49855 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.44947 startLon=9.42552 ] -LOG TID(1) INFO 196.15 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Sep-2015 16:21:34 Routing_CalculatingRoute [ distance=14129.5 elapsed=0.084076 finalLat=0.4495 finalLon=9.42506 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.38108 startLon=9.49608 ] -LOG TID(1) INFO 196.16 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Sep-2015 16:34:22 Routing_CalculatingRoute [ distance=12153.1 elapsed=0.09906 finalLat=0.45327 finalLon=9.42156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.38737 startLon=9.4766 ] -LOG TID(1) INFO 196.17 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 19-Sep-2015 17:26:19 Routing_CalculatingRoute [ distance=14994 elapsed=0.075134 finalLat=0.45327 finalLon=9.42156 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.36477 startLon=9.47938 ] -LOG TID(1) INFO 196.211 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 17:04:32 Routing_CalculatingRoute [ distance=61990.4 elapsed=1.68216 finalLat=-2.62362 finalLon=28.67343 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-2.30622 startLon=28.8056 ] -LOG TID(1) INFO 196.896 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:31:32 Routing_CalculatingRoute [ distance=38672 elapsed=5.45499 finalLat=45.97776 finalLon=2.98947 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.77348 startLon=3.07923 ] -LOG TID(1) INFO 197.775 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 07:17:15 Routing_CalculatingRoute [ distance=37366.3 elapsed=0.29896 finalLat=45.15239 finalLon=1.52957 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.0422 startLon=1.82216 ] -LOG TID(1) INFO 197.933 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 07:40:43 Routing_CalculatingRoute [ distance=17318.6 elapsed=0.305273 finalLat=-6.75893 finalLon=39.27117 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.66507 startLon=39.18681 ] -LOG TID(1) INFO 198.078 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:45:37 Routing_CalculatingRoute [ distance=15615.4 elapsed=0.302882 finalLat=-6.73663 finalLon=39.22225 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.62933 startLon=39.15091 ] -LOG TID(1) INFO 198.105 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 18-Oct-2015 07:40:43 Routing_CalculatingRoute [ distance=17318.6 elapsed=0.305273 finalLat=-6.75893 finalLon=39.27117 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-6.66507 startLon=39.18681 ] -LOG TID(1) INFO 198.252 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:47:15 Routing_CalculatingRoute [ distance=276096 elapsed=7.00084 finalLat=38.95362 finalLon=-94.73355 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.82348 startLon=-97.62299 ] -LOG TID(1) INFO 198.718 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:18:20 Routing_CalculatingRoute [ distance=13781.1 elapsed=0.255402 finalLat=49.4409 finalLon=2.08667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.39088 startLon=2.11756 ] -LOG TID(1) INFO 199.135 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 09:44:05 Routing_CalculatingRoute [ distance=11754.7 elapsed=0.564432 finalLat=8.4963 finalLon=-13.28892 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.48941 startLon=-13.20486 ] -LOG TID(1) INFO 199.201 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 08:44:09 Routing_CalculatingRoute [ distance=33160.9 elapsed=0.228501 finalLat=8.38452 finalLon=-13.02769 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.36544 startLon=-13.08772 ] -LOG TID(1) INFO 199.231 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 08:57:55 Routing_CalculatingRoute [ distance=144783 elapsed=0.396778 finalLat=8.61672 finalLon=-13.19534 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.33515 startLon=-13.00837 ] -LOG TID(1) INFO 199.365 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 16:52:00 Routing_CalculatingRoute [ distance=571863 elapsed=0.414478 finalLat=18.54513 finalLon=31.84762 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=21.79589 startLon=31.38516 ] -LOG TID(1) INFO 199.407 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Nov-2015 08:01:35 Routing_CalculatingRoute [ distance=153626 elapsed=0.462122 finalLat=19.17289 finalLon=30.47315 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.20789 startLon=30.50663 ] -LOG TID(1) INFO 199.78 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 10:01:18 Routing_CalculatingRoute [ distance=343654 elapsed=0.660812 finalLat=-5.83175 finalLon=13.45918 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.33352 startLon=15.2498 ] -LOG TID(1) INFO 199.928 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:57:49 Routing_CalculatingRoute [ distance=16182.9 elapsed=0.100786 finalLat=-26.56249 finalLon=31.39912 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-26.59337 startLon=31.5057 ] -LOG TID(1) INFO 200.081 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 17:36:02 Routing_CalculatingRoute [ distance=107711 elapsed=0.393398 finalLat=43.66103 finalLon=-70.25486 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.83726 startLon=-69.50654 ] -LOG TID(1) INFO 200.434 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 15:29:57 Routing_CalculatingRoute [ distance=18756.1 elapsed=0.432251 finalLat=13.44648 finalLon=-16.57218 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=13.44249 startLon=-16.71249 ] -LOG TID(1) INFO 200.689 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 17:36:02 Routing_CalculatingRoute [ distance=107711 elapsed=0.393398 finalLat=43.66103 finalLon=-70.25486 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.83726 startLon=-69.50654 ] -LOG TID(1) INFO 201.816 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 08:44:09 Routing_CalculatingRoute [ distance=33160.9 elapsed=0.228501 finalLat=8.38452 finalLon=-13.02769 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.36544 startLon=-13.08772 ] -LOG TID(1) INFO 201.858 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 10-Oct-2015 08:57:55 Routing_CalculatingRoute [ distance=144783 elapsed=0.396778 finalLat=8.61672 finalLon=-13.19534 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.33515 startLon=-13.00837 ] -LOG TID(1) INFO 203.5 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 14:20:52 Routing_CalculatingRoute [ distance=174887 elapsed=0.20997 finalLat=11.61879 finalLon=-14.68815 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.85763 startLon=-15.58386 ] -LOG TID(1) INFO 203.534 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 15:18:09 Routing_CalculatingRoute [ distance=168160 elapsed=0.183265 finalLat=11.61879 finalLon=-14.68815 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.8759 startLon=-15.63566 ] -LOG TID(1) INFO 203.547 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 16:37:47 Routing_CalculatingRoute [ distance=166570 elapsed=0.24776 finalLat=11.61879 finalLon=-14.68815 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.88531 startLon=-15.64591 ] -LOG TID(1) INFO 203.557 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 16:44:15 Routing_CalculatingRoute [ distance=87359.9 elapsed=0.111513 finalLat=12.01498 finalLon=-14.95854 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=11.9208 startLon=-15.63974 ] -LOG TID(1) INFO 203.561 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 09:08:56 Routing_CalculatingRoute [ distance=88064.3 elapsed=0.062164 finalLat=11.53888 finalLon=-14.76783 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.04202 startLon=-14.91706 ] -LOG TID(1) INFO 203.567 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Nov-2015 09:10:13 Routing_CalculatingRoute [ distance=33447.4 elapsed=0.065964 finalLat=12.17234 finalLon=-14.6555 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.04898 startLon=-14.90692 ] -LOG TID(1) INFO 203.629 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 11:18:24 Routing_CalculatingRoute [ distance=41563.5 elapsed=0.596748 finalLat=51.855 finalLon=-4.30902 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=52.13015 startLon=-4.46827 ] -LOG TID(1) INFO 204.534 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 11:32:26 Routing_CalculatingRoute [ distance=35150.7 elapsed=2.89931 finalLat=49.1902 finalLon=2.41521 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.09424 startLon=2.74626 ] -LOG TID(1) INFO 205.293 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 09:00:13 Routing_CalculatingRoute [ distance=33501.3 elapsed=0.124143 finalLat=0.43333 finalLon=30.2 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.19757 startLon=30.10901 ] -LOG TID(1) INFO 205.313 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 09:02:03 Routing_CalculatingRoute [ distance=69726.6 elapsed=0.179946 finalLat=0.65619 finalLon=30.27794 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.20793 startLon=30.11248 ] -LOG TID(1) INFO 205.615 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 11:43:16 Routing_CalculatingRoute [ distance=27730.5 elapsed=0.094509 finalLat=5.02962 finalLon=115.05695 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.90076 startLon=114.90282 ] -LOG TID(1) INFO 205.867 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 21:02:09 Routing_CalculatingRoute [ distance=36921.6 elapsed=1.76661 finalLat=16.25318 finalLon=-61.27507 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.2749 startLon=-61.52016 ] -LOG TID(1) INFO 205.923 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 21:04:51 Routing_CalculatingRoute [ distance=34565.4 elapsed=0.601291 finalLat=16.25318 finalLon=-61.27507 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.27681 startLon=-61.50876 ] -LOG TID(1) INFO 206.619 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 22:06:04 Routing_CalculatingRoute [ distance=23515 elapsed=1.76737 finalLat=16.23022 finalLon=-61.37257 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.25185 startLon=-61.54124 ] -LOG TID(1) INFO 206.885 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 12:09:52 Routing_CalculatingRoute [ distance=36564.4 elapsed=1.15224 finalLat=45.99556 finalLon=2.99922 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.77365 startLon=3.07932 ] -LOG TID(1) INFO 207.141 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:10:19 Routing_CalculatingRoute [ distance=32085.1 elapsed=2.11768 finalLat=46.16868 finalLon=1.87135 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.94912 startLon=1.76511 ] -LOG TID(1) INFO 207.2 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 01:10:25 Routing_CalculatingRoute [ distance=32085.1 elapsed=0.326538 finalLat=46.16868 finalLon=1.87135 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.94912 startLon=1.76511 ] -LOG TID(1) INFO 207.659 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 06:49:02 Routing_CalculatingRoute [ distance=18636.2 elapsed=0.0313928 finalLat=-4.29311 finalLon=55.70028 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.32458 startLon=55.70365 ] -LOG TID(1) INFO 208.371 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:12:33 Routing_CalculatingRoute [ distance=14877.8 elapsed=0.167753 finalLat=47.55789 finalLon=-52.71876 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.44517 startLon=-52.76633 ] -LOG TID(1) INFO 208.616 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 24-Sep-2015 09:14:37 Routing_CalculatingRoute [ distance=114854 elapsed=0.274102 finalLat=4.31259 finalLon=-52.13241 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.92721 startLon=-52.32022 ] -LOG TID(1) INFO 209.179 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:38:21 Routing_CalculatingRoute [ distance=10063.6 elapsed=1.74257 finalLat=38.84164 finalLon=-77.01922 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.90429 startLon=-77.03184 ] -LOG TID(1) INFO 209.314 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 07:35:14 Routing_CalculatingRoute [ distance=23646 elapsed=0.025644 finalLat=27.52054 finalLon=90.46029 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.454 startLon=90.39564 ] -LOG TID(1) INFO 209.319 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 07:45:43 Routing_CalculatingRoute [ distance=18443 elapsed=0.02747 finalLat=27.52054 finalLon=90.46029 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.44609 startLon=90.42934 ] -LOG TID(1) INFO 209.321 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 07:49:57 Routing_CalculatingRoute [ distance=16401.1 elapsed=0.009608 finalLat=27.52054 finalLon=90.46029 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.45083 startLon=90.44228 ] -LOG TID(1) INFO 209.323 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:19:19 Routing_CalculatingRoute [ distance=16379.1 elapsed=0.016781 finalLat=27.52054 finalLon=90.46029 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.45073 startLon=90.44252 ] -LOG TID(1) INFO 209.325 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 08:20:20 Routing_CalculatingRoute [ distance=86178.8 elapsed=0.033373 finalLat=27.5371 finalLon=90.75786 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.45072 startLon=90.44277 ] -LOG TID(1) INFO 209.329 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 09:44:43 Routing_CalculatingRoute [ distance=65992.9 elapsed=0.035856 finalLat=27.5371 finalLon=90.75786 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.50429 startLon=90.48687 ] -LOG TID(1) INFO 209.516 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 12:50:19 Routing_CalculatingRoute [ distance=15405.3 elapsed=1.37086 finalLat=42.87675 finalLon=-71.94993 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.93288 startLon=-71.85941 ] -LOG TID(1) INFO 209.681 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 12:53:06 Routing_CalculatingRoute [ distance=10150.7 elapsed=0.855059 finalLat=45.80176 finalLon=2.99167 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.7945 startLon=3.0757 ] -LOG TID(1) INFO 210.212 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 12:53:06 Routing_CalculatingRoute [ distance=10150.7 elapsed=0.855059 finalLat=45.80176 finalLon=2.99167 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.7945 startLon=3.0757 ] -LOG TID(1) INFO 210.267 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 12:53:06 Routing_CalculatingRoute [ distance=10150.7 elapsed=0.855059 finalLat=45.80176 finalLon=2.99167 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.7945 startLon=3.0757 ] -LOG TID(1) INFO 210.357 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 13:00:34 Routing_CalculatingRoute [ distance=31860.4 elapsed=0.543827 finalLat=12.48253 finalLon=-69.89952 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.55916 startLon=-70.027 ] -LOG TID(1) INFO 211.34 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 21:35:14 Routing_CalculatingRoute [ distance=29876.1 elapsed=0.721158 finalLat=43.62299 finalLon=-110.62354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77077 startLon=-110.55718 ] -LOG TID(1) INFO 211.361 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 21:35:19 Routing_CalculatingRoute [ distance=29876.1 elapsed=0.109935 finalLat=43.62299 finalLon=-110.62354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77077 startLon=-110.55718 ] -LOG TID(1) INFO 211.384 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 21:35:25 Routing_CalculatingRoute [ distance=29876.1 elapsed=0.0650001 finalLat=43.62299 finalLon=-110.62354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77077 startLon=-110.55718 ] -LOG TID(1) INFO 211.403 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 21:35:31 Routing_CalculatingRoute [ distance=29876.1 elapsed=0.090042 finalLat=43.62299 finalLon=-110.62354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77077 startLon=-110.55718 ] -LOG TID(1) INFO 211.422 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 21:35:37 Routing_CalculatingRoute [ distance=29876.1 elapsed=0.0912151 finalLat=43.62299 finalLon=-110.62354 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.77077 startLon=-110.55718 ] -LOG TID(1) INFO 212.768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 15:01:49 Routing_CalculatingRoute [ distance=209696 elapsed=0.437407 finalLat=-10.38481 finalLon=28.61456 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-11.65633 startLon=27.45822 ] -LOG TID(1) INFO 213.057 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 13:43:48 Routing_CalculatingRoute [ distance=44145.3 elapsed=0.217963 finalLat=62.06392 finalLon=-7.27554 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=62.03456 startLon=-6.7748 ] -LOG TID(1) INFO 213.282 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 14:45:36 Routing_CalculatingRoute [ distance=35366.1 elapsed=0.186171 finalLat=12.39856 finalLon=15.05551 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.11937 startLon=15.04086 ] -LOG TID(1) INFO 213.322 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 14:48:17 Routing_CalculatingRoute [ distance=282962 elapsed=0.117538 finalLat=13.64057 finalLon=16.49078 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.11937 startLon=15.04086 ] -LOG TID(1) INFO 213.384 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 14:48:56 Routing_CalculatingRoute [ distance=475300 elapsed=0.0828176 finalLat=8.56546 finalLon=16.07383 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.118 startLon=15.04604 ] -LOG TID(1) INFO 213.64 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 13:51:52 Routing_CalculatingRoute [ distance=22083.2 elapsed=0.252793 finalLat=12.56797 finalLon=-70.04524 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.44295 startLon=-69.93637 ] -LOG TID(1) INFO 213.862 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 17:02:32 Routing_CalculatingRoute [ distance=464859 elapsed=0.105304 finalLat=9.39592 finalLon=16.30209 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.10657 startLon=15.05269 ] -LOG TID(1) INFO 214.657 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 14:07:29 Routing_CalculatingRoute [ distance=68570.9 elapsed=0.141298 finalLat=4.9223 finalLon=-52.27087 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.1775 startLon=-52.66062 ] -LOG TID(1) INFO 214.718 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 16:41:15 Routing_CalculatingRoute [ distance=28647.5 elapsed=0.102292 finalLat=17.01898 finalLon=-25.06533 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.14701 startLon=-25.01511 ] -LOG TID(1) INFO 214.768 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 31-Oct-2015 16:41:15 Routing_CalculatingRoute [ distance=28647.5 elapsed=0.102292 finalLat=17.01898 finalLon=-25.06533 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.14701 startLon=-25.01511 ] -LOG TID(1) INFO 215.161 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 12:35:59 Routing_CalculatingRoute [ distance=536794 elapsed=0.488369 finalLat=23.69407 finalLon=-15.94312 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=27.16211 startLon=-13.20267 ] -LOG TID(1) INFO 215.266 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 01:21:03 Routing_CalculatingRoute [ distance=67988.6 elapsed=0.27447 finalLat=-14.04559 finalLon=-171.43891 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.89304 startLon=-171.94051 ] -LOG TID(1) INFO 215.275 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 01:21:28 Routing_CalculatingRoute [ distance=13274.1 elapsed=0.0731869 finalLat=-13.8311 finalLon=-172.00584 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.8966 startLon=-171.93985 ] -LOG TID(1) INFO 215.281 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 27-Oct-2015 02:01:12 Routing_CalculatingRoute [ distance=67238.5 elapsed=0.077034 finalLat=-14.04559 finalLon=-171.43891 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.89967 startLon=-171.9393 ] -LOG TID(1) INFO 215.291 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 01:39:05 Routing_CalculatingRoute [ distance=15078 elapsed=0.18242 finalLat=-13.94248 finalLon=-171.7757 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.83071 startLon=-171.76843 ] -LOG TID(1) INFO 215.303 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 02:16:15 Routing_CalculatingRoute [ distance=21008.6 elapsed=0.160232 finalLat=-13.94248 finalLon=-171.7757 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-13.86944 startLon=-171.80453 ] -LOG TID(1) INFO 215.31 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 21:18:02 Routing_CalculatingRoute [ distance=67415 elapsed=0.121623 finalLat=-13.83002 finalLon=-172.03653 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-14.03602 startLon=-171.58154 ] -LOG TID(1) INFO 215.494 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:12:33 Routing_CalculatingRoute [ distance=14877.8 elapsed=0.167753 finalLat=47.55789 finalLon=-52.71876 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.44517 startLon=-52.76633 ] -LOG TID(1) INFO 215.517 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 16:12:33 Routing_CalculatingRoute [ distance=14877.8 elapsed=0.167753 finalLat=47.55789 finalLon=-52.71876 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=47.44517 startLon=-52.76633 ] -LOG TID(1) INFO 215.544 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Oct-2015 11:41:42 Routing_CalculatingRoute [ distance=72002.9 elapsed=0.92136 finalLat=44.15674 finalLon=-71.69869 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.09963 startLon=-71.14928 ] -LOG TID(1) INFO 215.738 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Sep-2015 05:15:28 Routing_CalculatingRoute [ distance=30477.5 elapsed=0.672668 finalLat=42.95901 finalLon=9.45205 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.74595 startLon=9.46341 ] -LOG TID(1) INFO 215.759 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 17:10:40 Routing_CalculatingRoute [ distance=34414.1 elapsed=0.211335 finalLat=42.63448 finalLon=8.93814 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.66469 startLon=9.2273 ] -LOG TID(1) INFO 215.774 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Oct-2015 06:03:06 Routing_CalculatingRoute [ distance=197041 elapsed=0.492157 finalLat=41.38783 finalLon=9.16062 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.25521 startLon=8.66687 ] -LOG TID(1) INFO 215.806 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 4-Oct-2015 10:05:30 Routing_CalculatingRoute [ distance=158987 elapsed=0.440094 finalLat=41.38783 finalLon=9.16062 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.11137 startLon=8.70146 ] -LOG TID(1) INFO 215.832 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 30-Sep-2015 05:15:28 Routing_CalculatingRoute [ distance=30477.5 elapsed=0.672668 finalLat=42.95901 finalLon=9.45205 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.74595 startLon=9.46341 ] -LOG TID(1) INFO 215.844 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 1-Oct-2015 17:10:40 Routing_CalculatingRoute [ distance=34414.1 elapsed=0.211335 finalLat=42.63448 finalLon=8.93814 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=42.66469 startLon=9.2273 ] -LOG TID(1) INFO 215.95 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 02:38:15 Routing_CalculatingRoute [ distance=76138.8 elapsed=0.37694 finalLat=-1.9272 finalLon=30.09123 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-1.43352 startLon=30.01531 ] -LOG TID(1) INFO 215.969 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 07:13:48 Routing_CalculatingRoute [ distance=46526.1 elapsed=0.246685 finalLat=-1.4275 finalLon=30.01145 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-1.74075 startLon=30.13048 ] -LOG TID(1) INFO 216.135 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 15:25:16 Routing_CalculatingRoute [ distance=88869.7 elapsed=0.488082 finalLat=9.34002 finalLon=2.62781 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.58763 startLon=2.599 ] -LOG TID(1) INFO 216.178 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 15:25:19 Routing_CalculatingRoute [ distance=88869.7 elapsed=0.213887 finalLat=9.34002 finalLon=2.62781 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=8.58763 startLon=2.599 ] -LOG TID(1) INFO 216.474 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 08:03:15 Routing_CalculatingRoute [ distance=13532.5 elapsed=0.316611 finalLat=0.39125 finalLon=9.44607 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.48506 startLon=9.41023 ] -LOG TID(1) INFO 216.543 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 14:32:30 Routing_CalculatingRoute [ distance=27432.3 elapsed=0.651711 finalLat=51.4461 finalLon=-3.60548 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=51.41458 startLon=-3.29018 ] -LOG TID(1) INFO 217.559 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 15-Sep-2015 03:37:34 Routing_CalculatingRoute [ distance=88584.5 elapsed=0.730988 finalLat=43.46687 finalLon=-110.79251 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=44.07903 startLon=-110.68396 ] -LOG TID(1) INFO 218.143 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 14:59:04 Routing_CalculatingRoute [ distance=10812.4 elapsed=0.086029 finalLat=12.53178 finalLon=-69.97212 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.55148 startLon=-70.05289 ] -LOG TID(1) INFO 218.169 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 14:59:09 Routing_CalculatingRoute [ distance=13505.3 elapsed=0.083177 finalLat=12.54118 finalLon=-69.95854 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.55148 startLon=-70.05289 ] -LOG TID(1) INFO 219.411 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 16:21:09 Routing_CalculatingRoute [ distance=27496.5 elapsed=0.213765 finalLat=9.34002 finalLon=2.62783 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.12121 startLon=2.55739 ] -LOG TID(1) INFO 219.452 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 16:21:31 Routing_CalculatingRoute [ distance=240517 elapsed=0.366031 finalLat=10.30515 finalLon=1.38087 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.1237 startLon=2.55734 ] -LOG TID(1) INFO 219.778 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 9-Oct-2015 02:16:37 Routing_CalculatingRoute [ distance=29500.1 elapsed=2.33794 finalLat=39.36671 finalLon=-94.36079 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.19396 startLon=-94.55032 ] -LOG TID(1) INFO 220.119 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 15:31:08 Routing_CalculatingRoute [ distance=155794 elapsed=0.102791 finalLat=4.09569 finalLon=30.67639 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.84074 startLon=31.61236 ] -LOG TID(1) INFO 221.349 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 09:00:37 Routing_CalculatingRoute [ distance=27462.8 elapsed=0.316859 finalLat=10.46321 finalLon=45.03058 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.25517 startLon=44.90777 ] -LOG TID(1) INFO 221.397 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 23:48:09 Routing_CalculatingRoute [ distance=14243.8 elapsed=1.03781 finalLat=38.63325 finalLon=-90.24538 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.60799 startLon=-90.37188 ] -LOG TID(1) INFO 221.594 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 2-Nov-2015 09:00:37 Routing_CalculatingRoute [ distance=27462.8 elapsed=0.316859 finalLat=10.46321 finalLon=45.03058 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.25517 startLon=44.90777 ] -LOG TID(1) INFO 221.754 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:11:06 Routing_CalculatingRoute [ distance=192613 elapsed=0.346462 finalLat=2.79326 finalLon=24.72871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=1.55497 startLon=25.31607 ] -LOG TID(1) INFO 221.774 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 15:12:28 Routing_CalculatingRoute [ distance=86680.9 elapsed=0.213502 finalLat=2.79326 finalLon=24.72871 name=vehicle result=NoError startDirectionX=-0 startDirectionY=0.00007 startLat=2.27131 startLon=25.14237 ] -LOG TID(1) INFO 221.788 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 17:01:25 Routing_CalculatingRoute [ distance=15278.6 elapsed=0.355544 finalLat=2.79326 finalLon=24.72871 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=2.68053 startLon=24.79524 ] -LOG TID(1) INFO 222.393 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Sep-2015 06:22:59 Routing_CalculatingRoute [ distance=190763 elapsed=0.952542 finalLat=5.80867 finalLon=-2.43527 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=4.95215 startLon=-1.76477 ] -LOG TID(1) INFO 222.439 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:16:18 Routing_CalculatingRoute [ distance=17425.4 elapsed=0.097269 finalLat=19.2818 finalLon=-81.34583 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.29687 startLon=-81.21453 ] -LOG TID(1) INFO 222.967 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 15:13:24 Routing_CalculatingRoute [ distance=43000 elapsed=0.299104 finalLat=45.08364 finalLon=2.74807 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=45.28162 startLon=2.65828 ] -LOG TID(1) INFO 223.041 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 16:19:23 Routing_CalculatingRoute [ distance=166055 elapsed=2.60593 finalLat=9.52237 finalLon=44.07268 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=10.46371 startLon=45.03017 ] -LOG TID(1) INFO 224.085 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 08:58:59 Routing_CalculatingRoute [ distance=126285 elapsed=0.377179 finalLat=6.46365 finalLon=-1.63665 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.9242 startLon=-0.98422 ] -LOG TID(1) INFO 224.111 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 09:00:45 Routing_CalculatingRoute [ distance=81005.5 elapsed=0.164655 finalLat=6.00185 finalLon=-1.37705 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.92312 startLon=-0.98373 ] -LOG TID(1) INFO 224.13 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 10:56:33 Routing_CalculatingRoute [ distance=33632.6 elapsed=0.287996 finalLat=6.00185 finalLon=-1.37705 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.77334 startLon=-1.24082 ] -LOG TID(1) INFO 225.011 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 22:27:30 Routing_CalculatingRoute [ distance=12566.6 elapsed=1.03148 finalLat=9.01777 finalLon=27.62667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.01736 startLon=27.58112 ] -LOG TID(1) INFO 225.021 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 22:27:42 Routing_CalculatingRoute [ distance=12640.6 elapsed=0.396795 finalLat=9.01777 finalLon=27.62667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.01752 startLon=27.58178 ] -LOG TID(1) INFO 225.027 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 22:27:44 Routing_CalculatingRoute [ distance=12657.9 elapsed=0.23057 finalLat=9.01777 finalLon=27.62667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.01754 startLon=27.58193 ] -LOG TID(1) INFO 225.219 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 22:27:30 Routing_CalculatingRoute [ distance=12566.6 elapsed=1.03148 finalLat=9.01777 finalLon=27.62667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.01736 startLon=27.58112 ] -LOG TID(1) INFO 225.225 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 20-Oct-2015 22:27:42 Routing_CalculatingRoute [ distance=12640.6 elapsed=0.396795 finalLat=9.01777 finalLon=27.62667 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.01752 startLon=27.58178 ] -LOG TID(1) INFO 225.469 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 7-Nov-2015 23:49:40 Routing_CalculatingRoute [ distance=93999.8 elapsed=1.04515 finalLat=37.77817 finalLon=-81.18816 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.3471 startLon=-81.61892 ] -LOG TID(1) INFO 225.528 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:28:05 Routing_CalculatingRoute [ distance=68151 elapsed=1.48063 finalLat=37.54456 finalLon=-80.96009 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.75287 startLon=-81.20798 ] -LOG TID(1) INFO 225.572 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:41:36 Routing_CalculatingRoute [ distance=42396 elapsed=0.433432 finalLat=37.54456 finalLon=-80.96009 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.56989 startLon=-81.11286 ] -LOG TID(1) INFO 225.607 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 02:47:02 Routing_CalculatingRoute [ distance=31486.3 elapsed=0.480427 finalLat=37.54456 finalLon=-80.96009 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=37.49029 startLon=-81.08692 ] -LOG TID(1) INFO 226.577 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:24:51 Routing_CalculatingRoute [ distance=343571 elapsed=1.02904 finalLat=36.71006 finalLon=68.90684 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46896 startLon=69.11528 ] -LOG TID(1) INFO 226.638 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:25:16 Routing_CalculatingRoute [ distance=142793 elapsed=0.221016 finalLat=33.54489 finalLon=68.41323 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46899 startLon=69.11536 ] -LOG TID(1) INFO 226.659 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:27:27 Routing_CalculatingRoute [ distance=68559 elapsed=0.247856 finalLat=35.01318 finalLon=69.17416 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46892 startLon=69.1152 ] -LOG TID(1) INFO 226.698 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:28:38 Routing_CalculatingRoute [ distance=235108 elapsed=0.311875 finalLat=35.94041 finalLon=68.71664 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=34.46892 startLon=69.1152 ] -LOG TID(1) INFO 227.097 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 00:28:44 Routing_CalculatingRoute [ distance=17524.3 elapsed=0.6657 finalLat=33.99259 finalLon=-96.58746 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=33.99784 startLon=-96.40593 ] -LOG TID(1) INFO 227.258 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 14:32:32 Routing_CalculatingRoute [ distance=46556.8 elapsed=0.561911 finalLat=43.60537 finalLon=-71.18855 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.60568 startLon=-71.45774 ] -LOG TID(1) INFO 227.312 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 15:00:17 Routing_CalculatingRoute [ distance=108077 elapsed=0.7689 finalLat=42.75865 finalLon=-71.21426 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=43.5139 startLon=-71.26691 ] -LOG TID(1) INFO 228.509 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 16:09:37 Routing_CalculatingRoute [ distance=54321.6 elapsed=0.164118 finalLat=0.41044 finalLon=9.43091 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=0.40081 startLon=9.87076 ] -LOG TID(1) INFO 229.229 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 18:09:33 Routing_CalculatingRoute [ distance=33607.8 elapsed=1.20375 finalLat=38.75761 finalLon=-90.34787 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=38.76613 startLon=-90.61733 ] -LOG TID(1) INFO 230.245 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:16:18 Routing_CalculatingRoute [ distance=41269.2 elapsed=0.119061 finalLat=-0.7444 finalLon=-90.31511 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-0.48762 startLon=-90.28009 ] -LOG TID(1) INFO 230.293 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 17:25:33 Routing_CalculatingRoute [ distance=38162.3 elapsed=0.075841 finalLat=-0.74501 finalLon=-90.31601 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-0.50725 startLon=-90.29328 ] -LOG TID(1) INFO 230.641 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 11:02:16 Routing_CalculatingRoute [ distance=1.59553e+06 elapsed=2.07139 finalLat=2.028 finalLon=45.30643 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.51804 startLon=44.08293 ] -LOG TID(1) INFO 232.417 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:20:44 Routing_CalculatingRoute [ distance=436726 elapsed=0.229246 finalLat=-3.55708 finalLon=12.34778 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.27571 startLon=15.25547 ] -LOG TID(1) INFO 232.454 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:21:04 Routing_CalculatingRoute [ distance=444264 elapsed=0.213185 finalLat=-3.55671 finalLon=12.48152 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.27582 startLon=15.25545 ] -LOG TID(1) INFO 232.502 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:34:00 Routing_CalculatingRoute [ distance=121864 elapsed=0.14402 finalLat=-3.32905 finalLon=15.56682 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=-4.27574 startLon=15.25544 ] -LOG TID(1) INFO 233.237 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:49:12 Routing_CalculatingRoute [ distance=11253.1 elapsed=0.925629 finalLat=49.20691 finalLon=-2.09069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=49.19726 startLon=-2.19933 ] -LOG TID(1) INFO 233.327 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 17:51:13 Routing_CalculatingRoute [ distance=16215.4 elapsed=0.0947555 finalLat=16.82623 finalLon=-24.93368 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.84846 startLon=-25.04043 ] -LOG TID(1) INFO 233.334 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 3-Nov-2015 19:08:45 Routing_CalculatingRoute [ distance=10230.7 elapsed=0.105737 finalLat=16.88741 finalLon=-24.98639 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=16.88888 startLon=-24.92166 ] -LOG TID(1) INFO 233.358 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 11:23:04 Routing_CalculatingRoute [ distance=37224.9 elapsed=0.0951971 finalLat=17.18448 finalLon=-25.0617 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.02106 startLon=-25.08933 ] -LOG TID(1) INFO 233.367 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 12:12:07 Routing_CalculatingRoute [ distance=19896.4 elapsed=0.0834365 finalLat=17.18448 finalLon=-25.0617 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=17.10347 startLon=-25.0627 ] -LOG TID(1) INFO 233.84 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:16:18 Routing_CalculatingRoute [ distance=17425.4 elapsed=0.097269 finalLat=19.2818 finalLon=-81.34583 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.29687 startLon=-81.21453 ] -LOG TID(1) INFO 233.856 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 5-Nov-2015 00:16:18 Routing_CalculatingRoute [ distance=17425.4 elapsed=0.097269 finalLat=19.2818 finalLon=-81.34583 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=19.29687 startLon=-81.21453 ] -LOG TID(1) INFO 234.908 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 19:49:03 Routing_CalculatingRoute [ distance=27290.9 elapsed=2.10957 finalLat=39.39685 finalLon=-101.06229 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.34806 startLon=-101.35395 ] -LOG TID(1) INFO 235.144 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:40:15 Routing_CalculatingRoute [ distance=88059.8 elapsed=0.212422 finalLat=9.71069 finalLon=1.66518 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.75063 startLon=2.42608 ] -LOG TID(1) INFO 235.177 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 19:40:19 Routing_CalculatingRoute [ distance=84958.9 elapsed=0.053563 finalLat=9.71069 finalLon=1.66518 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=9.75486 startLon=2.39917 ] -LOG TID(1) INFO 235.324 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 22-Oct-2015 19:49:03 Routing_CalculatingRoute [ distance=27290.9 elapsed=2.10957 finalLat=39.39685 finalLon=-101.06229 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=39.34806 startLon=-101.35395 ] -LOG TID(1) INFO 235.574 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:40:02 Routing_CalculatingRoute [ distance=28891.2 elapsed=0.475986 finalLat=12.02403 finalLon=-61.75707 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14444 startLon=-61.61168 ] -LOG TID(1) INFO 235.605 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:41:36 Routing_CalculatingRoute [ distance=30742.5 elapsed=0.447117 finalLat=12.02048 finalLon=-61.77069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14444 startLon=-61.61168 ] -LOG TID(1) INFO 235.617 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:41:56 Routing_CalculatingRoute [ distance=30742.5 elapsed=0.299428 finalLat=12.02048 finalLon=-61.77069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14444 startLon=-61.61168 ] -LOG TID(1) INFO 235.627 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:42:13 Routing_CalculatingRoute [ distance=30742.5 elapsed=0.29933 finalLat=12.02048 finalLon=-61.77069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14444 startLon=-61.61168 ] -LOG TID(1) INFO 235.638 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 6-Nov-2015 08:42:48 Routing_CalculatingRoute [ distance=30742.5 elapsed=0.658375 finalLat=12.02048 finalLon=-61.77069 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=12.14444 startLon=-61.61168 ] -LOG TID(1) INFO 235.782 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 28-Oct-2015 19:25:46 Routing_CalculatingRoute [ distance=10796.9 elapsed=0.143443 finalLat=5.41939 finalLon=-53.04192 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=5.37624 startLon=-52.95867 ] -LOG TID(1) INFO 236.157 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 21-Oct-2015 21:41:54 Routing_CalculatingRoute [ distance=16854.9 elapsed=0.1152 finalLat=64.92698 finalLon=-147.54348 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=64.83484 startLon=-147.74031 ] -LOG TID(1) INFO 236.221 routing_consistency_tests/routing_consistency_tests.cpp:167 ReadInput() Checked 8-Nov-2015 13:43:48 Routing_CalculatingRoute [ distance=44145.3 elapsed=0.217963 finalLat=62.06392 finalLon=-7.27554 name=vehicle result=NoError startDirectionX=0 startDirectionY=0 startLat=62.03456 startLon=-6.7748 ] From 460a7fa4801db729ac70e00826a5805a85e808ff Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Fri, 20 Jun 2025 17:49:42 +0400 Subject: [PATCH 171/222] [map] Fix zoom on selected/saved track Signed-off-by: Kiryl Kaveryn --- map/framework.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/framework.cpp b/map/framework.cpp index 21c1a7c6f..37f67119d 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -904,7 +904,7 @@ void Framework::ShowTrack(kml::TrackId trackId) es.SetIsVisible(track->GetGroupId(), true /* visible */); if (m_drapeEngine) - m_drapeEngine->SetModelViewCenter(rect.Center(), scales::GetScaleLevel(rect), true /* isAnim */, true /* trackVisibleViewport */); + m_drapeEngine->SetModelViewRect(rect, true, scales::GetScaleLevel(rect), true /* isAnim */, true /* trackVisibleViewport */); ActivateMapSelection(); } From b195059fb6f2d0592c9bc3fdbc2cd9c3dfec5f19 Mon Sep 17 00:00:00 2001 From: hemanggs Date: Sun, 6 Jul 2025 23:25:14 +0530 Subject: [PATCH 172/222] [drape] Fixes add business button crosshair placement -Point crosshair to optionalPosition instead of a random point in BoundArea Signed-off-by: hemanggs --- .../widget/placepage/PlacePageView.java | 2 +- drape_frontend/frontend_renderer.cpp | 20 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index b865e6c5b..5f9ebf711 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -619,7 +619,7 @@ public class PlacePageView extends Fragment private void addOrganisation() { - ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, false); + ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, true); } private void addPlace() diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 58f573719..b0a3154ae 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -839,21 +839,19 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) m_dragBoundArea = msg->AcceptBoundArea(); if (msg->IsEnabled()) { - if (!m_dragBoundArea.empty()) + auto const pt = msg->GetOptionalPosition(); + if (pt || m_dragBoundArea.empty()) { - PullToBoundArea(true /* randomPlace */, true /* applyZoom */); + int zoom = kDoNotChangeZoom; + if (GetCurrentZoom() < scales::GetAddNewPlaceScale()) + zoom = scales::GetAddNewPlaceScale(); + AddUserEvent(make_unique_dp(pt ? *pt : m_userEventStream.GetCurrentScreen().GlobalRect().Center(), + zoom, true /* isAnim */, false /* trackVisibleViewport */, + nullptr /* parallelAnimCreator */)); } else { - // Exact position for POI or screen's center for Add place on map. - int zoom = kDoNotChangeZoom; - if (GetCurrentZoom() < scales::GetAddNewPlaceScale()) - zoom = scales::GetAddNewPlaceScale(); - - auto const pt = msg->GetOptionalPosition(); - AddUserEvent(make_unique_dp(pt ? *pt : m_userEventStream.GetCurrentScreen().GlobalRect().Center(), - zoom, true /* isAnim */, false /* trackVisibleViewport */, - nullptr /* parallelAnimCreator */)); + PullToBoundArea(true /* randomPlace */, true /* applyZoom */); } } break; From 905a8234902570bd8018a7d9ccf62f16c11dcf40 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sat, 12 Jul 2025 00:31:58 -0300 Subject: [PATCH 173/222] [desktop] Removed redundant NightMode setting. Signed-off-by: Viktor Govako --- platform/settings.cpp | 1 - platform/settings.hpp | 1 - qt/preferences_dialog.cpp | 15 +++++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/platform/settings.cpp b/platform/settings.cpp index 15fd38910..3d1fdf8f9 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -23,7 +23,6 @@ using namespace std; std::string_view kMeasurementUnits = "Units"; std::string_view kMapLanguageCode = "MapLanguageCode"; std::string_view kDeveloperMode = "DeveloperMode"; -std::string_view kNightMode = "NightMode"; std::string_view kDonateUrl = "DonateUrl"; std::string_view kNY = "NY"; diff --git a/platform/settings.hpp b/platform/settings.hpp index fd45e2b7f..6dec4fb33 100644 --- a/platform/settings.hpp +++ b/platform/settings.hpp @@ -12,7 +12,6 @@ namespace settings extern std::string_view kMeasurementUnits; extern std::string_view kDeveloperMode; extern std::string_view kMapLanguageCode; -extern std::string_view kNightMode; // The following two settings are configured externally at the metaserver. extern std::string_view kDonateUrl; extern std::string_view kNY; diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp index acc0fa827..27a394a02 100644 --- a/qt/preferences_dialog.cpp +++ b/qt/preferences_dialog.cpp @@ -152,20 +152,15 @@ namespace qt nightModeRadioBox->setLayout(layout); - int i; - if (!settings::Get(settings::kNightMode, i)) - { - i = static_cast(MapStyleIsDark(framework.GetMapStyle()) ? NightMode::On : NightMode::Off); - settings::Set(settings::kNightMode, i); - } - nightModeGroup->button(i)->setChecked(true); + int const btn = MapStyleIsDark(framework.GetMapStyle()) ? 1 : 0; + nightModeGroup->button(btn)->setChecked(true); void (QButtonGroup::* buttonClicked)(int) = &QButtonGroup::idClicked; connect(nightModeGroup, buttonClicked, [&framework](int i) { - NightMode nightMode = static_cast(i); - settings::Set(settings::kNightMode, i); - framework.SetMapStyle((nightMode == NightMode::Off) ? GetLightMapStyleVariant(framework.GetMapStyle()) : GetDarkMapStyleVariant(framework.GetMapStyle())); + auto const currStyle = framework.GetMapStyle(); + framework.SetMapStyle((i == 0) ? GetLightMapStyleVariant(currStyle) : + GetDarkMapStyleVariant(currStyle)); }); } From d5ce81b20b20fb8750f60ce1b7750cf74ec603af Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 7 Aug 2025 09:27:51 +0000 Subject: [PATCH 174/222] [strings] Update from Codeberg Translate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Alexey Ladygin Co-authored-by: Antmajgra Co-authored-by: B o d o Co-authored-by: Codeberg Translate Co-authored-by: ERYpTION Co-authored-by: Fjuro Co-authored-by: Frz Co-authored-by: Fs00 Co-authored-by: Lenny Angst Co-authored-by: N4ta Co-authored-by: Outbreak2096 Co-authored-by: Prefill add-on Co-authored-by: Priit Jõerüüt Co-authored-by: Weblate Co-authored-by: Weblate Translation Memory Co-authored-by: ZeljkoBG Co-authored-by: athulvis Co-authored-by: lazlo Co-authored-by: ldmpub Co-authored-by: maklein Co-authored-by: matheusgomesms Co-authored-by: metehan Co-authored-by: patepelo Co-authored-by: paulb Co-authored-by: rimas Co-authored-by: x7z4w Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings --- .../play/listings/fr-FR/short-description.txt | 2 +- .../play/listings/pt-PT/short-description.txt | 1 + .../src/fdroid/play/listings/pt-PT/title.txt | 1 + .../play/listings/fr-FR/short-description.txt | 2 +- .../src/google/play/listings/ml-IN/title.txt | 1 + .../src/google/play/listings/pl-PL/title.txt | 1 + .../src/main/res/values-bg/types_strings.xml | 10 +- .../app/src/main/res/values-da/strings.xml | 2 +- .../main/res/values-es-rMX/types_strings.xml | 2 +- .../app/src/main/res/values-es/strings.xml | 22 ++-- .../src/main/res/values-es/types_strings.xml | 4 +- .../app/src/main/res/values-fr/strings.xml | 4 +- .../app/src/main/res/values-it/strings.xml | 5 +- .../src/main/res/values-it/types_strings.xml | 4 +- .../app/src/main/res/values-lt/strings.xml | 113 +++++++++++------ .../app/src/main/res/values-ml/strings.xml | 1 + .../src/main/res/values-ml/types_strings.xml | 1 + .../app/src/main/res/values-nl/strings.xml | 58 ++++----- .../src/main/res/values-nl/types_strings.xml | 5 + .../src/main/res/values-pl/types_strings.xml | 1 + .../src/main/res/values-pt-rBR/strings.xml | 6 +- .../main/res/values-pt-rBR/types_strings.xml | 10 +- .../app/src/main/res/values-pt/strings.xml | 54 ++++---- .../app/src/main/res/values-ru/strings.xml | 36 +++--- .../app/src/main/res/values-sr/strings.xml | 4 +- .../app/src/main/res/values-tr/strings.xml | 16 +-- .../src/main/res/values-uk/types_strings.xml | 2 +- .../src/main/res/values-zh/types_strings.xml | 16 ++- data/countries-strings/cs.json/localize.json | 30 ++--- data/countries-strings/de.json/localize.json | 120 +++++++++--------- data/countries-strings/et.json/localize.json | 48 +++---- data/countries-strings/fr.json/localize.json | 4 +- data/countries-strings/it.json/localize.json | 2 +- data/countries-strings/nl.json/localize.json | 50 ++++---- data/countries-strings/pt.json/localize.json | 50 ++++---- data/countries-strings/ru.json/localize.json | 10 +- .../zh-Hans.json/localize.json | 64 +++++----- data/sound-strings/es.json/localize.json | 2 +- data/sound-strings/tr.json/localize.json | 2 +- .../bg.lproj/LocalizableTypes.strings | 12 +- .../da.lproj/Localizable.strings | 2 +- .../es-MX.lproj/LocalizableTypes.strings | 2 +- .../es.lproj/InfoPlist.strings | 4 +- .../es.lproj/Localizable.strings | 26 ++-- .../es.lproj/LocalizableTypes.strings | 4 +- .../fr.lproj/Localizable.strings | 4 +- .../it.lproj/Localizable.strings | 4 +- .../it.lproj/LocalizableTypes.strings | 4 +- .../lt.lproj/Localizable.strings | 16 +-- .../ml.lproj/InfoPlist.strings | 2 +- .../ml.lproj/Localizable.strings | 2 +- .../ml.lproj/Localizable.stringsdict | 9 +- .../ml.lproj/LocalizableTypes.strings | 2 +- .../nl.lproj/Localizable.strings | 10 +- .../nl.lproj/LocalizableTypes.strings | 10 +- .../pl.lproj/LocalizableTypes.strings | 2 +- .../pt-BR.lproj/Localizable.strings | 2 +- .../pt-BR.lproj/LocalizableTypes.strings | 10 +- .../pt_PT.lproj/Localizable.stringsdict | 64 +++++++++- .../ru.lproj/Localizable.strings | 10 +- .../sr.lproj/Localizable.strings | 4 +- .../tr.lproj/Localizable.strings | 14 +- .../uk.lproj/LocalizableTypes.strings | 2 +- .../zh-Hans.lproj/LocalizableTypes.strings | 28 ++-- iphone/metadata/pt-PT/keywords.txt | 1 + iphone/metadata/pt-PT/privacy_url.txt | 1 + iphone/metadata/pt-PT/subtitle.txt | 1 + iphone/metadata/pt-PT/support_url.txt | 1 + 68 files changed, 579 insertions(+), 440 deletions(-) create mode 100644 android/app/src/fdroid/play/listings/pt-PT/short-description.txt create mode 100644 android/app/src/fdroid/play/listings/pt-PT/title.txt create mode 100644 android/app/src/google/play/listings/ml-IN/title.txt create mode 100644 android/app/src/google/play/listings/pl-PL/title.txt create mode 100644 iphone/metadata/pt-PT/keywords.txt create mode 100644 iphone/metadata/pt-PT/privacy_url.txt create mode 100644 iphone/metadata/pt-PT/subtitle.txt create mode 100644 iphone/metadata/pt-PT/support_url.txt diff --git a/android/app/src/fdroid/play/listings/fr-FR/short-description.txt b/android/app/src/fdroid/play/listings/fr-FR/short-description.txt index 3a6d8ef89..1acd0ceac 100644 --- a/android/app/src/fdroid/play/listings/fr-FR/short-description.txt +++ b/android/app/src/fdroid/play/listings/fr-FR/short-description.txt @@ -1 +1 @@ -Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté +Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté diff --git a/android/app/src/fdroid/play/listings/pt-PT/short-description.txt b/android/app/src/fdroid/play/listings/pt-PT/short-description.txt new file mode 100644 index 000000000..fb5a97658 --- /dev/null +++ b/android/app/src/fdroid/play/listings/pt-PT/short-description.txt @@ -0,0 +1 @@ +Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos diff --git a/android/app/src/fdroid/play/listings/pt-PT/title.txt b/android/app/src/fdroid/play/listings/pt-PT/title.txt new file mode 100644 index 000000000..e7d14d499 --- /dev/null +++ b/android/app/src/fdroid/play/listings/pt-PT/title.txt @@ -0,0 +1 @@ +CoMaps - Mapas e Navegação - Offline e Privada diff --git a/android/app/src/google/play/listings/fr-FR/short-description.txt b/android/app/src/google/play/listings/fr-FR/short-description.txt index 3a6d8ef89..1acd0ceac 100644 --- a/android/app/src/google/play/listings/fr-FR/short-description.txt +++ b/android/app/src/google/play/listings/fr-FR/short-description.txt @@ -1 +1 @@ -Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté +Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté diff --git a/android/app/src/google/play/listings/ml-IN/title.txt b/android/app/src/google/play/listings/ml-IN/title.txt new file mode 100644 index 000000000..970488d93 --- /dev/null +++ b/android/app/src/google/play/listings/ml-IN/title.txt @@ -0,0 +1 @@ +കോമാപ്പ്സ് - സ്വകാര്യതയോടെ സഞ്ചരിക്കൂ diff --git a/android/app/src/google/play/listings/pl-PL/title.txt b/android/app/src/google/play/listings/pl-PL/title.txt new file mode 100644 index 000000000..62c8f3993 --- /dev/null +++ b/android/app/src/google/play/listings/pl-PL/title.txt @@ -0,0 +1 @@ +CoMaps - Nawigacja szanująca prywatność diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/app/src/main/res/values-bg/types_strings.xml index dda22b8ca..a2d643a67 100644 --- a/android/app/src/main/res/values-bg/types_strings.xml +++ b/android/app/src/main/res/values-bg/types_strings.xml @@ -79,7 +79,7 @@ Пивоварна Кетъринг Марангоз - Сладкарски изделия + Сладкарница Електротехник Ремонт на електроника Градинар @@ -354,7 +354,7 @@ Страна Графство Ферма - Cело + Село Остров Острови Изолирано жилище @@ -595,7 +595,7 @@ Пластмасови бутилки Картон Обувки - Заведение + Ресторант Училище Душ Телефон @@ -659,7 +659,7 @@ Магазин за авточасти Сервиз за коли Гумаджия - Химик + Битова химия Магазин за животни Риба Магазин за обувки @@ -1370,4 +1370,6 @@ Спускане със ски за напреднали Свободно каране спускане със ски Спускане със ски за начинаещи + Обслужвана зона + Гора diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index f8531e75a..b171083e1 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -220,7 +220,7 @@ Stemmesprog - Test stemmeanvisninger (TTS, Text-To-Speech) + Test stemmevejledninger Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu diff --git a/android/app/src/main/res/values-es-rMX/types_strings.xml b/android/app/src/main/res/values-es-rMX/types_strings.xml index 236a5b80f..3918e0ff3 100644 --- a/android/app/src/main/res/values-es-rMX/types_strings.xml +++ b/android/app/src/main/res/values-es-rMX/types_strings.xml @@ -5,7 +5,7 @@ Barbacoa Estacionamiento de bicicletas Renta de bicicletas - Renta de coches + Renta de autos Autolavado Jardín de niños Estacionamiento de motocicletas diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index e0e2bcc38..3c5bd307c 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -25,7 +25,7 @@ Buscar en el mapa - No se puede acceder a los servicios de localización en este dispositivo o aplicación. Actívelos en la configuración. + Actualmente tienes desactivados todos los Servicios de Localización para este dispositivo o aplicación. Actívalos en Ajustes. Precisión limitada @@ -42,7 +42,7 @@ • Fácil de utilizar y depurado - • Enfocado a la privacidad y sin anuncios + • Enfocado en la privacidad y sin anuncios • No necesita conexión a internet, rápido y compacto @@ -58,7 +58,7 @@ Libere espacio en la memoria SD o almacenamiento USB para usar la aplicación Antes de comenzar, permita que descarguemos en su dispositivo un mapamundi general. \nSe requieren %s de almacenamiento. Ir al mapa - Descargando %1$s (%2$s). Puede ahora \nproceder al mapa. + Descargando %1$s (%2$s). Ya puede \nproceder al mapa. ¿Descargar %1$s? (%2$s) ¿Actualizar %1$s? (%2$s) @@ -68,7 +68,7 @@ No se pudo descargar %s - Agregar un grupo nuevo + Agregar una lista nueva Nombre del grupo de marcadores @@ -106,7 +106,7 @@ Error al mover los archivos de mapas - Esto podría tardar varios minutos. \nAguarde un momento… + Esto podría tardar varios minutos. \nAguarda un momento… Unidades de medida @@ -119,7 +119,7 @@ Transporte - Gasolinera + Estación de Servicio Aparcamiento @@ -163,11 +163,11 @@ Notas Marcadores de CoMaps compartidos con usted - ¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/download/ \n\n¡Disfrute viajando con CoMaps! + ¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfrute viajando con CoMaps! Cargando marcadores - ¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores. + ¡Los marcadores se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Marcadores. No se pudieron cargar los marcadores. El archivo podría tener daños o defectos. @@ -177,7 +177,7 @@ Editar - Aún no se ha determinado su ubicación + Aún no se ha determinado tu ubicación Lo sentimos, la configuración del almacenamiento de mapas está desactivada @@ -193,7 +193,7 @@ Compartir - Correo + Correo electrónico Copiado en el portapapeles: %s @@ -203,7 +203,7 @@ ¿Quiere salir de su cuenta de OpenStreetMap? - Trayectos + Trazas Longitud Compartir mi ubicación diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml index fd3840fdc..27541970b 100644 --- a/android/app/src/main/res/values-es/types_strings.xml +++ b/android/app/src/main/res/values-es/types_strings.xml @@ -37,7 +37,7 @@ Café Alquiler de coches Alquiler de motocicletas - Compartir coche + Car Sharing Lavado de coches Casino Juegos de apuestas @@ -50,7 +50,7 @@ Cine Bolera Clínica - Colegio + Facultad Centro comunitario Aire comprimido Centro de conferencias diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index b0a909670..c92b51bd7 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -240,7 +240,7 @@ Langue vocale - Teste les instructions vocales (TTS, Text-To-Speech) + Tester les instructions vocales Vérifiez le volume ou les paramètres de synthèse vocale du système si vous n\'entendez pas la voix maintenant @@ -504,7 +504,7 @@ Le nombre d\'étages ne doit pas dépasser %d Code postal - Entrer un code postal valide + Saisissez un code postal valide Point sur la carte diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml index d3c9c147b..a2d587aee 100644 --- a/android/app/src/main/res/values-it/strings.xml +++ b/android/app/src/main/res/values-it/strings.xml @@ -225,7 +225,7 @@ Lingua per la voce - Prova le indicazioni vocali (TTS, Text-To-Speech) + Prova le indicazioni vocali Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce @@ -913,4 +913,7 @@ Ultimo backup riuscito Il percorso di backup selezionato non è disponibile o non ha i permessi in scrittura. Selezionare un percorso differente. Immagine Panoramax + Aperto adesso + Chiuso adesso + alle %s diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml index ffd5bb03c..fc18d2706 100644 --- a/android/app/src/main/res/values-it/types_strings.xml +++ b/android/app/src/main/res/values-it/types_strings.xml @@ -1235,7 +1235,7 @@ Scivolo d\'acqua Attrattiva Campeggio - Area per campeggiatori + Area camper Cottage per le vacanze Galleria @@ -1409,6 +1409,6 @@ Palude Salmastra di Marea Giunco Piana di Marea - Paludre + Palude Escape Room diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml index ce5e9b400..cb41ad787 100644 --- a/android/app/src/main/res/values-lt/strings.xml +++ b/android/app/src/main/res/values-lt/strings.xml @@ -9,7 +9,7 @@ Šalinti Atsiųsti žemėlapius - Atsiuntimas nepavyko. Bakstelėkite, kad būtų pabandyta dar kartą. + Atsiuntimas nepavyko, bakstelėkite pabandyti dar kartą Atsiunčiama… @@ -32,7 +32,7 @@ Ribotas tikslumas - Jeigu norite užtikrinti tikslią navigaciją, nustatymuose įjunkite galimybę nustatyti tikslią vietą. + Jeigu norite užtikrinti tikslią navigaciją, nustatymuose įjunkite galimybę nustatyti tikslią vietą Rodyti žemėlapyje @@ -49,7 +49,7 @@ • Veikia sparčiai, kompaktiškai ir be interneto - Atvirojo kodo programėlė, sukurta entuziastų ir savanorių. + Visiškai atvirojo kodo programėlė, sukurta nesiekiant pelno, skaidriai priimant sprendimus ir tvarkant finansus. Užverti Šiai programėlei reikia aparatinio „OpenGL“ spartinimo. Deja, jūsų įrenginys nepalaikomas. Atsiųsti @@ -174,9 +174,9 @@ Jūsų vieta dar nenustatyta - Deja, šiuo metu žemėlapio saugyklos nustatymai negalimi. + Deja, šiuo metu žemėlapio saugyklos nustatymai negalimi - Vyksta žemėlapio atsiuntimas. + Vyksta žemėlapio atsiuntimas Pažiūrėk, kur dabar esu „CoMaps“ autonominių žemėlapių programėlėje! %1$s arba %2$s . Neturi jos? Atsisiųsk čia: https://www.comaps.app/download/ @@ -274,7 +274,7 @@ Atsiųsti viską Atsiunčiama: - Jeigu norite pašalinti žemėlapį, sustabdykite navigaciją. + Jeigu norite pašalinti žemėlapį, sustabdykite navigaciją Maršrutai gali būti sukurti tik tuomet, kai jie yra vieno regiono žemėlapio ribose. @@ -286,9 +286,9 @@ Naujinti žemėlapį - „Google Play“ vietos nustatymo paslaugos + „Google“ jungtinė vietos nustatymo paslauga - Greitai nustatyti apytikslę jūsų buvimo vietą remiantis pasiekiamais „Bluetooth“ įrenginiais, belaidžiais tinklais ir mobiliojo ryšio siųstuvais + Nuosavybinė paslauga, nustatanti jūsų vietą remdamasi GPS, belaidžio ryšio, mobiliųjų tinklų ir kitais duomenimis. Gali jungtis prie „Google“ serverių. @@ -346,18 +346,18 @@ Įjunkite vietovės tarnybas Nepavyko nustatyti dabartinių GPS koordinačių. Maršrutui apskaičiuoti, įjunkite vietovės tarnybas. Nepavyko nustatyti maršruto - Nepavyko apskaičiuoti maršruto. + Nepavyko apskaičiuoti maršruto Pakoreguokite pradžios tašką arba paskirties vietą. Keisti pradžios tašką Maršruto nepavyko apskaičiuoti. Nepavyko nustatyti pradžios taško. Pasirinkite pradžios tašką, esantį arčiau kelio. Keisti paskirties vietą Maršruto nepavyko apskaičiuoti. Nepavyko nustatyti paskirties vietos. - Pasirinkite paskirties vietą, esančią arčiau kelio. - Nepavyko nustatyti tarpinio taško. - Pakoreguokite tarpinį tašką. + Pasirinkite paskirties vietą, esančią arčiau kelio + Nepavyko nustatyti tarpinio taško + Pakoreguokite tarpinį tašką Sistemos klaida - Maršruto nepavyko apskaičiuoti dėl programinės klaidos. + Maršruto nepavyko apskaičiuoti dėl programinės klaidos Bandykite dar kartą Ne dabar Ar atsiųsti žemėlapį, kad būtų apskaičiuotas geresnis maršrutas, apimantis daugiau nei vieną žemėlapį? @@ -371,11 +371,11 @@ Nerodyti Kategorijos Žurnalas - Deja, rezultatų nerasta. + Deja, rezultatų nerasta Atsisiųskite regioną, kuriame ieškote, arba pabandykite įvesti kito netoliese esančio miesto ar kaimo pavadinimą. Paieškų žurnalas - Rodyti paskiausias paieškas. + Rodyti paskiausias paieškas Valyti paieškų žurnalą Vikipedija @@ -385,7 +385,7 @@ Pradėti Maršrutas iš Maršrutas į - Navigacija galima tik iš jūsų dabartinės vietos. + Navigacija galima tik iš jūsų dabartinės vietos Ar norite, kad būtų apskaičiuotas maršrutas iš jūsų dabartinės vietos? Toliau @@ -455,14 +455,14 @@ El. paštas arba naudotojo vardas Pridėti telefono numerį Aukštas - Visi jūsų žemėlapio pakeitimai bus pašalinti kartu su žemėlapiu. + Visi jūsų žemėlapio pakeitimai bus pašalinti kartu su žemėlapiu Naujinti žemėlapius Maršrutui apskaičiuoti reikia atnaujinti visus žemėlapius ir suplanuoti maršrutą iš naujo. Rasti žemėlapį - Įsitikinkite, kad jūsų įrenginys yra prijungtas prie interneto. + Įsitikinkite, kad jūsų įrenginys yra prijungtas prie interneto Nepakanka laisvos vietos Pašalinkite nereikalingus duomenis - Prisijungimo klaida. + Prisijungimo klaida Patvirtinti pakeitimai Vilkite žemėlapį, kad kryžiukas atsidurtų ties vieta, kurioje yra pridedama vieta ar įmonė. Taisoma @@ -479,11 +479,11 @@ Bendruomenės surinkti „OpenStreetMap“ duomenys %s dienai. Sužinokite, kaip redaguoti ir atnaujinti žemėlapį, apsilankydami OpenStreetMap.org svetainėje OpenStreetMap.org (OSM) – tai bendruomenės projektas, kuriuo siekiama sukurti laisvą ir atvirą žemėlapį. Tai – pagrindinis „CoMaps“ žemėlapių duomenų šaltinis, veikiantis panašiu principu, kaip „Vikipedija“. Galite pridėti ar taisyti vietas, o jos tampa prieinamos milijonams naudotojų visame pasaulyje. \nPrisijunkite prie bendruomenės ir padėkite kurti geresnį žemėlapį visiems! - Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui. + Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui %1$d iš %2$d Atsisiųsti naudojant mobilųjį ryšį? - Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu. + Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu Įveskite leistiną pastato numerį Aukštų skaičius negali viršyti %d @@ -506,8 +506,8 @@ Nerandate tinkamos kategorijos? „CoMaps“ leidžia pridėti tik paprastų kategorijas taškus – jokių miestų, kelių, ežerų, pastatų kontūrų ir pan. šia programėle pridėti negalima. Šių kategorijų objektus pridėkite naudodamiesi OpenStreetMap.org svetaine. Žvilgtelėkite į mūsų vadovą, kuriame rasite išsamias pažingsnines instrukcijas. Nesate atsiuntę jokių žemėlapių - Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo. - Dabartinė vieta nežinoma. + Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo + Dabartinė vieta nežinoma m @@ -537,17 +537,17 @@ Įveskite galiojantį telefono numerį Įveskite galiojantį saityno adresą Įveskite galiojantį el. pašto adresą - Įveskite galiojantį „Facebook“ saityno adresą, paskyros vardą ar puslapio pavadinimą - Įveskite galiojantį „Instagram“ paskyros vardą ar saityno adresą - Įveskite galiojantį „Twitter“ paskyros vardą ar saityno adresą - Įveskite galiojantį VK paskyros vardą ar saityno adresą - Įveskite galiojantį LINE ID ar saityno adresą + Įveskite galiojantį „Facebook“ tinklalapio adresą, paskyros vardą ar puslapio pavadinimą + Įveskite galiojantį „Instagram“ paskyros vardą ar tinklalapio adresą + Įveskite galiojantį „Twitter“ paskyros vardą ar tinklalapio adresą + Įveskite galiojantį VK paskyros vardą ar tinklalapio adresą + Įveskite galiojantį LINE ID ar tinklalapio adresą Pridėti vietą į „OpenStreetMap“ Ar tikrai norite šiuos pakeitimus paviešinti? - Įsitikinkite, kad neįvedėte jokių asmeninių duomenų. - „OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų. + Įsitikinkite, kad neįvedėte jokių asmeninių duomenų + „OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų Stabdyti Trasa įrašoma @@ -561,10 +561,10 @@ Šiandien nenaudoti Mobilusis internetas - Pranešimams apie žemėlapių naujinius ir pataisų įkėlimui reikalingas mobilusis internetas. + Pranešimams apie žemėlapių naujinius ir pataisų įkėlimui reikalingas mobilusis internetas Niekada nenaudoti Visada klausti - Jeigu norite matyti eismo duomenis, reikia atnaujinti žemėlapius. + Jeigu norite matyti eismo duomenis, reikia atnaujinti žemėlapius Padidinti žemėlapio užrašų šrifto dydį Atnaujinkite „CoMaps“ @@ -574,7 +574,7 @@ Bendro pobūdžio atsiliepimas Balso instrukcijoms naudojame sistemos šnekos sintezatorių. Dauguma „Android“ įrenginių naudoja „Google“ šnekos sintezatorių, kurį galite atsisiųsti ar atnaujinti iš „Google Play“ parduotuvės (https://play.google.com/store/apps/details?id=com.google.android.tts) Kai kurioms kalboms gali tekti įdiegti papildomą šnekos sintezatorių ar kalbos paketą iš programėlių parduotuvės („Google Play“, „Galaxy Store“, „AppGallery“, „FDroid“). \nAtverkite įrenginio nustatymus → Kalbos ir įvestis → Kalba → Teksto į kalbą išvestis. \nČia galite tvarkyti šnekos sintezatoriaus nustatymus (pavyzdžiui, atsisiųsti kalbos paketą naudojimui neprisijungus) ar pasirinkti kitą šnekos sintezės modulį. - Jei norite išsamesnės informacijos, žvilgtelėkite į šią instrukciją. + Jei norite išsamesnės informacijos, žvilgtelėkite į šią instrukciją Transliteruoti užrašus lotyniškais rašmenimis Išsamesnė informacija @@ -641,7 +641,7 @@ Niekada neįspėti Energijos taupymo veiksena - Naudojamos elektros energijos tausojimas, aukojant dalį funkcionalumo. + Naudojamos elektros energijos tausojimas, aukojant dalį funkcionalumo Niekada Esant žemai įkrovai Visada @@ -801,7 +801,7 @@ Automatinė naviguojant Žymės ir trasos Vietos nustatymai - Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti. + Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti Naudotos prekės Sakyti gatvių pavadinimus Įjungus šią parinktį, bus įvardijamos gatvės ir išvažiavimai, į kuriuos siūloma sukti. @@ -816,8 +816,8 @@ Aukštas: %s LINE VK - Išbandyti balso instrukcijas (kalbos sintezę) - Patikrinkite sistemos kalbos sintezės garsumo nustatymus, jeigu dabar negirdite balso. + Išbandyti balso instrukcijas + Patikrinkite sistemos kalbos sintezės garsumo nustatymus, jeigu dabar negirdite balso %d trasa %d trasos @@ -861,4 +861,43 @@ https://www.instagram.com/comaps.app/ Panoramax vaizdas Išsaugota + Codeberg + Liniuotė + Bluesky + Kairiojo mygtuko funkcija + Neturite jokių žymių ar trasų atsarginei kopijai sudaryti + Automatinis atsarginis kopijavimas + Pasirinktas atsarginių kopijų aplankas nepasiekiamas, bent jau rašymui. Pasirinkite kitą aplanką. + Būsime dėkingi, jei atsiųsti klaidos pranešimą:\n - programos nustatymuose pažymėkite „Įgalinti derinimo žurnalą“\n - atkartokite problemą\n - „Žinyno ir pagalbos“ ekrane bakstelėkite mygtuką „Pranešti apie klaidą“ ir išsiųskite pranešimą el. paštu ar per pokalbių programėlę\n - išjunkite derinimo žurnalą + Dviračiu + Žymių ir trasų atsarginis kopijavimas + Aukštų skaičius (skaičiuojant pirmą aukštą, neskaičiuojant stogo) + Aukštas (0 reiškia pirmą aukštą) + Įveskite leistiną aukšto numerį + Įveskite galiojantį „Bluesky“ paskyros vardą ar tinklalapio adresą + Įveskite galiojantį „Mastodon“ paskyros vardą ar tinklalapio adresą + Mygtukas nerodomas + Automatinis atsarginių kopijų rašymas į pasirinktą aplanką + Įrašyti dabar + Atsarginė kopija įrašoma… + Atsarginė kopija įrašyta + Nedelsiant įrašyti atsarginę kopiją + Atsarginės kopijos įrašyti nepavyko + Pasirinktas aplankas nepasiekiamas + Paskiausia atsarginė kopija + Pirma pasirinkite aplanką ir suteikite teises + Saugotinų atsarginių kopijų skaičius + Kasdien + Kas savaitę + Išjungtas (tik rankiniu būdu) + Atsarginių kopijų aplankas + Išvalyti + Maršruto tipas + Automobiliu + Pėsčiomis + Žymės spalva + Žinynas ir pagalba + Dabar atidaryta + Dabar uždaryta + %s val. diff --git a/android/app/src/main/res/values-ml/strings.xml b/android/app/src/main/res/values-ml/strings.xml index 06c1a3097..3552dbbc5 100644 --- a/android/app/src/main/res/values-ml/strings.xml +++ b/android/app/src/main/res/values-ml/strings.xml @@ -13,4 +13,5 @@ സംരക്ഷിച്ചു • ഓഫ്‌ലൈൻ, വേഗതയേറിയതും ഒതുക്കമുള്ളതും Bluesky + തിരയുക diff --git a/android/app/src/main/res/values-ml/types_strings.xml b/android/app/src/main/res/values-ml/types_strings.xml index 948d14e11..dd9cd1a91 100644 --- a/android/app/src/main/res/values-ml/types_strings.xml +++ b/android/app/src/main/res/values-ml/types_strings.xml @@ -1,4 +1,5 @@ MapsWithMe + വിലാസം/ബ്ലോക്ക് diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index d70a4a587..b31787436 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -9,7 +9,7 @@ Verwijder Download kaarten - Downloaden is mislukt. Tik om het opnieuw te proberen. + Downloaden is mislukt, tik om het opnieuw te proberen. Downloaden… @@ -29,7 +29,7 @@ Beperkte nauwkeurigheid - Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen. + Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen Toon op de kaart @@ -88,7 +88,7 @@ Kaarten opslaan in - Selecteer de map waar kaarten naar gedownload worden. + Selecteer de map waar kaarten naar gedownload worden Kaarten @@ -179,9 +179,9 @@ Je locatie is nog niet vastgesteld - Sorry, instellingen voor kaartopslag zijn momenteel uitgeschakeld. + Sorry, instellingen voor kaartopslag zijn momenteel uitgeschakeld - De kaart wordt nu gedownload. + De kaart wordt nu gedownload Hey, kijk naar mijn huidige locatie op CoMaps! %1$s of %2$s Heeft u geen offline-kaarten? Download ze hier: https://www.comaps.app/download/ @@ -237,9 +237,9 @@ Gesproken taal - Test gesproken aanwijzingen (TTS, Text-To-Speech) + Test gesproken aanwijzingen - Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort. + Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort Niet beschikbaar Automatisch zoomen @@ -285,7 +285,7 @@ Download alles Aan het downloaden: - Stop de navigatie om de kaart te verwijderen. + Stop de navigatie om de kaart te verwijderen Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden. @@ -357,18 +357,18 @@ Schakel locatiediensten in De huidige gps-coördinaten kunnen niet worden gevonden. Schakel locatiediensten in om de route te berekenen. Route vinden mislukt - Route samenstellen mislukt. + Route samenstellen mislukt Kies een ander startpunt of een andere bestemming. Kies ander startpunt Route samenstellen mislukt. Startpunt kan niet worden gevonden. Kies een startpunt dat dichter bij een weg ligt. Kies andere bestemming Route samenstellen mislukt. Bestemming kan niet worden gevonden. - Kies een bestemming die dichter bij een weg ligt. - Kan de tussenstop niet vinden. - Gelieve uw tussenstop aan te passen. + Kies een bestemming die dichter bij een weg ligt + Kan de tussenstop niet vinden + Gelieve uw tussenstop aan te passen Systeemfout - Route samenstellen mislukt door een applicatiefout. + Route samenstellen mislukt door een applicatiefout Probeer het opnieuw Niet nu Wilt u de kaart downloaden en een betere route samenstellen die meer dan één kaart beslaat? @@ -382,17 +382,17 @@ Verberg Categorieën Geschiedenis - Sorry, geen resultaten gevonden. + Sorry, geen resultaten gevonden Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen. Zoekgeschiedenis - Snel toegang tot recente zoekopdrachten. + Snel toegang tot recente zoekopdrachten Wis zoekgeschiedenis Uw locatie Start Van Route naar - Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie. + Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie Wilt u een route plannen vanaf uw huidige locatie? Volgende @@ -462,14 +462,14 @@ E-mailadres of gebruikersnaam Voeg telefoonnummer toe Verdieping - Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd. + Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd Update kaarten Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen. Vind een kaart - Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet. + Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet Niet genoeg ruimte Verwijder overbodige gegevens - Inlogfout. + Inlogfout Gecontroleerde wijzigingen Sleep de kaart om het kruis op de locatie van de plaats of het bedrijf te plaatsen. Bewerken @@ -486,11 +486,11 @@ Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld. \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken! - Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren. + Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren %1$d van %2$d Downloaden via een mobiele gegevensverbinding? - Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn. + Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn Voer een geldig huisnummer in Het gebouw mag niet meer dan %d verdiepingen hebben @@ -513,8 +513,8 @@ Kun je geen geschikte categorie vinden? Met CoMaps kun je alleen eenvoudige puntcategorieën toevoegen, dus geen steden, wegen, meren, contouren van gebouwen, enzovoort. Voeg zulke categorieën direct toe aan OpenStreetMap.org. Bekijk onze gids voor gedetailleerde stap voor stap instructies. U hebt geen kaarten gedownload - Download kaarten om een locatie te zoeken en offline te navigeren. - Huidige locatie is onbekend. + Download kaarten om een locatie te zoeken en offline te navigeren + Huidige locatie is onbekend m @@ -553,8 +553,8 @@ Wil je het naar alle gebruikers sturen? - Controleer dat je geen persoonlijke gegevens hebt ingevoerd. - OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben. + Controleer dat je geen persoonlijke gegevens hebt ingevoerd + OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben Stop Het spoor opnemen @@ -568,10 +568,10 @@ Gebruik vandaag niet Mobiel internet - Mobiel internet is vereist voor het weergeven van gedetailleerde informatie over plaatsen, zoals foto\'s, prijzen en beoordelingen. + Mobiel internet is vereist voor kaart update notificaties en uploaden van wijzigingen Gebruik nooit Vraag altijd - Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden. + Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden Vergroot lettergrootte op de kaart Gelieve CoMaps bij te werken @@ -581,7 +581,7 @@ Algemene feedback We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak engine selecteren. - Gelieve deze handleiding te lezen voor meer informatie. + Gelieve deze handleiding te lezen voor meer informatie Transliteratie in het Latijnse alfabet Meer informatie @@ -660,7 +660,7 @@ Waarschuw nooit Energiebesparende modus - Probeer batterijgebruik te verminderen ten koste van enkele functionaliteit. + Probeer batterijgebruik te verminderen ten koste van enkele functionaliteit Nooit Wanneer batterij bijna leeg is Maximale energiebesparing diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml index 49dabef87..4f5d7108b 100644 --- a/android/app/src/main/res/values-nl/types_strings.xml +++ b/android/app/src/main/res/values-nl/types_strings.xml @@ -1408,4 +1408,9 @@ Zoutmoeras Mangrove Wad + Bagagekluis + Overdekte fietsenstalling + Post partner + Escaperoom + Boswachterkantoor diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/app/src/main/res/values-pl/types_strings.xml index c0d76653f..c3cf439a9 100644 --- a/android/app/src/main/res/values-pl/types_strings.xml +++ b/android/app/src/main/res/values-pl/types_strings.xml @@ -1408,4 +1408,5 @@ Wyciąg T-bar Barierka ochronna Stacja metra + Zadaszony parking dla rowerów diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml index 87a3bf357..6a925860a 100644 --- a/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/android/app/src/main/res/values-pt-rBR/strings.xml @@ -23,9 +23,9 @@ Buscar - Procurar mapa + Buscar no mapa - Atualmente todos os serviços de localização para este dispositivo ou aplicativo estão desativados. Por favor ative-os em configurações. + No momento, todos os Serviços de Localização deste dispositivo ou aplicativo estão desativados. Ative-os nas Configurações. Para garantir uma navegação precisa, ative a opção \"Melhorar Precisão de local\" nas configurações @@ -36,7 +36,7 @@ Tentar novamente Sobre o CoMaps - Um projeto aberto, movido pela comunidade + Projeto aberto desenvolvido pela comunidade • Fácil de usar e elegante diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml index 09e60d34e..cff0bb396 100644 --- a/android/app/src/main/res/values-pt-rBR/types_strings.xml +++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml @@ -11,15 +11,15 @@ Telecabine Teleférico híbrido Estação de teleférico - Via aérea + Infraestrutura aérea Aeroporto ou aeródromo Aeroporto internacional Plataforma de estacionamento de aviões Portão de embarque Heliponto - Pista de aeroporto ou aeródromo - Pista de rolagem - Aerogare de passageiros + Pista de pouso e decolagem + Pista de táxi + Terminal Amenidades Caixa eletrônico Banco @@ -27,7 +27,7 @@ Assento Bicicletário Aluguel de bicicletas - Oficina de conserto de bicicletas + Estação de reparo de bicicletas Biergarten Bordel Casa de câmbio diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index 8e4388dc4..51e08b54d 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -9,7 +9,7 @@ Eliminar Descarregar mapas - O descarregamento falhou, toque novamente para tentar de novo. + O descarregamento falhou, toque para tentar novamente A descarregar… @@ -29,7 +29,7 @@ Precisão limitada - Para garantir uma navegação precisa, active a opção Localização precisa nas definições. + Para garantir uma navegação precisa, active a opção Localização precisa nas definições Mostrar no mapa @@ -88,7 +88,7 @@ Guardar mapas em - Selecione uma pasta para onde os mapas devem ser descarregados. + Selecione uma pasta para onde os mapas devem ser descarregados Mapas Descarregados @@ -167,9 +167,9 @@ A sua localização ainda não foi determinada - Lamentamos, as definições do armazenamento do mapa estão atualmente desativadas. + Lamentamos, as definições do armazenamento do mapa estão atualmente desativadas - O descarregamento do país está a ser feito neste momento. + O descarregamento do país está a ser feito neste momento Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s Não tem um mapa offline instalado? Descarregue em https://www.comaps.app/download/ @@ -227,7 +227,7 @@ Testar Direções por Voz - Verifica o volume ou as definições de conversão de texto em voz do sistema se não ouvires a voz agora. + Verifica o volume ou as definições de conversão de texto em voz do sistema se não ouvires a voz agora Não disponível Ampliação automática @@ -273,7 +273,7 @@ Descarregar tudo A descarregar: - Para eliminar o mapa, por favor pare a navegação. + Para eliminar o mapa, por favor pare a navegação Só podem ser criados trajetos que estejam completamente contidos num único mapa. @@ -345,18 +345,18 @@ Ative os serviços de localização Não foi possível localizar as coordenadas do GPS. Ative os serviços de localização para que o trajeto seja criado. Não foi possível encontrar uma rota - Não foi possível criar uma rota. + Não foi possível criar uma rota Ajuste o ponto de partida ou o ponto de chegada. Ajuste o ponto de partida A rota não foi criada, porque não foi possível localizar o ponto de partida. Selecione um ponto de partida mais perto de uma estrada. Ajuste o ponto de chegada A rota não foi criada, porque não foi possível localizar o ponto de chegada. - Selecione um ponto de chegada mais perto de uma estrada. - Não foi possível localizar o ponto intermédio. - Ajuste o ponto intermédio. + Selecione um ponto de chegada mais perto de uma estrada + Não foi possível localizar o ponto intermédio + Ajuste o ponto intermédio Erro de sistema - Não foi possível criar uma rota devido a um erro na aplicação. + Não foi possível criar uma rota devido a um erro na aplicação Tente novamente Agora não Quer descarregar o mapa e traçar uma rota melhor, mas que se estenda por mais de um mapa? @@ -370,11 +370,11 @@ Ocultar Categorias Histórico - Lamento, mas não foram encontrados resultados. + Lamento, mas não foram encontrados resultados Descarregue a região onde está a pesquisar ou tente adicionar o nome de uma cidade ou aldeia próxima. Histórico de pesquisas - Ver as pesquisas recentes. + Ver as pesquisas recentes Limpar histórico de pesquisas Wikipédia @@ -382,7 +382,7 @@ Iniciar De Itinerário para - Só é possível navegar a partir da sua localização atual. + Só é possível navegar a partir da sua localização atual Quer planear uma rota a partir da sua localização atual? Próxima @@ -447,14 +447,14 @@ Email ou nome de utilizador Andar - Todas as alterações ao mapa serão eliminadas juntamente com o mapa. + Todas as alterações ao mapa serão eliminadas juntamente com o mapa Atualizar mapas Para criar um itinerário é necessário atualizar todos os mapas e, em seguida, planeá-lo novamente. Encontrar o mapa - Por favor, verifique as suas opções e certifique-se que o dispositivo está ligado à Internet. + Por favor, verifique as suas opções e certifique-se que o dispositivo está ligado à Internet Não tem espaço suficiente Por favor, remova os dados desnecessários - Erro de início de sessão. + Erro de início de sessão Alterações verificadas Mova o mapa para colocar a cruz na localização da empresa ou do local. Edição @@ -471,11 +471,11 @@ Dados do OpenStreetMap criados pela comunidade até %s. Sabe mais sobre como editar e atualizar o mapa em OpenStreetMap.org O OpenStreetMap.org (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do CoMaps e funciona de forma semelhante à Wikipedia. Pode adicionar ou editar locais e estes ficam disponíveis para milhões de utilizadores no mundo todo. \nJunte-se à comunidade e ajude a criar um mapa melhor para todos! - Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo. + Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo %1$d de %2$d Descarregar utilizando uma conexão de rede de telemóveis? - Isto pode ser muito caro com alguns planos ou em roaming. + Isto pode ser muito caro com alguns planos ou em roaming Introduza um número de endereço correto O número de pisos não pode ser maior que %d @@ -498,8 +498,8 @@ Não encontra uma categoria adequada? O CoMaps permite-lhe adicionar apenas categorias de pontos simples, ou seja, nada de cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente ao OpenStreetMap.org. Consulte o nosso guia para instruções detalhadas passo a passo. Não descarregou quaisquer mapas - Descarregar mapas para encontrar a localização e navegar offline. - A localização atual é desconhecida. + Descarregar mapas para encontrar a localização e navegar offline + A localização atual é desconhecida m @@ -531,8 +531,8 @@ Quer enviar para todos os utilizadores? - Certifique-se que não incluiu nenhuns dados pessoais. - Os editores do OpenStreetMap verificarão as alterações e entrarão em contacto consigo se tiverem alguma dúvida. + Certifique-se que não incluiu nenhuns dados pessoais + Os editores do OpenStreetMap verificarão as alterações e entrarão em contacto consigo se tiverem alguma dúvida Parar Registar a pista @@ -546,10 +546,10 @@ Não utilizar hoje Dados móveis - Para visualizar informações detalhadas sobre os locais, tais como fotografias, preços e avaliações, é necessário acesso à internet móvel. + Para visualizar informações detalhadas sobre os locais, tais como fotografias, preços e avaliações, é necessário acesso à internet móvel Nunca utilizar Perguntar sempre - Para ver os dados de tráfego, os mapas têm de ser atualizados. + Para ver os dados de tráfego, os mapas têm de ser atualizados Aumentar tamanho da fonte no mapa Atualize o CoMaps @@ -559,7 +559,7 @@ Opinão geral Utilizamos o sistema TTS para as instruções de voz. Muitos dispositivos Android usam o Google TTS, pode transferir ou atualizá-lo a partir do Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) Para alguns idiomas, precisará de instalar outro sintetizador de voz ou um pacote de idiomas adicional a partir da loja de aplicações (Google Play, Galaxy Store, App Gallery, FDroid). Abra as Configurações do seu dispositivo → Idioma e entrada → Voz → Saída de texto para voz. Aqui pode gerir as configurações de síntese de voz (por exemplo, transferir um pacote de idioma para poder utilizá-lo sem estar ligado à Internet) ou selecionar outro motor de texto para voz. - Para obter mais informações, consulte este guia. + Para obter mais informações, consulte este guia Transliteração para o latim Saber mais diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index 7d2acdc1b..86df90938 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -9,7 +9,7 @@ Удалить Загрузить карты - Ошибка загрузки. Нажмите, чтобы повторить попытку. + Ошибка загрузки. Нажмите, чтобы повторить попытку Загружается… @@ -32,7 +32,7 @@ Точность местоположения ограничена - Включите в настройках точное определение местоположения. + Включите точное определение местоположения в настройках Показать на карте @@ -91,7 +91,7 @@ Сохранять карты в - Выберите папку куда загружать карты. + Выберите место размещения карт Загруженные карты @@ -182,7 +182,7 @@ Ваше местоположение ещё не определено - Извините, настройки места хранения карт сейчас недоступны. + Извините, выбор места размещения карт сейчас недоступен Идет процесс загрузки карт. @@ -240,9 +240,9 @@ Язык подсказок - Протестировать голосовые подсказки (TTS, Text-To-Speech) + Попробовать голосовые подсказки - Проверьте громкость или системные настройки преобразования текста в речь, если сейчас ничего не слышно. + Проверьте громкость или системные настройки преобразования текста в речь, если сейчас ничего не слышно Не доступны Автомасштабирование @@ -387,11 +387,11 @@ Скрыть Категории История - К сожалению, мы ничего не нашли. + Ничего не нашлось Загрузите регион, в котором ищете, или попробуйте добавить название близлежащего города/деревни. История поиска - Быстрый доступ к последним поисковым запросам. + Быстрый доступ к последним поисковым запросам Очистить историю поиска Википедия @@ -399,7 +399,7 @@ Начать Отсюда Сюда - Навигация возможна только из текущего местоположения. + Навигация возможна только от текущего местоположения Хотите перестроить маршрут от вашего местоположения? Далее @@ -471,14 +471,14 @@ Этаж Этаж: %s - Вместе с картой удалятся и внесённые вами правки на этой карте. + Вместе с картой будут удалены и все внесённые вами правки Обновите карты Для построения маршрутов необходимо обновить все карты и построить маршрут заново. Найти карту Проверьте настройки и убедитесь, что устройство подключено к интернету. Недостаточно места Удалите ненужные данные - Произошла ошибка при авторизации. + Не удалось войти Учтённые правки Перетащите карту, чтобы поместить крестик на место расположения добавляемого объекта или заведения. Редактирование @@ -504,7 +504,7 @@ Количество этажей не должно превышать %d Почтовый индекс - Введите корректный почтовый индекс + Введите валидный почтовый индекс Точка на карте @@ -523,7 +523,7 @@ CoMaps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте OpenStreetMap.org. Также рекомендуем ознакомиться с нашими подробными пошаговыми инструкциями и другими приложениями для редактирования карты. У вас нет загруженных карт Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета. - Местоположение не найдено. + Текущее местоположение неизвестно м @@ -562,7 +562,7 @@ Отправить всем пользователям? - Убедитесь, что вы не ввели личные данные. + Убедитесь, что вы не указали никаких личных данных Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы. Cтоп @@ -590,7 +590,7 @@ Отправить отзыв Подсказки озвучиваются системным синтезатором речи (TTS). На многих устройствах используется Google TTS, его можно загрузить или обновить в Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) Для некоторых языков, возможно, необходимо установить дополнительный синтезатор речи (TTS) из магазина приложений (Google Play, Galaxy Store, App Gallery, FDroid). \nЧтобы настроить синтезатор речи, перейдите в Настройки → Язык и ввод → Синтез речи. \nЗдесь можно установить дополнительные языковые пакеты или выбрать синтезатор речи. - Более подробная информация — в этом руководстве. + Ознакомьтесь с подробностями в этом руководстве Транслитерация в латиницу Узнать больше @@ -772,7 +772,7 @@ Ошибка подключения Отсоедините USB кабель - Держи экран включённым + Держать экран включенным Если эта функция включена, то при отображении карты экран будет всегда включен. @@ -897,7 +897,7 @@ Codeberg Сохранено Выключить - Настройки левой кнопки + Действие 1-й кнопки Этажей (вкл. подвалы искл. крышу) Этаж (0 это первый этаж) Введите правильный номер этажа @@ -934,4 +934,6 @@ - отключите запись логов Panoramax Фото + Открыто + Закрыто diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml index 20e9adc70..5e75e52bd 100644 --- a/android/app/src/main/res/values-sr/strings.xml +++ b/android/app/src/main/res/values-sr/strings.xml @@ -231,7 +231,7 @@ Језик гласа - Тестирај гласовне инструкције (Текст-у-говор) + Тестирај гласовне инструкције Проверите гласноћу или системска подешавања Текста-у-говор ако сада не чујете глас @@ -376,7 +376,7 @@ Сакриј Категорије Историја - Упс, нема резултата. + Упс, нема резултата Преузмите регион где вршите претрагу, или пробајте да додате име оближњег насеља. Историја претраге diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml index 955869a57..c7d741369 100644 --- a/android/app/src/main/res/values-tr/strings.xml +++ b/android/app/src/main/res/values-tr/strings.xml @@ -229,7 +229,7 @@ 3B yapılar - 3B yapılar güç tutum kipindeyken kapatılır + 3B yapılar güç tasarrufu modundayken kapatılır Sesli Yönlendirme @@ -272,7 +272,7 @@ Pusulayı kalibre etmek ve haritadaki ok yönünü düzeltmek için telefonu sekiz şeklinde hareket ettirin. - Arayüzü görmek için haritaya uzun basın + Seçenekleri görmek için haritaya tekrar basılı tutun Tümünü Güncelle @@ -352,10 +352,10 @@ — Sınır bölgelerinde rotalar konusunda dikkatli olun: uygulamamızca oluşturulan rotalar bazen izin verilmeyen yerlerdeki ülke sınırlarından geçebilir. Lütfen yolda özenli ve güvenli olun! GPS sinyalini denetle - Rota oluşturulamıyor. Şu anki GPS koordinatları tanımlanamadı. + Rota oluşturulamıyor. Mevcut GPS koordinatları belirlenemedi. Lütfen GPS sinyalinizi denetleyin. Wi-Fi\'ı etkinleştirmek konum doğruluğunu artırır. Konum hizmetlerini etkinleştir - Şu anki GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin. + Mevcut GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin. Rota belirlenemiyor Rota oluşturulamıyor. Lütfen başlangıç noktanızı veya hedefinizi ayarlayın. @@ -595,7 +595,7 @@ Bir hedef noktası eklemek için aramayı kullanın veya haritaya dokunun Rotayı yönet - Plan + Hesapla Durağı Kaldır Ara nokta ekle @@ -663,7 +663,7 @@ Her zaman uyar Hiçbir zaman uyarma - Düşük güç modu + Güç tasarrufu modu Kimi işlevler pahasına olsa da güç kullanımını düşürmeyi dener. Asla Pil düşükken @@ -787,7 +787,7 @@ Bir yazılım mühendisi / geliştirici tanıyorsanız, ondan ihtiyacınız olan bir özelliği uygulamaya eklemesini isteyebilirsiniz. - Herhangi bir şeyi seçmek için haritaya dokunun. Uzun dokunarak arayüz gizlenip gösterilebilir. + Herhangi bir şeyi seçmek için haritada üzerine dokunun. Ekrandaki seçenekleri gizlemek ve geri getirmek için ise basılı tutun. Haritada şu anki konumunuzu seçebileceğinizi biliyor musunuz? @@ -915,7 +915,7 @@ Saklanacak yedekleme sayısı Cetvel Yer imi rengi - Şimdi aç + Şu an açık Şimdi kapandı %s\'da Yer imleri ve izlerin yedeği diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml index 213ffe7f9..0b6ab281f 100644 --- a/android/app/src/main/res/values-uk/types_strings.xml +++ b/android/app/src/main/res/values-uk/types_strings.xml @@ -1124,7 +1124,7 @@ Універмаг Будівельний магазин Хімчистка - Електротехнiка + Електротехніка Секс-шоп Магазин тканин Магазин фермерських продуктів diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/app/src/main/res/values-zh/types_strings.xml index f64e64d8a..f6590c76b 100644 --- a/android/app/src/main/res/values-zh/types_strings.xml +++ b/android/app/src/main/res/values-zh/types_strings.xml @@ -1136,8 +1136,8 @@ 洗衣店 商场 按摩院 - 手机专卖店 - 商店 + 手机店 + 借贷机构 摩托车商店 摩托车维修 唱片店 @@ -1401,4 +1401,16 @@ 火坑 起重机 地铁车站 + 有顶棚自行车停车处 + 行李寄存点 + 宗教用地 + 盐沼 + 潮汐盐沼 + 湿地 + 芦苇地 + 密室逃脱 + 沼泽 + 红树林 + 潮汐平原 + 护林站 diff --git a/data/countries-strings/cs.json/localize.json b/data/countries-strings/cs.json/localize.json index 2b20a8235..123abd009 100644 --- a/data/countries-strings/cs.json/localize.json +++ b/data/countries-strings/cs.json/localize.json @@ -1582,7 +1582,7 @@ "Egypt Description":"Káhira, Alexandrie", "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate", "Equatorial Guinea Description":"Malabo", -"Eritrea Description":"Asmara", +"Eritrea Description":"Asmara, Keren, Omhajer", "Estonia_East Description":"Põltsamaa linn, Võru, Tartu", "Estonia_West Description":"Tallinn, Pärnu, Maardu", "Ethiopia Description":"Addis Abeba", @@ -1781,7 +1781,7 @@ "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields", "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", +"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti", "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", "India_Maharashtra Description":"Bombaj", "India_Manipur Description":"Imphal, Imphal, Jiribam", @@ -1817,7 +1817,7 @@ "Isle of Man Description":"Douglas, Onchan", "Israel Description":"Tel Aviv", "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto", -"Italy_Aosta Valley Description":"Quart, Aosta, Aosta", +"Italy_Aosta Valley Description":"Quart, Aosta", "Italy_Apulia Description":"Bari, Taranto, Foggia", "Italy_Basilicata Description":"Potenza, Matera, Melfi", "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza", @@ -1975,9 +1975,9 @@ "Nagorno-Karabakh Description":"Chankendi, Šuša, Lačin", "Namibia Description":"Windhoek", "Nauru Description":"Yaren, Buada, Orro", -"Nepal_Kathmandu Description":"Káthmándú, Káthmándú", +"Nepal_Kathmandu Description":"Káthmándú, Pátan", "Nepal_Madhyamanchal Description":"Bharatpur, Birganj", -"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar", +"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar", "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City", "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen", "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten", @@ -2079,8 +2079,8 @@ "Russia_Astrakhan Oblast Description":"Astrachaň", "Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat", "Russia_Belgorod Oblast Description":"Bělgorod", -"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы", -"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида", +"Russia_Bryansk Oblast Description":"Brjansk, Novozybkov, Klincy", +"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Džida", "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali", "Russia_Chelyabinsk Oblast Description":"Čeljabinsk, Magnitogorsk", "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek", @@ -2088,7 +2088,7 @@ "Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak", "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", "Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya", -"Russia_Jewish Autonomous Oblast Description":"Birobidžan", +"Russia_Jewish Autonomous Oblast Description":"Birobidžan, Oblučje, Nikolajevka", "Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan", "Russia_Kaliningrad Oblast Description":"Kaliningrad", "Russia_Kaluga Oblast Description":"Obninsk", @@ -2102,9 +2102,9 @@ "Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya", "Russia_Krasnodar Krai Description":"Krasnodar, Novorossiysk, Armavir", "Russia_Krasnodar Krai_Adygeya Description":"Soči, Majkop", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский", +"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Jenisejská oblast", "Russia_Krasnoyarsk Krai_South Description":"Krasnojarsk", -"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши", +"Russia_Kurgan Oblast Description":"Kurgan, Šadrinsk, Vargaši", "Russia_Kursk Oblast Description":"Kurčatov", "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo", "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin", @@ -2120,7 +2120,7 @@ "Russia_North Ossetia-Alania Description":"Vladikavkaz", "Russia_Novgorod Oblast Description":"Velký Novgorod", "Russia_Novosibirsk Oblast Description":"Novosibirsk", -"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль", +"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul", "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk", "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk", "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy", @@ -2140,7 +2140,7 @@ "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk", "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran", "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo", -"Russia_Smolensk Oblast Description":"Smolensk", +"Russia_Smolensk Oblast Description":"Smolensk, Vjazma, Roslavl", "Russia_Stavropol Krai Description":"Pjatigorsk", "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Jekatěrinburg", "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk", @@ -2470,13 +2470,13 @@ "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno", "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka", "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets", -"Ukraine_Vinnytsia Oblast Description":"Vinnycja", +"Ukraine_Vinnytsia Oblast Description":"Vinnycja, Vorošilovka, Žmerynka", "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk", "Ukraine_Zakarpattia Oblast Description":"Užhorod, Mukačevo, Chust", "Ukraine_Zaporizhia Oblast Description":"Záporoží", "Ukraine_Zhytomyr Oblast Description":"Žytomyr", "United Arab Emirates Description":"Abú Dhabí", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", +"United States Virgin Islands Description":"Frederiksted, Christiansted", "Uruguay Description":"Montevideo, Ciudad de la Costa, Salto", "Uzbekistan Description":"Taškent", "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", @@ -2484,7 +2484,7 @@ "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal", "Vietnam Description":"Hanoj, Ho Či Minovo Město", "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai", -"Yemen Description":"San'á", +"Yemen Description":"Saná, Aden", "Zambia Description":"Lusaka, Kitwe, Ndola", "Zimbabwe Description":"Harare, Hwange, Masvingo", "United States of America Short":"USA", diff --git a/data/countries-strings/de.json/localize.json b/data/countries-strings/de.json/localize.json index cd658b70a..55eff9c9d 100644 --- a/data/countries-strings/de.json/localize.json +++ b/data/countries-strings/de.json/localize.json @@ -86,7 +86,7 @@ "Brazil_Parana":"Paraná", "Brazil_Rio Grande do Norte":"Rio Grande do Norte", "Brazil_Santa Catarina":"Santa Catarina", -"Brazil_South Region":"Süden", +"Brazil_South Region":"Süd Brasilien", "Brazil_Southeast Region_Espirito Santo":"Espírito Santo", "Brazil_Southeast Region_Minas Gerais_Contagem":"Minas Gerais — Contagem", "Brazil_Southeast Region_Minas Gerais_North":"Minas Gerais — Norden", @@ -105,7 +105,7 @@ "Cameroon":"Kamerun", "Cameroon_Central":"Kamerun — Mitte", "Cameroon_West":"Kamerun — Westen", -"Campo de Hielo Sur":"Campo de Hielo Sur", +"Campo de Hielo Sur":"Südpatagonisches Eisfeld", "Canada":"Kanada", "Canada_Alberta":"Alberta", "Canada_Alberta_Edmonton":"Edmonton", @@ -149,7 +149,7 @@ "Canada_Ontario_Kingston":"Kingston", "Canada_Ontario_London":"London", "Canada_Ontario_Northeastern_Central":"Timmins", -"Canada_Ontario_Northeastern_North":"Elchfabrik", +"Canada_Ontario_Northeastern_North":"Moose Factory", "Canada_Ontario_Northeastern_S":"Greater Sudbury", "Canada_Ontario_Northeastern_SE":"North Bay", "Canada_Ontario_Northeastern_SW":"Sault Ste. Marie", @@ -207,7 +207,7 @@ "China_Shanghai":"Shanghai", "China_Shanxi":"Shanxi", "China_Sichuan":"Sichuan", -"China_Tibet Autonomous Region":"Autonomes Gebiet Tibet", +"China_Tibet Autonomous Region":"Tibet", "China_Xinjiang":"Xinjiang", "China_Yunnan":"Yunnan", "China_Zhejiang":"Zhejiang", @@ -227,27 +227,27 @@ "Cuba":"Kuba", "Cyprus":"Zypern", "Czech Republic":"Tschechien", -"Czech_Jihovychod_Jihomoravsky kraj":"Jihomoravský kraj", -"Czech_Jihovychod_Kraj Vysocina":"Kraj Vysočina", -"Czech_Jihozapad_Jihocesky kraj":"Jihočeský kraj", -"Czech_Jihozapad_Plzensky kraj":"Plzeňský kraj", -"Czech_Karlovasky kraj":"Karlovarský kraj", -"Czech_Moravskoslezsko":"Moravskoslezský kraj", -"Czech_Olomoucky kraj":"Olomoucký kraj", +"Czech_Jihovychod_Jihomoravsky kraj":"Region Südmähren", +"Czech_Jihovychod_Kraj Vysocina":"Region Hochland", +"Czech_Jihozapad_Jihocesky kraj":"Region Südböhmen", +"Czech_Jihozapad_Plzensky kraj":"Region Pilsen", +"Czech_Karlovasky kraj":"Region Karlsbad", +"Czech_Moravskoslezsko":"Region Mährisch-Schlesien", +"Czech_Olomoucky kraj":"Region Olmütz", "Czech_Praha":"Prag", -"Czech_Severovychod_Kralovehradecky kraj":"Královéhradecký kraj", -"Czech_Severovychod_Liberecky kraj":"Liberecký kraj", -"Czech_Severovychod_Pardubicky kraj":"Pardubický kraj", -"Czech_Stredni Cechy_East":"Středočeský kraj — Osten", -"Czech_Stredni Cechy_West":"Středočeský kraj — Westen", -"Czech_Ustecky kraj":"Ústecký kraj", -"Czech_Zlinsky Kraj":"Zlínský kraj", +"Czech_Severovychod_Kralovehradecky kraj":"Region Königgrätz", +"Czech_Severovychod_Liberecky kraj":"Region Reichenberg", +"Czech_Severovychod_Pardubicky kraj":"Region Pardubitz", +"Czech_Stredni Cechy_East":"Mittelböhmen — Osten", +"Czech_Stredni Cechy_West":"Mittelböhmen — Westen", +"Czech_Ustecky kraj":"Region Aussig", +"Czech_Zlinsky Kraj":"Region Zlin", "Denmark":"Dänemark", -"Denmark_Capital Region of Denmark":"Region Hovedstaden", -"Denmark_Central Denmark Region":"Region Midtjylland", -"Denmark_North Denmark Region":"Region Nordjylland", -"Denmark_Region Zealand":"Region Sjælland", -"Denmark_Region of Southern Denmark":"Region Syddanmark", +"Denmark_Capital Region of Denmark":"Hauptstadtregion", +"Denmark_Central Denmark Region":"Region Mitteljütland", +"Denmark_North Denmark Region":"Region Nordjütland", +"Denmark_Region Zealand":"Region Seeland", +"Denmark_Region of Southern Denmark":"Region Süddänemark", "Djibouti":"Dschibuti", "Dominica":"Dominica", "Dominican Republic":"Dominikanische Republik", @@ -334,7 +334,7 @@ "France_Lower Normandy_Calvados":"Département Calvados", "France_Lower Normandy_Manche":"Département Manche", "France_Lower Normandy_Orne":"Département Orne", -"France_Midi-Pyrenees":"Midi-Pyrénées", +"France_Midi-Pyrenees":"Midi-Pyrenäen", "France_Midi-Pyrenees_Ariege":"Département Ariège", "France_Midi-Pyrenees_Aveyron":"Département Aveyron", "France_Midi-Pyrenees_Gers":"Département Gers", @@ -438,7 +438,7 @@ "Ghana":"Ghana", "Gibraltar":"Gibraltar", "Greece":"Griechenland", -"Greece_Decentralized Administration of Aegean":"Ägäisregion", +"Greece_Decentralized Administration of Aegean":"Ägäis", "Greece_Decentralized Administration of Attica":"Attika", "Greece_Decentralized Administration of Crete":"Kreta", "Greece_Decentralized Administration of Epirus - Western Macedonia":"Epirus und Westmakedonien", @@ -513,7 +513,7 @@ "Ireland_Connacht":"Connacht", "Ireland_Leinster":"Leinster", "Ireland_Munster":"Munster", -"Ireland_Northern Counties":"Provinz Ulster", +"Ireland_Northern Counties":"Ulster", "Isle of Man":"Isle of Man", "Israel":"Israel", "Israel Region":"Israel", @@ -794,13 +794,13 @@ "Qatar":"Katar", "Republic of Kosovo":"Kosovo", "Romania":"Rumänien", -"Romania_Centre":"Centru", -"Romania_North_East":"Nord-Est", -"Romania_North_West":"Nord-Vest", -"Romania_South":"Sud", -"Romania_South_East":"Sud-Est", -"Romania_South_West":"Sud-Vest", -"Romania_West":"Vest", +"Romania_Centre":"Zentrum", +"Romania_North_East":"Nord-Osten", +"Romania_North_West":"Nord-Westen", +"Romania_South":"Süden", +"Romania_South_East":"Süd-Osten", +"Romania_South_West":"Süd-Westen", +"Romania_West":"Westen", "Russia_Altai Krai":"Region Altai", "Russia_Altai Republic":"Republik Altai", "Russia_Amur Oblast":"Oblast Amur", @@ -889,11 +889,11 @@ "Russian Federation":"Russland", "Rwanda":"Ruanda", "Sahrawi Arab Democratic Republic":"Demokratische Arabische Republik Sahara", -"Saint Barthelemy":"Saint-Barthélemy", +"Saint Barthelemy":"Sankt Bartholomäus", "Saint Helena Ascension and Tristan da Cunha":"St. Helena, Ascension und Tristan da Cunha", "Saint Kitts and Nevis":"St. Kitts und Nevis", "Saint Lucia":"St. Lucia", -"Saint Martin":"Saint-Martin", +"Saint Martin":"St. Martin", "Saint Vincent and the Grenadines":"St. Vincent und die Grenadinen", "Samoa":"Samoa", "San Marino":"San Marino", @@ -905,14 +905,14 @@ "Sierra Leone":"Sierra Leone", "Singapore":"Singapur", "Slovakia":"Slowakei", -"Slovakia_Region of Banska Bystrica":"Banskobystrický kraj", -"Slovakia_Region of Bratislava":"Bratislavský kraj", -"Slovakia_Region of Kosice":"Košický kraj", -"Slovakia_Region of Nitra":"Nitriansky kraj", -"Slovakia_Region of Presov":"Prešovský kraj", -"Slovakia_Region of Trencin":"Trenčiansky kraj", -"Slovakia_Region of Trnava":"Trnavský kraj", -"Slovakia_Region of Zilina":"Žilinský kraj", +"Slovakia_Region of Banska Bystrica":"Neusohler Landschaftsverband", +"Slovakia_Region of Bratislava":"Region Bratislava", +"Slovakia_Region of Kosice":"Kaschauer Landschaftsverband", +"Slovakia_Region of Nitra":"Neutraer Landschaftsverband", +"Slovakia_Region of Presov":"Eperieser Landschaftsverband", +"Slovakia_Region of Trencin":"Trentschiner Landschaftsverband", +"Slovakia_Region of Trnava":"Tyrnauer Landschaftsverband", +"Slovakia_Region of Zilina":"Silleiner Landschaftsverband", "Slovenia":"Slowenien", "Solomon Islands":"Salomonen", "Somalia":"Somalia", @@ -963,11 +963,11 @@ "Sweden":"Schweden", "Sweden_Bergslagen":"Bergslagen", "Sweden_Malardalen":"Mälardalen", -"Sweden_Mellannorrland":"Mellannorrland", +"Sweden_Mellannorrland":"Mittel-Norrland", "Sweden_Norra Sverige":"Norra Sverige", -"Sweden_Ostra Gotaland":"Ostra Götaland", -"Sweden_Sodra Gotaland":"Södra Götaland", -"Sweden_Vastra Gotaland":"Västra Götaland", +"Sweden_Ostra Gotaland":"Östliches Götaland", +"Sweden_Sodra Gotaland":"Südliches Götaland", +"Sweden_Vastra Gotaland":"Westliches Götaland", "Switzerland":"Schweiz", "Switzerland_Central":"Zentralschweiz", "Switzerland_Eastern":"Ostschweiz", @@ -1252,7 +1252,7 @@ "Norway_Nordland":"Nordland", "Norway_North Trondelag":"Nord-Trøndelag", "Norway_Rogaland":"Rogaland", -"Norway_South Trondelag":"Sør-Trøndelag", +"Norway_South Trondelag":"Süd-Trøndelag", "Peru_Lima":"Lima", "Portugal_Islands":"Insel (Portugal)", "Portugal_Viseu":"Viseu", @@ -1283,8 +1283,8 @@ "Sweden_Stockholm":"Stockholm", "Switzerland_Espace Mittelland_Bern":"Espace Mittelland — Bern", "Switzerland_Espace Mittelland_East":"Espace Mittelland — Osten", -"Taiwan_North":"Republik China (Taiwan) — Norden", -"Taiwan_South":"Republik China (Taiwan) — Süden", +"Taiwan_North":"Taiwan — Norden", +"Taiwan_South":"Taiwan — Süden", "Thailand_Central":"Thailand — Mitte", "Turkey_Central Anatolia Region_Ankara":"Zentralanatolien — Ankara", "Turkey_Central Anatolia Region_Kayseri":"Zentralanatolien — Kayseri", @@ -2088,7 +2088,7 @@ "Russia_Ingushetia Description":"Nasran, Ordschonikidsewskaja, Karabulak", "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", "Russia_Ivanovo Oblast Description":"Iwanowo, Kineschma, Schuja", -"Russia_Jewish Autonomous Oblast Description":"Birobidschan", +"Russia_Jewish Autonomous Oblast Description":"Birobidschan, Obluchye, Nikolayevka", "Russia_Kabardino-Balkaria Description":"Naltschik, Prochladny, Baksan", "Russia_Kaliningrad Oblast Description":"Kaliningrad, Sowetsk, Tschernjachowsk", "Russia_Kaluga Oblast Description":"Kaluga, Obninsk, Babynino", @@ -2102,9 +2102,9 @@ "Russia_Kostroma Oblast Description":"Kostroma, Bui, Scharja", "Russia_Krasnodar Krai Description":"Krasnodar, Noworossijsk, Armawir", "Russia_Krasnodar Krai_Adygeya Description":"Sotschi, Maikop, Gelendschik", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka", +"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy", "Russia_Krasnoyarsk Krai_South Description":"Krasnojarsk, Atschinsk, Kansk", -"Russia_Kurgan Oblast Description":"Kurgan, Schadrinsk", +"Russia_Kurgan Oblast Description":"Kurgan, Schadrinsk, Vargashi", "Russia_Kursk Oblast Description":"Kursk, Kurtschatow", "Russia_Leningradskaya Oblast_Karelsky Description":"Wyborg, Wsewoloschsk, Sertolowo", "Russia_Leningradskaya Oblast_Southeast Description":"Gattschina, Sosnowy Bor, Tichwin", @@ -2300,7 +2300,7 @@ "US_Alabama_Montgomery Description":"Creola, Centreville, Valley", "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright", "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", +"US_Arizona_Phoenix Description":"Phoenix, Mesa", "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", "US_Arkansas_North Description":"Ward, Cabot, Des Arc", "US_Arkansas_South Description":"Stamps, Rockport", @@ -2330,7 +2330,7 @@ "US_Georgia_Macon Description":"Grovetown, Perry, Byron", "US_Georgia_North Description":"Emerson, Jefferson, Cartersville", "US_Georgia_South Description":"De Soto, Santa Claus, Pearson", -"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José", +"US_Guam Description":"Dededo Flohmarkt, Tumon Golf Driving Range, San José", "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului", "US_Idaho_North Description":"Huetter, Peck, Hayden", "US_Idaho_South Description":"Arco, Middleton, Greenleaf", @@ -2438,7 +2438,7 @@ "US_Vermont Description":"Saint Albans, Barre, South Burlington", "US_Virginia_Alexandria Description":"Fairfax, Fredericksburg, Falls Church", "US_Virginia_Lynchburg Description":"Lynchburg City, Bedford, Staunton", -"US_Virginia_Norfolk Description":"Virginia Beach, Poquoson City, Franklin City", +"US_Virginia_Norfolk Description":"Virginia Beach, Poquoson, Franklin", "US_Virginia_Richmond Description":"Emporia, Colonial Heights, Richmond", "US_Virginia_Roanoke Description":"Galax, Norton, Radford City", "US_Washington_Coast Description":"Raymond, Camas, Port Townsend", @@ -2470,13 +2470,13 @@ "Ukraine_Rivne Oblast Description":"Riwne, Warasch (Kusnezowsk), Dubno", "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Schostka", "Ukraine_Ternopil Oblast Description":"Ternopil, Tschortkiw, Kremenez", -"Ukraine_Vinnytsia Oblast Description":"Winnyzja, Schmerynka", +"Ukraine_Vinnytsia Oblast Description":"Winnyzja, Woroschyliwka, Schmerynka", "Ukraine_Volyn Oblast Description":"Luzk, Kowel, Nowowolysnk", "Ukraine_Zakarpattia Oblast Description":"Uschhorod, Mukatschewe, Chust", "Ukraine_Zaporizhia Oblast Description":"Saporischschja, Melitopol, Berdjansk", "Ukraine_Zhytomyr Oblast Description":"Schytomyr, Berdytschiw, Korosten", "United Arab Emirates Description":"Abu Dhabi, Dubai", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", +"United States Virgin Islands Description":"Frederiksted, Christiansted", "Uruguay Description":"Montevideo", "Uzbekistan Description":"Taschkent", "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", @@ -2527,8 +2527,8 @@ "Brazil_Northeast Region_West Short":"Nordosten", "Brazil_Parana_East Short":"Paraná", "Brazil_Parana_West Short":"Paraná", -"Brazil_South Region_East Short":"Süden", -"Brazil_South Region_West Short":"Süden", +"Brazil_South Region_East Short":"Südosten", +"Brazil_South Region_West Short":"Südwesten", "Congo-Kinshasa Short":"Kongo", "Finland_Eastern Finland_North Short":"Ostfinnland", "Finland_Eastern Finland_South Short":"Ostfinnland", diff --git a/data/countries-strings/et.json/localize.json b/data/countries-strings/et.json/localize.json index e8a30cf08..82ccdb8c4 100644 --- a/data/countries-strings/et.json/localize.json +++ b/data/countries-strings/et.json/localize.json @@ -905,14 +905,14 @@ "Sierra Leone":"Sierra Leone", "Singapore":"Singapur", "Slovakia":"Slovakkia", -"Slovakia_Region of Banska Bystrica":"Banská Bystrica piirkond", -"Slovakia_Region of Bratislava":"Bratislava piirkond", -"Slovakia_Region of Kosice":"Košice piirkond", -"Slovakia_Region of Nitra":"Nitra piirkond", -"Slovakia_Region of Presov":"Prešovi piirkond", -"Slovakia_Region of Trencin":"Trenčíni piirkond", -"Slovakia_Region of Trnava":"Trnava piirkond", -"Slovakia_Region of Zilina":"Žilina piirkond", +"Slovakia_Region of Banska Bystrica":"Banská Bystrica maakond", +"Slovakia_Region of Bratislava":"Bratislava maakond", +"Slovakia_Region of Kosice":"Košice maakond", +"Slovakia_Region of Nitra":"Nitra maakond", +"Slovakia_Region of Presov":"Prešovi maakond", +"Slovakia_Region of Trencin":"Trenčíni maakond", +"Slovakia_Region of Trnava":"Trnava maakond", +"Slovakia_Region of Zilina":"Žilina maakond", "Slovenia":"Sloveenia", "Solomon Islands":"Saalomoni saared", "Somalia":"Somaalia", @@ -941,7 +941,7 @@ "Spain_Canary Islands":"Kanaari saared", "Spain_Cantabria":"Kantaabria", "Spain_Castile and Leon":"Kastiilia ja León", -"Spain_Castile-La Mancha":"Castile-La Mancha", +"Spain_Castile-La Mancha":"Kastiilia – La Mancha", "Spain_Catalonia_Provincia de Barcelona":"Kataloonia – Barcelona maakond", "Spain_Catalonia_Provincia de Girona":"Kataloonia – Girona maakond", "Spain_Catalonia_Provincia de Lleida":"Kataloonia – Lleida maakond", @@ -1161,7 +1161,7 @@ "Ukraine_Kherson Oblast":"Hersoni oblast", "Ukraine_Khmelnytskyi Oblast":"Hmelnõtski oblast", "Ukraine_Kirovohrad Oblast":"Kirovohradi oblast", -"Ukraine_Kyiv Oblast":"Kiievi oblast", +"Ukraine_Kyiv Oblast":"Kõjivi oblast", "Ukraine_Luhansk Oblast":"Luhanski oblast", "Ukraine_Lviv Oblast":"Lvivi oblast", "Ukraine_Mykolaiv Oblast":"Mõkolajivi oblast", @@ -1361,7 +1361,7 @@ "Argentina_Pampas Description":"Córdoba, Santa Rosa, Río Cuarto", "Argentina_Patagonia Description":"Cutral Có, Viedma, Comodoro Rivadavia", "Argentina_Santa Fe Description":"Rosario, Santa Fe, Las Parejas", -"Armenia Description":"Jerevan, Ashtarak, Gyumri", +"Armenia Description":"Jerevan, Aštarak, Gjumri", "Australia_Brisbane Description":"Brisbane, Redcliffe, Gold Coast", "Australia_Melbourne Description":"Melbourne, Geelong, Yering", "Australia_New South Wales Description":"Barham, Tuncurry, Tocumwal", @@ -1388,11 +1388,11 @@ "Bangladesh Description":"Sylhet, Dhaka, Cumilla", "Barbados Description":"Bridgetown, Oistins, Speightstown", "Belarus_Brest Region Description":"Brest, Pinsk, Baranavičy", -"Belarus_Homiel Region Description":"Gomel, Mazyr, Žłobin", -"Belarus_Hrodna Region Description":"Grodna, Lida, Vaŭkavysk", -"Belarus_Maglieu Region Description":"Magiljov, Babruisk, Tšerõkav", +"Belarus_Homiel Region Description":"Homiel, Mazyr, Žłobin", +"Belarus_Hrodna Region Description":"Hrodna, Lida, Vaŭkavysk", +"Belarus_Maglieu Region Description":"Mahiloŭ, Babruisk, Tšerõkav", "Belarus_Minsk Region Description":"Minsk, Barõssav, Salihorsk", -"Belarus_Vitebsk Region Description":"Vitsebsk, Orša, Navapolatsk", +"Belarus_Vitebsk Region Description":"Viciebsk, Orša, Navapolatsk", "Belgium_Antwerp Description":"Antwerpen, Zwijndrecht, Berchem", "Belgium_East Flanders Description":"Ghent, Deinze, Sint-Martens-Latem", "Belgium_Flemish Brabant Description":"Brüssel, Schaerbeek – Schaarbeek, Anderlecht", @@ -1926,13 +1926,13 @@ "Jersey Description":"Saint Helier, St. Saviour, St. John", "Jerusalem Description":"Jerusalemm, 'Anata, Al-Walaja", "Jordan Description":"Amman, Zarqa, Irbid", -"Kazakhstan_North Description":"Astana, Karaganda, Pavlodar", -"Kazakhstan_South Description":"Almatõ, Shymkent, Aktobe", +"Kazakhstan_North Description":"Astana, Karagandõ, Pavlodar", +"Kazakhstan_South Description":"Almatõ, Šõmkent, Aktöbe", "Kenya Description":"Nairobi, Kisumu, Kitale", "Kingdom of Lesotho Description":"Maseru, Butha-Buthe, Mohale's Hoek", "Kiribati Description":"Betio, Kabuna, Bairiki", "Kuwait Description":"Kuwait City, Al Ahmadi, Jahra", -"Kyrgyzstan Description":"Bishkek, Osh, Balykchy", +"Kyrgyzstan Description":"Biškek, Oš, Balõktšõ", "Laos Description":"Vientiane, Pakxan, Oudomxay", "Latvia Description":"Riia, Daugavpils, Liepāja", "Lebanon Description":"Beirut, Zahle, Sidon", @@ -2182,7 +2182,7 @@ "Singapore Description":"Singapur, Ladang, Rocky Hill", "Slovakia_Region of Banska Bystrica Description":"Banská Bystrica, Zvolen, Lučenec", "Slovakia_Region of Bratislava Description":"Bratislava, Petržalka, Ružinov", -"Slovakia_Region of Kosice Description":"Košice, gelnica, Michalovce", +"Slovakia_Region of Kosice Description":"Košice, Gelnica, Michalovce", "Slovakia_Region of Nitra Description":"Nitra, Nové Zámky", "Slovakia_Region of Presov Description":"Prešov, Poprad, Humenné", "Slovakia_Region of Trencin Description":"Trenčín, Prievidza, Považská Bystrica", @@ -2206,13 +2206,13 @@ "South Korea_South Description":"Busan, Daegu, Changwon", "South Ossetia Description":"Tskhinval, Khumisarta, Chitiani", "South Sudan Description":"Juba, Yambio, Leer", -"Spain_Andalusia_Granada Description":"Granada, Almeria, Jaén", -"Spain_Andalusia_Sevilla Description":"Málaga, Seville, Córdoba, Huelva, Cádiz", +"Spain_Andalusia_Granada Description":"Granada, Almería, Jaén", +"Spain_Andalusia_Sevilla Description":"Málaga, Sevilla, Córdoba, Huelva, Cádiz", "Spain_Aragon Description":"Zaragoza, Teruel, Huesca", "Spain_Balearic Islands Description":"Palma de Mallorca, Ibiza, Santa Eulària des Riu", "Spain_Basque Country Description":"Bilbao, Vitoria-Gasteiz, Donostia-San Sebastián", "Spain_Canary Islands Description":"Las Palmas de Gran Canaria, Santa Cruz de Tenerife, Arrecife", -"Spain_Cantabria Description":"Santander, Torrelavega, Castro Urdiales", +"Spain_Cantabria Description":"Santander, Torrelavega, Castro-Urdiales", "Spain_Castile and Leon_East Description":"Burgos, Valladolid, Palencia, Soria, Segovia", "Spain_Castile and Leon_West Description":"Salamanca, León, Zamora, Ávila", "Spain_Castile-La Mancha Description":"Albacete, Guadalajara, Toledo, Ciudad Real, Cuenca", @@ -2276,7 +2276,7 @@ "Turkey_Marmara Region_Istanbul Description":"Istanbul, Edirne, Tekirdağ", "Turkey_Mediterranean Region Description":"Antalya, Burdur, Antakya", "Turkey_Southeastern Anatolia Region Description":"Gaziantep, Şanlıurfa, Adıyaman", -"Turkmenistan Description":"Ashgabat, Dashoguz, Türkmenabat", +"Turkmenistan Description":"Aşgabat, Daşoguz, Türkmenabat", "Turks and Caicos Islands Description":"Cockburn Town, Providenciales, Cockburn Harbor", "Tuvalu Description":"Funafuti, Vaiaku, Tokelau", "UK_England_East Midlands Description":"Nottingham, Leicester, Derby", @@ -2461,7 +2461,7 @@ "Ukraine_Kherson Oblast Description":"Herson, Nova Kahhovka, Naddriprijanske", "Ukraine_Khmelnytskyi Oblast Description":"Hmelnõtski, Kamjanets-Podilskõi, Šepetivka", "Ukraine_Kirovohrad Oblast Description":"Kropõvnõtskõi, Oleksandrija, Svitlovodsk", -"Ukraine_Kyiv Oblast Description":"Kiiev, Bila Tserkva, Brovarõ", +"Ukraine_Kyiv Oblast Description":"Kõjiv (Kiiev), Bila Tserkva, Brovarõ", "Ukraine_Luhansk Oblast Description":"Luhansk, Altševsk, Sjevjerodonetsk", "Ukraine_Lviv Oblast Description":"Lviv, Sambir, Drohobõtš", "Ukraine_Mykolaiv Oblast Description":"Mõkolajiv, Pervomaisk, Južnoukrajinsk", diff --git a/data/countries-strings/fr.json/localize.json b/data/countries-strings/fr.json/localize.json index 1026a4d72..eb7e20422 100644 --- a/data/countries-strings/fr.json/localize.json +++ b/data/countries-strings/fr.json/localize.json @@ -1350,7 +1350,7 @@ "Andorra Description":"Andorre-la-Vieille", "Angola Description":"Luanda", "Anguilla Description":"The Valley, George Hill, Stoney Ground", -"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove", +"Antarctica Description":"McMurdo Station, Chilean research station \"Villa Las Estrellas\", Rocky Cove", "Antigua and Barbuda Description":"Saint John's", "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires", "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell", @@ -2300,7 +2300,7 @@ "US_Alabama_Montgomery Description":"Creola, Centreville, Valley", "US_Alaska Description":"Fairbanks", "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", +"US_Arizona_Phoenix Description":"Phoenix, Mesa", "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", "US_Arkansas_North Description":"Ward, Cabot, Des Arc", "US_Arkansas_South Description":"Stamps, Rockport", diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json index ea21c3a95..9cc51fc63 100644 --- a/data/countries-strings/it.json/localize.json +++ b/data/countries-strings/it.json/localize.json @@ -1853,7 +1853,7 @@ "Italy_Molise Description":"Campobasso", "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure", "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato", -"Italy_Piemont_Biella Description":"Biella, Biella, Cossato", +"Italy_Piemont_Biella Description":"Biella, Cossato", "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo", "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate", "Italy_Piemont_Torino Description":"Torino", diff --git a/data/countries-strings/nl.json/localize.json b/data/countries-strings/nl.json/localize.json index de1c05bfb..6106263e6 100644 --- a/data/countries-strings/nl.json/localize.json +++ b/data/countries-strings/nl.json/localize.json @@ -1350,7 +1350,7 @@ "Andorra Description":"Andorra", "Angola Description":"Luanda", "Anguilla Description":"The Valley, George Hill, Stoney Ground", -"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove", +"Antarctica Description":"McMurdo Station, Chilean research station \"Villa Las Estrellas”, Rocky Cove", "Antigua and Barbuda Description":"St. John's, English Harbour, Freetown", "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán", "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell", @@ -1514,7 +1514,7 @@ "China_Chongqing Description":"Chongqing", "China_Fujian Description":"Longyan, Sanming, Shaowu", "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan", -"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén", +"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen", "China_Guangxi Description":"Guigang, Dongxing, Wuzhou", "China_Guizhou Description":"Guiyang, Liupanshui, Weining", "China_Hebei Description":"Peking, Tianjin", @@ -1582,7 +1582,7 @@ "Egypt Description":"Caïro", "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate", "Equatorial Guinea Description":"Malabo, Mongomo, Bata", -"Eritrea Description":"ኣስመራ, Keren, Omhajer", +"Eritrea Description":"Asmara, Keren, Omhajer", "Estonia_East Description":"Põltsamaa linn, Võru, Tartu", "Estonia_West Description":"Tallinn, Pärnu, Maardu", "Ethiopia Description":"Addis Abeba", @@ -1781,7 +1781,7 @@ "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields", "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", +"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti", "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", "India_Maharashtra Description":"Mumbai, Pune, Nagpur", "India_Manipur Description":"Imphal, Imphal, Jiribam", @@ -1817,7 +1817,7 @@ "Isle of Man Description":"Douglas, Onchan", "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut", "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto", -"Italy_Aosta Valley Description":"Quart, Aosta, Aosta", +"Italy_Aosta Valley Description":"Quart, Aosta", "Italy_Apulia Description":"Bari, Taranto, Foggia", "Italy_Basilicata Description":"Potenza, Matera, Melfi", "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza", @@ -1839,21 +1839,21 @@ "Italy_Liguria Description":"Genoa, La Spezia, La Spezia", "Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio", "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane", -"Italy_Lombardy_Como Description":"Como, Como, Cantù", -"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco", +"Italy_Lombardy_Como Description":"Como, Cantù", +"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco", "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte", "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo", -"Italy_Lombardy_Mantua Description":"Mantua, Mantua", +"Italy_Lombardy_Mantua Description":"Mantua, Suzzara", "Italy_Lombardy_Milan Description":"Milaan", "Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno", "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella", -"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno", +"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno", "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate", "Italy_Marche Description":"Ancona, Pesaro", "Italy_Molise Description":"Campobasso, Termoli, Isernia", "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure", "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato", -"Italy_Piemont_Biella Description":"Biella, Biella, Cossato", +"Italy_Piemont_Biella Description":"Biella, Cossato", "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo", "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate", "Italy_Piemont_Torino Description":"Turijn", @@ -1975,9 +1975,9 @@ "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin", "Namibia Description":"Windhoek, Opuwo, Eenhana", "Nauru Description":"Yaren, Buada, Orro", -"Nepal_Kathmandu Description":"Kathmandu, Kathmandu", +"Nepal_Kathmandu Description":"Kathmandu, Patan", "Nepal_Madhyamanchal Description":"Bharatpur, Birganj", -"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar", +"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar", "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City", "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen", "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten", @@ -2079,8 +2079,8 @@ "Russia_Astrakhan Oblast Description":"Astrachan", "Russia_Bashkortostan Description":"Oefa", "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin", -"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы", -"Russia_Buryatia Description":"Oelan-Oede", +"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy", +"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida", "Russia_Chechen Republic Description":"Grozny, Oeroes-Martan", "Russia_Chelyabinsk Oblast Description":"Tsjeljabinsk", "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek", @@ -2088,7 +2088,7 @@ "Russia_Ingushetia Description":"Karaboelak", "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", "Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya", -"Russia_Jewish Autonomous Oblast Description":"Birobidzjan", +"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka", "Russia_Kabardino-Balkaria Description":"Naltsjik", "Russia_Kaliningrad Oblast Description":"Kaliningrad", "Russia_Kaluga Oblast Description":"Kaloega, Obninsk", @@ -2102,9 +2102,9 @@ "Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya", "Russia_Krasnodar Krai Description":"Krasnodar, Novorossiysk, Armavir", "Russia_Krasnodar Krai_Adygeya Description":"Sotsji, Majkop", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский", +"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy", "Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk", -"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши", +"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi", "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov", "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo", "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin", @@ -2120,7 +2120,7 @@ "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan", "Russia_Novgorod Oblast Description":"Veliki Novgorod", "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim", -"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль", +"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul", "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk", "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk", "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy", @@ -2140,7 +2140,7 @@ "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk", "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran", "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo", -"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl", +"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl", "Russia_Stavropol Krai Description":"Stavropol, Pjatigorsk", "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk", "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk", @@ -2300,7 +2300,7 @@ "US_Alabama_Montgomery Description":"Creola, Centreville, Valley", "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright", "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", +"US_Arizona_Phoenix Description":"Phoenix, Mesa", "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", "US_Arkansas_North Description":"Ward, Cabot, Des Arc", "US_Arkansas_South Description":"Stamps, Rockport", @@ -2330,7 +2330,7 @@ "US_Georgia_Macon Description":"Grovetown, Perry, Byron", "US_Georgia_North Description":"Emerson, Jefferson, Cartersville", "US_Georgia_South Description":"De Soto, Santa Claus, Pearson", -"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José", +"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José", "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului", "US_Idaho_North Description":"Huetter, Peck, Hayden", "US_Idaho_South Description":"Arco, Middleton, Greenleaf", @@ -2355,7 +2355,7 @@ "US_Louisiana_New Orleans Description":"Bogalusa, Gonzales, Plaquemine", "US_Maine Description":"Westbrook, Brewer, South Portland", "US_Maryland_Baltimore Description":"Baltimore, Pocomoke City, Crisfield", -"US_Maryland_and_DC Description":"Washington D.C.", +"US_Maryland_and_DC Description":"Washington, D.C., Gaithersburg, Bowie", "US_Massachusetts_Boston Description":"Boston, Lowell, Cambridge", "US_Massachusetts_Central Description":"Fitchburg, Southbridge, Leominster", "US_Massachusetts_Plymouth Description":"Brockton, New Bedford, Fall River", @@ -2470,13 +2470,13 @@ "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno", "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka", "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets", -"Ukraine_Vinnytsia Oblast Description":"Vinnytsja", +"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka", "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk", "Ukraine_Zakarpattia Oblast Description":"Uzhhorod, Mukacheve, Khust", "Ukraine_Zaporizhia Oblast Description":"Zaporizhzhia, Melitopol, Berdiansk", "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten", "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", +"United States Virgin Islands Description":"Frederiksted, Christiansted", "Uruguay Description":"Montevideo", "Uzbekistan Description":"Tasjkent", "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", @@ -2484,7 +2484,7 @@ "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal", "Vietnam Description":"Ho Chi Minhstad", "Wallis and Futuna Description":"Matâ'utu", -"Yemen Description":"Sana'a, Sanʿaʾ, Aden", +"Yemen Description":"Sana'a, Aden", "Zambia Description":"Lusaka", "Zimbabwe Description":"Harare, Hwange, Masvingo", "United States of America Short":"USA", diff --git a/data/countries-strings/pt.json/localize.json b/data/countries-strings/pt.json/localize.json index 039f18d19..e2da478a7 100644 --- a/data/countries-strings/pt.json/localize.json +++ b/data/countries-strings/pt.json/localize.json @@ -1244,7 +1244,7 @@ "Mexico_Chihuahua":"Chihuahua", "Mexico_Sonora":"Sonora", "Nepal_Kathmandu":"Catmandu", -"Nepal_Madhyamanchal":"Centro", +"Nepal_Madhyamanchal":"Região Centro", "Nepal_Purwanchal":"Região Leste", "Nigeria_North":"Nigéria — Norte", "Nigeria_South":"Nigéria — Sul", @@ -1350,7 +1350,7 @@ "Andorra Description":"Andorra-a-Velha", "Angola Description":"Luanda, Lobito, Namibe", "Anguilla Description":"The Valley, George Hill, Stoney Ground", -"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove", +"Antarctica Description":"McMurdo Station, Chilean research station “Villa Las Estrellas”, Rocky Cove", "Antigua and Barbuda Description":"Saint John's", "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán", "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell", @@ -1514,7 +1514,7 @@ "China_Chongqing Description":"Chongqing, Changshou, Kai", "China_Fujian Description":"Longyan, Sanming, Shaowu", "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan", -"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén", +"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen", "China_Guangxi Description":"Guigang, Dongxing, Wuzhou", "China_Guizhou Description":"Guiyang, Liupanshui, Weining", "China_Hebei Description":"Pequim", @@ -1582,7 +1582,7 @@ "Egypt Description":"Cairo", "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate", "Equatorial Guinea Description":"Malabo, Mongomo, Bata", -"Eritrea Description":"ኣስመራ, Keren, Omhajer", +"Eritrea Description":"Asmara, Keren, Omhajer", "Estonia_East Description":"Põltsamaa linn, Võru, Tartu", "Estonia_West Description":"Tallinn, Pärnu, Maardu", "Ethiopia Description":"Adis Abeba", @@ -1781,7 +1781,7 @@ "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields", "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", +"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti", "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", "India_Maharashtra Description":"Mumbai, Pune, Nagpur", "India_Manipur Description":"Imphal, Imphal, Jiribam", @@ -1817,7 +1817,7 @@ "Isle of Man Description":"Douglas, Onchan", "Israel Description":"Modi'in-Maccabim-Re'ut", "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto", -"Italy_Aosta Valley Description":"Quart, Aosta, Aosta", +"Italy_Aosta Valley Description":"Quart, Aosta", "Italy_Apulia Description":"Tarento", "Italy_Basilicata Description":"Potenza, Matera, Melfi", "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza", @@ -1839,21 +1839,21 @@ "Italy_Liguria Description":"Génova", "Italy_Lombardy_Bergamo Description":"Bérgamo", "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane", -"Italy_Lombardy_Como Description":"Como, Como, Cantù", -"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco", +"Italy_Lombardy_Como Description":"Como, Cantù", +"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco", "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte", "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo", -"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara", +"Italy_Lombardy_Mantua Description":"Mantua, Suzzara", "Italy_Lombardy_Milan Description":"Milão", "Italy_Lombardy_Monza and Brianza Description":"Monza", "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella", -"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno", +"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno", "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate", "Italy_Marche Description":"Ancona, Pesaro", "Italy_Molise Description":"Campobasso, Termoli, Isernia", "Italy_Piemont_Alessandria Description":"Alexandria", "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato", -"Italy_Piemont_Biella Description":"Biella, Biella, Cossato", +"Italy_Piemont_Biella Description":"Biella, Cossato", "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo", "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate", "Italy_Piemont_Torino Description":"Turim", @@ -1975,9 +1975,9 @@ "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin", "Namibia Description":"Windhoek, Opuwo, Eenhana", "Nauru Description":"Yaren, Buada, Orro", -"Nepal_Kathmandu Description":"Catmandu, Catmandu", +"Nepal_Kathmandu Description":"Kathmandu, Patan", "Nepal_Madhyamanchal Description":"Bharatpur, Birganj", -"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar", +"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar", "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City", "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen", "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten", @@ -2079,8 +2079,8 @@ "Russia_Astrakhan Oblast Description":"Astracã", "Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat", "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin", -"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы", -"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида", +"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy", +"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida", "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali", "Russia_Chelyabinsk Oblast Description":"Cheliabinsk", "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek", @@ -2088,7 +2088,7 @@ "Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak", "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", "Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya", -"Russia_Jewish Autonomous Oblast Description":"Birobidjan", +"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka", "Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan", "Russia_Kaliningrad Oblast Description":"Kaliningrado", "Russia_Kaluga Oblast Description":"Obninsk", @@ -2102,9 +2102,9 @@ "Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya", "Russia_Krasnodar Krai Description":"Krasnodar, Novorossiysk, Armavir", "Russia_Krasnodar Krai_Adygeya Description":"Sóchi", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский", +"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy", "Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk", -"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши", +"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi", "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov", "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo", "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin", @@ -2120,7 +2120,7 @@ "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok", "Russia_Novgorod Oblast Description":"Veliky Novgorod, Borovichi, Staraya Russa", "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim", -"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль", +"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul", "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk", "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk", "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy", @@ -2140,7 +2140,7 @@ "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk", "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran", "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo", -"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl", +"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl", "Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk", "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk", "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk", @@ -2300,7 +2300,7 @@ "US_Alabama_Montgomery Description":"Creola, Centreville, Valley", "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright", "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", +"US_Arizona_Phoenix Description":"Phoenix, Mesa", "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", "US_Arkansas_North Description":"Ward, Cabot, Des Arc", "US_Arkansas_South Description":"Stamps, Rockport", @@ -2330,7 +2330,7 @@ "US_Georgia_Macon Description":"Grovetown, Perry, Byron", "US_Georgia_North Description":"Emerson, Jefferson, Cartersville", "US_Georgia_South Description":"De Soto, Santa Claus, Pearson", -"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José", +"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José", "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului", "US_Idaho_North Description":"Huetter, Peck, Hayden", "US_Idaho_South Description":"Arco, Middleton, Greenleaf", @@ -2470,13 +2470,13 @@ "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno", "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka", "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets", -"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Ворошиловка, Zhmerynka", +"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka", "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk", "Ukraine_Zakarpattia Oblast Description":"Uzhhorod", "Ukraine_Zaporizhia Oblast Description":"Zaporizhzhia, Melitopol, Berdiansk", "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten", "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", +"United States Virgin Islands Description":"Frederiksted, Christiansted", "Uruguay Description":"Montevidéu", "Uzbekistan Description":"Tashkent", "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", @@ -2484,7 +2484,7 @@ "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal", "Vietnam Description":"Hanói, Cidade de Ho Chi Minh", "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai", -"Yemen Description":"Sana", +"Yemen Description":"Sana'a, Aden", "Zambia Description":"Lusaka, Kitwe, Ndola", "Zimbabwe Description":"Harare, Hwange, Masvingo", "United States of America Short":"EUA", diff --git a/data/countries-strings/ru.json/localize.json b/data/countries-strings/ru.json/localize.json index d1c161f09..e74b6c2b6 100644 --- a/data/countries-strings/ru.json/localize.json +++ b/data/countries-strings/ru.json/localize.json @@ -2080,7 +2080,7 @@ "Russia_Bashkortostan Description":"Уфа, Стерлитамак, Салават", "Russia_Belgorod Oblast Description":"Белгород, Старый Оскол, Губкин", "Russia_Bryansk Oblast Description":"Брянск, Новозыбков, Клинцы", -"Russia_Buryatia Description":"Улан-Удэ, Селендума", +"Russia_Buryatia Description":"Улан-Удэ, Селендума, Джида", "Russia_Chechen Republic Description":"Грозный, Урус-Мартан, Шали", "Russia_Chelyabinsk Oblast Description":"Челябинск, Магнитогорск, Златоуст", "Russia_Chukotka Autonomous Okrug Description":"Анадырь, Билибино, Певек", @@ -2102,9 +2102,9 @@ "Russia_Kostroma Oblast Description":"Кострома, Буй, Шарья", "Russia_Krasnodar Krai Description":"Краснодар, Новороссийск, Армавир", "Russia_Krasnodar Krai_Adygeya Description":"Сочи, Майкоп, Геленджик", -"Russia_Krasnoyarsk Krai_North Description":"Норильск, Дудинка", +"Russia_Krasnoyarsk Krai_North Description":"Норильск, Дудинка, Северо-Енисейский", "Russia_Krasnoyarsk Krai_South Description":"Красноярск, Ачинск, Канск", -"Russia_Kurgan Oblast Description":"Курган", +"Russia_Kurgan Oblast Description":"Курган, Шадринск, Варгаши", "Russia_Kursk Oblast Description":"Курск, Курчатов", "Russia_Leningradskaya Oblast_Karelsky Description":"Выборг, Всеволожск, Сертолово", "Russia_Leningradskaya Oblast_Southeast Description":"Гатчина, Сосновый Бор, Тихвин", @@ -2120,7 +2120,7 @@ "Russia_North Ossetia-Alania Description":"Владикавказ, Моздок, Беслан", "Russia_Novgorod Oblast Description":"Великий Новгород, Боровичи, Старая Русса", "Russia_Novosibirsk Oblast Description":"Новосибирск, Бердск, Искитим", -"Russia_Omsk Oblast Description":"Омск, Тара", +"Russia_Omsk Oblast Description":"Омск, Тара, Исилькуль", "Russia_Orenburg Oblast Description":"Оренбург, Орск, Новотроицк", "Russia_Oryol Oblast Description":"Орёл, Ливны, Мценск", "Russia_Penza Oblast Description":"Пенза, Кузнецк, Заречный", @@ -2140,7 +2140,7 @@ "Russia_Sakhalin Oblast Description":"Южно-Сахалинск, Корсаков, Холмск", "Russia_Samara Oblast Description":"Самара, Тольятти, Сызрань", "Russia_Saratov Oblast Description":"Саратов, Энгельс, Балаково", -"Russia_Smolensk Oblast Description":"Смоленск, Рославль", +"Russia_Smolensk Oblast Description":"Смоленск, Вязьма, Рославль", "Russia_Stavropol Krai Description":"Ставрополь, Пятигорск, Кисловодск", "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Екатеринбург, Каменск-Уральский", "Russia_Sverdlovsk Oblast_North Description":"Нижний Тагил, Серов, Новоуральск", diff --git a/data/countries-strings/zh-Hans.json/localize.json b/data/countries-strings/zh-Hans.json/localize.json index b8956e54f..d462d94e2 100644 --- a/data/countries-strings/zh-Hans.json/localize.json +++ b/data/countries-strings/zh-Hans.json/localize.json @@ -568,8 +568,8 @@ "Italy_Sardinia":"撒丁岛", "Italy_Sicily":"西西里岛", "Italy_Trentino-Alto Adige Sudtirol":"特伦蒂诺-上阿迪杰", -"Italy_Tuscany_Grosseto":"托斯卡纳 — 格罗塞托省", -"Italy_Tuscany_Massa e Carrara":"托斯卡纳 — 马萨-卡拉拉省", +"Italy_Tuscany_Grosseto":"托斯卡纳 — 东南", +"Italy_Tuscany_Massa e Carrara":"托斯卡纳 — 西北", "Italy_Umbria":"翁布里亚", "Italy_Veneto":"威尼托", "Italy_Veneto_Belluno":"贝卢诺省", @@ -1244,8 +1244,8 @@ "Mexico_Chihuahua":"奇瓦瓦州", "Mexico_Sonora":"索诺拉州", "Nepal_Kathmandu":"加德满都", -"Nepal_Madhyamanchal":"中部地区", -"Nepal_Purwanchal":"东部地区", +"Nepal_Madhyamanchal":"中部发展区", +"Nepal_Purwanchal":"东部发展区", "Nigeria_North":"尼日利亚 - 北", "Nigeria_South":"尼日利亚 - 南", "Norway_Hordaland":"霍达兰郡", @@ -1510,34 +1510,34 @@ "Chile_Central Description":"Santiago, Pichilemu, San Antonio", "Chile_North Description":"Hanga Roa, Iquique, Coquimbo", "Chile_South Description":"Valdivia, Talcahuano, Coronel", -"China_Anhui Description":"Hefei, Baohe, Shushan", -"China_Chongqing Description":"Chongqing, Changshou, Kai", -"China_Fujian Description":"Longyan, Sanming, Shaowu", -"China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan", -"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén", -"China_Guangxi Description":"Guigang, Dongxing, Wuzhou", -"China_Guizhou Description":"Guiyang, Liupanshui, Weining", -"China_Hebei Description":"Beijing, Tianjin, Shijiazhuang", -"China_Heilongjiang Description":"Harbin, Jixi, Ning'an", -"China_Henan Description":"Zhengzhou, Wugang", -"China_Hubei Description":"Wuhan, Jīngzhōu City, Dangyang", -"China_Hunan Description":"Changsha, Lianyuan, Liling", -"China_Inner Mongolia Description":"Hohhot, Baotou, Erenhot", -"China_Jiangsu Description":"Nanjing, Taixing, Xinyi", -"China_Jiangxi Description":"Ganzhou, Shangrao, Yichun", -"China_Jilin Description":"Changchun, Jilin, Meihekou", -"China_Liaoning Description":"Shenyang, Lingyuan, Wafangdian", -"China_Ningxia Hui Description":"Zhongwei, Wuzhong, Qingtongxia", -"China_Qinghai Description":"Dulan, Delingha, Gyêgu", -"China_Shaanxi Description":"Xi'an, Baoji, Hanzhong", -"China_Shandong Description":"Jinan, Tai'an, Zibo", -"China_Shanghai Description":"Shanghai, Jinshan, Putuo", -"China_Shanxi Description":"Taiyuan, Changzhi, Huozhou", -"China_Sichuan Description":"Chengdu, Panzhihua, Yibin", -"China_Tibet Autonomous Region Description":"Gya'gya, Chabkha, Shelkar", -"China_Xinjiang Description":"Kashgar, Tumxuk, Hotan", -"China_Yunnan Description":"Kunming, Zhedao, Yongbei", -"China_Zhejiang Description":"Jiande, Hangzhou, Lin'an", +"China_Anhui Description":"合肥市、包河区、蜀山区", +"China_Chongqing Description":"重庆市、长寿区、开县", +"China_Fujian Description":"龙岩市、三明市、邵武市", +"China_Gansu Description":"兰州市、红柳湾镇、党城湾镇", +"China_Guangdong Description":"广州市、深圳市、江门市", +"China_Guangxi Description":"贵港市、东兴市、梧州市", +"China_Guizhou Description":"贵阳市、六盘水市、威宁彝族回族苗族自治县", +"China_Hebei Description":"北京市、天津市、石家庄市", +"China_Heilongjiang Description":"哈尔滨市、鸡西市、宁安市", +"China_Henan Description":"郑州市、舞钢市", +"China_Hubei Description":"武汉市、荆州市、当阳市", +"China_Hunan Description":"长沙市、涟源市、醴陵市", +"China_Inner Mongolia Description":"呼和浩特市、包头市、二连浩特市", +"China_Jiangsu Description":"南京市、泰兴市、新沂市", +"China_Jiangxi Description":"赣州市、上饶市、宜春市", +"China_Jilin Description":"长春市、吉林市、梅河口市", +"China_Liaoning Description":"沈阳市、凌源市、瓦房店市", +"China_Ningxia Hui Description":"中卫市、吴忠市、青铜峡市", +"China_Qinghai Description":"都兰县、德令哈市、玉树市", +"China_Shaanxi Description":"西安市、宝鸡市、汉中市", +"China_Shandong Description":"济南市、泰安市、淄博市", +"China_Shanghai Description":"上海市、金山区、普陀区", +"China_Shanxi Description":"太原市、长治市、霍州市", +"China_Sichuan Description":"成都市、攀枝花市、宜宾市", +"China_Tibet Autonomous Region Description":"加加镇、卡嘎鎮、协格尔镇", +"China_Xinjiang Description":"喀什市、图木舒克市、和田市", +"China_Yunnan Description":"昆明市、遮岛镇、永北镇", +"China_Zhejiang Description":"建德市、杭州市、临安市", "Colombia_East Description":"Mocoa, Villavicencio, Florencia", "Colombia_North Description":"Cúcuta, Medellín, Cartagena", "Colombia_West Description":"Bogota, Cali, Soacha", diff --git a/data/sound-strings/es.json/localize.json b/data/sound-strings/es.json/localize.json index 8b317d032..562da3d09 100644 --- a/data/sound-strings/es.json/localize.json +++ b/data/sound-strings/es.json/localize.json @@ -19,7 +19,7 @@ "make_a_left_turn_street":"NULL", "make_a_sharp_left_turn":"Gire bruscamente a la izquierda.", "make_a_sharp_left_turn_street":"NULL", -"make_a_u_turn":"Cambie de sentido.", +"make_a_u_turn":"Haz un cambio de sentido.", "make_a_u_turn_street":"NULL", "make_a_u_turn_street_verb":"NULL", "go_straight":"Continúe recto.", diff --git a/data/sound-strings/tr.json/localize.json b/data/sound-strings/tr.json/localize.json index 9b9978cdd..730e44830 100644 --- a/data/sound-strings/tr.json/localize.json +++ b/data/sound-strings/tr.json/localize.json @@ -27,7 +27,7 @@ "onto":"yönünde", "take_exit_number":"çıkın yönünde", "take_exit_number_street_verb":"NULL", -"route_recalculating":"Rotanın yeniden hesaplanması", +"route_recalculating":"Rota, yeniden hesaplanıyor", "destination":"Varacaksınız.", "you_have_reached_the_destination":"Hedef noktasına vardınız.", "in_50_meters":"Elli metre sonra", diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings index 5a746a63c..1284a306c 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings @@ -143,7 +143,7 @@ "type.recycling.shoes" = "Обувки"; "type.recycling.green_waste" = "Растителен/органичен отпадък"; "type.recycling.cartons" = "Кашони"; -"type.amenity.restaurant" = "Заведение"; +"type.amenity.restaurant" = "Ресторант"; "type.amenity.sanitary_dump_station" = "Станция за изхвърляне на резервоара за задържане"; "type.amenity.school" = "Училище"; @@ -245,7 +245,7 @@ "type.craft.brewery" = "Пивоварна"; "type.craft.caterer" = "Кетъринг"; "type.craft.carpenter" = "Марангоз"; -"type.craft.confectionery" = "Сладкарски изделия"; +"type.craft.confectionery" = "Сладкарница"; "type.craft.electrician" = "Електротехник"; "type.craft.electronics_repair" = "Ремонт на електроника"; "type.craft.gardener" = "Градинар"; @@ -523,7 +523,7 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.service.tunnel" = "Тунел"; -"type.highway.services" = "Service Area"; +"type.highway.services" = "Обслужвана зона"; "type.highway.speed_camera" = "Радар"; "type.highway.steps" = "Стълби"; @@ -678,7 +678,7 @@ "type.landuse.farmyard" = "Стопански двор"; "type.landuse.field" = "Поле"; "type.landuse.flowerbed" = "Цветна леха"; -"type.landuse.forest" = "Forest"; +"type.landuse.forest" = "Гора"; "type.landuse.forest.coniferous" = "Иглолистни гори"; "type.landuse.forest.deciduous" = "Широколистна гора"; "type.landuse.forest.mixed" = "Смесена гора"; @@ -852,7 +852,7 @@ "type.place.country" = "Страна"; "type.place.county" = "Графство"; "type.place.farm" = "Ферма"; -"type.place.hamlet" = "Cело"; +"type.place.hamlet" = "Село"; "type.place.island" = "Остров"; "type.place.islet" = "Острови"; "type.place.isolated_dwelling" = "Изолирано жилище"; @@ -1223,7 +1223,7 @@ "type.shop.car_repair.tyres" = "Гумаджия"; "type.shop.caravan" = "Автокъща на домове на колела"; "type.shop.carpet" = "Килими"; -"type.shop.chemist" = "Химик"; +"type.shop.chemist" = "Битова химия"; "type.shop.chocolate" = "Магазин за шоколад"; "type.shop.clothes" = "Магазин за дрехи"; "type.shop.coffee" = "Магазин за кафе"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index aafc0fa06..41944b243 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -250,7 +250,7 @@ "pref_tts_language_title" = "Stemmesprog"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Test stemmeanvisninger (TTS, Text-To-Speech)"; +"pref_tts_test_voice_title" = "Test stemmevejledninger"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Andet"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings index 624983811..7cab66e84 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings @@ -32,7 +32,7 @@ "type.amenity.bureau_de_change" = "Casa de cambio"; "type.amenity.bus_station" = "Estación de autobuses"; "type.amenity.cafe" = "Café"; -"type.amenity.car_rental" = "Renta de coches"; +"type.amenity.car_rental" = "Renta de autos"; "type.amenity.motorcycle_rental" = "Renta de motocicletas"; "type.amenity.car_sharing" = "Compartir coche"; "type.amenity.car_wash" = "Autolavado"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings index eeada9ff7..64d32ca73 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings @@ -9,7 +9,7 @@ "route" = "Ruta"; /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */ -"NSLocationAlwaysUsageDescription" = "Es necesario definir la ubicación actual en el entorno para disfrutar al máximo de la funcionalidad de la aplicación. Se emplea en las opciones de seguir la ruta y guardar el camino recorrido reciente."; +"NSLocationAlwaysUsageDescription" = "La detección de la ubicación en segundo plano es necesaria para disfrutar plenamente de la funcionalidad de la aplicación. Se utiliza para la navegación y para grabar la ruta recorrida ."; /* Needed to explain why we require access to GPS coordinates when the app is active. */ -"NSLocationWhenInUseUsageDescription" = "La definición de la ubicación actual se utiliza en las opciones de seguir la ruta y guardar el camino recorrido reciente."; +"NSLocationWhenInUseUsageDescription" = "Determinar su ubicación es necesario para la navegación y para grabar la ruta recorrida recientemente."; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index b7615d807..322c4ab51 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -16,7 +16,7 @@ "kilometres" = "Kilómetros"; /* Leave Review dialog - Review button */ -"leave_a_review" = "Escribir reseña"; +"leave_a_review" = "Escribir una reseña"; /* Choose measurement on first launch alert - choose imperial system button */ "miles" = "Millas"; @@ -60,13 +60,13 @@ "continue_button" = "Continuar"; /* "Add new bookmark list" dialog title */ -"add_new_set" = "Agregar un grupo nuevo"; +"add_new_set" = "Agregar una lista nueva"; /* Add Bookmark list dialog - hint when the list name is empty */ "bookmark_set_name" = "Nombre del grupo de marcadores"; /* "Bookmark Lists" dialog title */ -"bookmark_sets" = "Grupos de marcadores"; +"bookmark_sets" = "Lista de marcadores"; /* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */ "bookmarks" = "Marcadores"; @@ -96,7 +96,7 @@ "category_transport" = "Transporte"; /* Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! */ -"category_fuel" = "Gasolinera"; +"category_fuel" = "Estación de Servicio"; /* Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! */ "category_parking" = "Aparcamiento"; @@ -154,13 +154,13 @@ /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */ "category_rv" = "Instalaciones para autocaravanas"; -"share_bookmarks_email_body" = "¡Hola!\n\nAdjunto mis marcadores; ábrelos en CoMaps. Si no lo tienes instalado, puedes descargarlo aquí: https://www.comaps.app/download/\n\n¡Disfruta viajando con CoMaps!"; +"share_bookmarks_email_body" = "¡Hola!\n\nAdjunto mis marcadores; ábrelos en CoMaps. Si no lo tienes instalado, puedes descargarlo aquí: https://www.comaps.app/es/download/\n\n¡Disfruta viajando con CoMaps!"; /* message title of loading file */ "load_kmz_title" = "Cargando marcadores"; /* Kmz file successful loading */ -"load_kmz_successful" = "¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores."; +"load_kmz_successful" = "¡Los marcadores se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Marcadores."; /* Kml file loading failed */ "load_kmz_failed" = "No se pudieron cargar los marcadores. El archivo podría tener daños o defectos."; @@ -169,7 +169,7 @@ "edit" = "Editar"; /* Warning message when doing search around current position */ -"unknown_current_position" = "Aún no se ha determinado su ubicación"; +"unknown_current_position" = "Aún no se ha determinado tu ubicación"; /* Subject for emailed bookmark */ "bookmark_share_email_subject" = "¡Mira mi marcador en el mapa de CoMaps!"; @@ -178,7 +178,7 @@ "my_position_share_email_subject" = "¡Mira mi ubicación actual en el mapa en CoMaps!"; /* Share by email button text, also used in editor and About. */ -"email" = "Correo"; +"email" = "Correo electrónico"; /* Text for message to copy something */ "copy_to_clipboard" = "Copiar al portapapeles"; @@ -198,13 +198,13 @@ "version: %@ (%@)\nmap data: %@" = "Versión: %@ (%@)\nDatos del mapa: %@"; /* Title for tracks category in bookmarks manager */ -"tracks_title" = "Trayectos"; +"tracks_title" = "Trazas"; /* Length of track in cell that describes route */ "length" = "Longitud"; "share_my_location" = "Compartir mi ubicación"; "prefs_group_route" = "Navegación"; -"pref_zoom_title" = "Botones de zum"; +"pref_zoom_title" = "Botones de zoom"; "pref_left_button_type" = "Botón Principal Izquierdo"; /* Settings «Map» category: «Appearance» title */ @@ -238,7 +238,7 @@ "pref_map_3d_buildings_disabled_summary" = "Los edificios 3D se desactivan en el modo de ahorro de energía"; /* Settings «Route» category: «Tts enabled» title */ -"pref_tts_title" = "Instrucciones de voz"; +"pref_tts_title" = "Indicaciones por voz"; /* Settings «Route» category: «Tts enable» title */ "pref_tts_enable_title" = "Habilitar Indicaciones por Voz"; @@ -1097,7 +1097,7 @@ "edit_track" = "Editar trayecto"; "osm_profile_view_edit_history" = "Ver historial de ediciones"; "osm_profile_view_notes" = "Ver notas"; -"pref_mapappearance_title" = "Apariencia del Mapa"; +"pref_mapappearance_title" = "Apariencia del mapa"; "pref_maplanguage_title" = "Idioma del mapa"; "transliteration_title_disabled_summary" = "Deshabilitado cuando siempre se usa el idioma local para el mapa"; -"pref_maplanguage_local" = "Idioma Local"; +"pref_maplanguage_local" = "Idioma local"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings index b3e9bdd1b..d169d8ad5 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings @@ -34,7 +34,7 @@ "type.amenity.cafe" = "Café"; "type.amenity.car_rental" = "Alquiler de coches"; "type.amenity.motorcycle_rental" = "Alquiler de motocicletas"; -"type.amenity.car_sharing" = "Compartir coche"; +"type.amenity.car_sharing" = "Car Sharing"; "type.amenity.car_wash" = "Lavado de coches"; "type.amenity.casino" = "Casino"; "type.amenity.gambling" = "Juegos de apuestas"; @@ -47,7 +47,7 @@ "type.amenity.cinema" = "Cine"; "type.leisure.bowling_alley" = "Bolera"; "type.amenity.clinic" = "Clínica"; -"type.amenity.college" = "Colegio"; +"type.amenity.college" = "Facultad"; "type.amenity.community_centre" = "Centro comunitario"; "type.amenity.compressed_air" = "Aire comprimido"; "type.amenity.conference_centre" = "Centro de conferencias"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 50d0ca1f5..d68ca0b04 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -253,7 +253,7 @@ "pref_tts_language_title" = "Langue vocale"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Teste les instructions vocales (TTS, Text-To-Speech)"; +"pref_tts_test_voice_title" = "Tester les instructions vocales"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Autre"; @@ -623,7 +623,7 @@ /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ "error_enter_correct_storey_number" = "Le nombre d'étages ne doit pas dépasser %d"; "editor_zip_code" = "Code postal"; -"error_enter_correct_zip_code" = "Entrer un code postal valide"; +"error_enter_correct_zip_code" = "Saisissez un code postal valide"; /* Place Page title for long tap */ "core_placepage_unknown_place" = "Point sur la carte"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index bb1d15572..561bc2ef9 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -253,7 +253,7 @@ "pref_tts_language_title" = "Lingua per la voce"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Prova le indicazioni vocali (TTS, Text-To-Speech)"; +"pref_tts_test_voice_title" = "Prova le indicazioni vocali"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Altro"; @@ -524,7 +524,7 @@ "autodownload" = "Scaricamento automatico"; /* Place Page opening hours text */ -"closed_now" = "Ora chiuso"; +"closed_now" = "Chiuso adesso"; /* Place Page opening hours text */ "daily" = "Tutti i giorni"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings index 2c48d0e8d..a666339b2 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings @@ -1384,7 +1384,7 @@ "type.attraction.water_slide" = "Scivolo d'acqua"; "type.tourism.attraction.specified" = "Attrattiva"; "type.tourism.camp_site" = "Campeggio"; -"type.tourism.caravan_site" = "Area per campeggiatori"; +"type.tourism.caravan_site" = "Area camper"; /* A rentable countryside vacation house. */ "type.tourism.chalet" = "Cottage per le vacanze"; @@ -1495,7 +1495,7 @@ "type.natural.wetland.mangrove" = "Mangrovie"; "type.natural.wetland.tidalflat" = "Piana di Marea"; "type.natural.wetland.saltmarsh" = "Palude Salmastra"; -"type.natural.wetland.fen" = "Paludre"; +"type.natural.wetland.fen" = "Palude"; "type.natural.wetland.saltmarsh.tidal" = "Palude Salmastra di Marea"; "type.natural.wetland.reedbed" = "Giunco"; "type.leisure.escape_game" = "Escape Room"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings index fe426386f..cdfcf1bd5 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings @@ -214,7 +214,7 @@ "pref_appearance_dark" = "Tamsi"; /* Generic «Disabled» string */ -"disabled" = "Disabled"; +"disabled" = "Išjungta"; /* Generic «Off» string */ "off" = "Išjungti"; @@ -238,7 +238,7 @@ "pref_tts_title" = "Balso instrukcijos"; /* Settings «Route» category: «Tts enable» title */ -"pref_tts_enable_title" = "Enable Voice Instructions"; +"pref_tts_enable_title" = "Įgalinti balso instrukcijas"; /* Settings «Route» category: «Tts announce street names» title */ "pref_tts_street_names_title" = "Sakyti gatvių pavadinimus"; @@ -250,7 +250,7 @@ "pref_tts_language_title" = "Balso instrukcijų kalba"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Išbandyti balso instrukcijas (kalbos sintezę)"; +"pref_tts_test_voice_title" = "Išbandyti balso instrukcijas"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Kita"; @@ -325,7 +325,7 @@ "volunteer" = "Prisidėti"; /* "Social media" section header in the About screen */ -"follow_us" = "Sekite ar susisiekite su mumis"; +"follow_us" = "Palaikykime ryšį"; /* Alert text */ "email_error_body" = "El. pašto programa nenustatyta. Sukonfigūruokite ją arba susisiekite su mumis adresu %@"; @@ -1018,7 +1018,7 @@ "bugreport_alert_message" = "Ar norite išsiųsti pranešimą apie klaidą programos kūrėjams?\nTokių pranešimų mes tikimės iš savo naudotojų, nes „CoMaps“ nerenka jokios informacijos apie klaidas automatiškai. Iš anksto dėkojame, kad prisidedate prie „CoMaps“ tobulinimo!"; /* Title for the iCloud syncronization setting */ -"icloud_sync" = "iCloud Syncronization (Beta)"; +"icloud_sync" = "„iCloud“ sinchronizavimas (Beta)"; /* Title for the "Enable iCloud Syncronization" alert. */ "enable_icloud_synchronization_title" = "„iCloud“ sinchronizavimo įjungimas"; @@ -1096,6 +1096,6 @@ "osm_profile_view_edit_history" = "Peržiūrėti keitimų istoriją"; "about_proposition_3" = "Skaidrus ir nesiekiantis pelno"; "pref_mapappearance_title" = "Žemėlapio išvaizda"; -"pref_maplanguage_title" = "Map Language"; -"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Žemėlapio kalba"; +"transliteration_title_disabled_summary" = "Negalima, kai žemėlapyje visuomet naudojama vietos kalba"; +"pref_maplanguage_local" = "Vietos kalba"; diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ml.lproj/InfoPlist.strings index baecb5489..83fd8f2d8 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ml.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ "NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track."; "NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track."; -"search" = "Search"; +"search" = "തിരയുക"; "route" = "Route"; "bookmarks_and_tracks" = "Bookmarks and Tracks"; diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings index f93e4e321..fe445308e 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings @@ -426,7 +426,7 @@ "dialog_routing_disclaimer_beware" = "Please stay alert and safe on the roads!"; "log_file_size" = "Log file size: %@"; "editor_add_select_category_all_subtitle" = "All Categories"; -"search" = "Search"; +"search" = "തിരയുക"; "ft" = "ft"; "placepage_edit_bookmark_button" = "Edit Bookmark"; "error_enter_correct_phone" = "Enter a valid phone number"; diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.stringsdict index 36a870670..dd86d45cc 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.stringsdict @@ -1,6 +1,11 @@ - - + + bookmarks_places + + NSStringLocalizedFormatKey + %#@value@ + + diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings index 048dec259..551d49cd1 100644 --- a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings @@ -587,7 +587,7 @@ "type.amenity.post_box" = "Mailbox"; "type.place.hamlet" = "Hamlet"; "type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle"; -"type.addr_interpolation" = "Address/Block"; +"type.addr_interpolation" = "വിലാസം/ബ്ലോക്ക്"; "type.railway.subway_entrance.rotterdam" = "Subway Entrance"; "type.man_made.water_tap" = "Water Tap"; "type.amenity.library" = "Library"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 5667fc4c2..aa98187f3 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -241,7 +241,7 @@ "pref_tts_title" = "Gesproken instructies"; /* Settings «Route» category: «Tts enable» title */ -"pref_tts_enable_title" = "Enable Voice Instructions"; +"pref_tts_enable_title" = "Gesproken instructies inschakelen"; /* Settings «Route» category: «Tts announce street names» title */ "pref_tts_street_names_title" = "Straatnamen aankondigen"; @@ -253,7 +253,7 @@ "pref_tts_language_title" = "Gesproken taal"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Test gesproken aanwijzingen (TTS, Text-To-Speech)"; +"pref_tts_test_voice_title" = "Test gesproken aanwijzingen"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Andere"; @@ -1097,7 +1097,7 @@ "edit_track" = "Route bewerken"; "osm_profile_view_edit_history" = "Bewerkingsgeschiedenis bekijken"; "osm_profile_view_notes" = "Opmerkingen bekijken"; -"pref_mapappearance_title" = "Map Appearance"; -"pref_maplanguage_title" = "Map Language"; +"pref_mapappearance_title" = "Kaart uiterlijk"; +"pref_maplanguage_title" = "Kaarttaal"; "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_local" = "Lokale Taal"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings index 5c90970b6..99727cb05 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings @@ -1499,8 +1499,8 @@ "type.natural.wetland.saltmarsh" = "Zoutmoeras"; "type.natural.wetland.saltmarsh.tidal" = "Kwelder"; "type.natural.wetland.tidalflat" = "Wad"; -"type.leisure.escape_game" = "Escape Room"; -"type.amenity.luggage_locker" = "Luggage Locker"; -"type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; -"type.post_office.post_partner" = "Post Partner"; +"type.leisure.escape_game" = "Escaperoom"; +"type.amenity.luggage_locker" = "Bagagekluis"; +"type.amenity.ranger_station" = "Boswachterkantoor"; +"type.amenity.bicycle_parking.covered" = "Overdekte fietsenstalling"; +"type.post_office.post_partner" = "Post partner"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings index 554c1189a..809a19673 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings @@ -1501,6 +1501,6 @@ "type.barrier.guard_rail" = "Barierka ochronna"; "type.leisure.escape_game" = "Escape Room"; "type.amenity.luggage_locker" = "Luggage Locker"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.amenity.bicycle_parking.covered" = "Zadaszony parking dla rowerów"; "type.post_office.post_partner" = "Post Partner"; "type.amenity.ranger_station" = "Ranger Station"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index b1a6377c6..02ecdc95b 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -43,7 +43,7 @@ "country_status_download_failed" = "O download falhou"; /* Text in About screen */ -"about_headline" = "Um projeto aberto, movido pela comunidade"; +"about_headline" = "Projeto aberto desenvolvido pela comunidade"; /* Text in About screen */ "about_proposition_1" = "Não precisa de conexão à internet, rápido e fácil de usar"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings index f5e86b0c1..af47cade6 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings @@ -8,15 +8,15 @@ "type.aerialway.gondola" = "Telecabine"; "type.aerialway.mixed_lift" = "Teleférico híbrido"; "type.aerialway.station" = "Estação de teleférico"; -"type.aeroway" = "Via aérea"; +"type.aeroway" = "Infraestrutura aérea"; "type.aeroway.aerodrome" = "Aeroporto ou aeródromo"; "type.aeroway.aerodrome.international" = "Aeroporto internacional"; "type.aeroway.apron" = "Plataforma de estacionamento de aviões"; "type.aeroway.gate" = "Portão de embarque"; "type.aeroway.helipad" = "Heliponto"; -"type.aeroway.runway" = "Pista de aeroporto ou aeródromo"; -"type.aeroway.taxiway" = "Pista de rolagem"; -"type.aeroway.terminal" = "Aerogare de passageiros"; +"type.aeroway.runway" = "Pista de pouso e decolagem"; +"type.aeroway.taxiway" = "Pista de táxi"; +"type.aeroway.terminal" = "Terminal"; "type.amenity" = "Amenidades"; "type.amenity.arts_centre" = "Centro de artes"; "type.amenity.atm" = "Caixa eletrônico"; @@ -26,7 +26,7 @@ "type.amenity.bench" = "Assento"; "type.amenity.bicycle_parking" = "Bicicletário"; "type.amenity.bicycle_rental" = "Aluguel de bicicletas"; -"type.amenity.bicycle_repair_station" = "Oficina de conserto de bicicletas"; +"type.amenity.bicycle_repair_station" = "Estação de reparo de bicicletas"; "type.amenity.biergarten" = "Biergarten"; "type.amenity.brothel" = "Bordel"; "type.amenity.bureau_de_change" = "Casa de câmbio"; diff --git a/iphone/Maps/LocalizedStrings/pt_PT.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt_PT.lproj/Localizable.stringsdict index 36a870670..96fae479a 100644 --- a/iphone/Maps/LocalizedStrings/pt_PT.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/pt_PT.lproj/Localizable.stringsdict @@ -1,6 +1,66 @@ - - + + bookmarks_places + + NSStringLocalizedFormatKey + %#@value@ + value + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + zero + Sem marcadores + one + %d marcador + many + %d marcadores + other + %d marcadores + + + bookmarks_detect_message + + NSStringLocalizedFormatKey + %#@value@ + value + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + zero + Um arquivo encontrado. Pode vê-lo depois da conversão. + one + %d arquivo encontrado. Pode vê-lo depois da conversão. + many + %d arquivos encontrados. Pode vê-los depois da conversão. + other + %d arquivos encontrados. Pode vê-los depois da conversão. + + + tracks + + NSStringLocalizedFormatKey + %#@value@ + value + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + zero + Nenhum caminho + one + %d caminho + many + %d caminhos + other + %d caminhos + + + diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 9a95d5bab..ad6706803 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -253,7 +253,7 @@ "pref_tts_language_title" = "Язык подсказок"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Протестировать голосовые подсказки (TTS, Text-To-Speech)"; +"pref_tts_test_voice_title" = "Попробовать голосовые подсказки"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Другой"; @@ -524,7 +524,7 @@ "autodownload" = "Автозагрузка карт"; /* Place Page opening hours text */ -"closed_now" = "Сейчас закрыто"; +"closed_now" = "Закрыто"; /* Place Page opening hours text */ "daily" = "Ежедневно"; @@ -623,7 +623,7 @@ /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ "error_enter_correct_storey_number" = "Количество этажей не должно превышать %d"; "editor_zip_code" = "Почтовый индекс"; -"error_enter_correct_zip_code" = "Введите корректный почтовый индекс"; +"error_enter_correct_zip_code" = "Введите валидный почтовый индекс"; /* Place Page title for long tap */ "core_placepage_unknown_place" = "Точка на карте"; @@ -1099,5 +1099,5 @@ "osm_profile_view_notes" = "Заметки"; "pref_mapappearance_title" = "Оформление карты"; "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map"; -"pref_maplanguage_title" = "Map Language"; -"pref_maplanguage_local" = "Local Language"; +"pref_maplanguage_title" = "Язык карты"; +"pref_maplanguage_local" = "Местный язык"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings index 24cbc4d17..d17e8ac45 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings @@ -250,7 +250,7 @@ "pref_tts_language_title" = "Језик гласа"; /* Settings «Route» category: «Test Voice Directions» title */ -"pref_tts_test_voice_title" = "Тестирај гласовне инструкције (Текст-у-говор)"; +"pref_tts_test_voice_title" = "Тестирај гласовне инструкције"; /* Title for "Other" section in TTS settings. */ "pref_tts_other_section_title" = "Остало"; @@ -325,7 +325,7 @@ "volunteer" = "Волонтирајте"; /* "Social media" section header in the About screen */ -"follow_us" = "Контактирајте нас"; +"follow_us" = "Повежите се с нама"; /* Alert text */ "email_error_body" = "Email клијент није подешен. Молимо вас да га подесите или нас контактирајте на %@"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 430f100ca..da01fe6db 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -235,7 +235,7 @@ "pref_map_3d_buildings_title" = "3B yapılar"; /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */ -"pref_map_3d_buildings_disabled_summary" = "3B yapılar güç tutum kipindeyken kapatılır"; +"pref_map_3d_buildings_disabled_summary" = "3B yapılar güç tasarrufu modundayken kapatılır"; /* Settings «Route» category: «Tts enabled» title */ "pref_tts_title" = "Sesli Yönlendirme"; @@ -340,7 +340,7 @@ "pref_calibration_title" = "Pusula kalibrasyonu"; /* Toast text when user hides UI with a long tap anywhere on the map */ -"long_tap_toast" = "Arayüzü görmek için haritaya uzun basın"; +"long_tap_toast" = "Seçenekleri görmek için haritaya tekrar basılı tutun"; /* Update all button text */ "downloader_update_all_button" = "Tümünü Güncelle"; @@ -447,10 +447,10 @@ "dialog_routing_disclaimer_borders" = "— Sınır bölgelerinde rotalar konusunda dikkatli olun: uygulamamızca oluşturulan rotalar bazen izin verilmeyen yerlerdeki ülke sınırlarından geçebilir."; "dialog_routing_disclaimer_beware" = "Lütfen yolda özenli ve güvenli olun!"; "dialog_routing_check_gps" = "GPS sinyalini denetle"; -"dialog_routing_error_location_not_found" = "Rota oluşturulamıyor. Şu anki GPS koordinatları tanımlanamadı."; +"dialog_routing_error_location_not_found" = "Rota oluşturulamıyor. Mevcut GPS koordinatları belirlenemedi."; "dialog_routing_location_turn_wifi" = "Lütfen GPS sinyalinizi denetleyin. Wi-Fi'ı etkinleştirmek konum doğruluğunu artırır."; "dialog_routing_location_turn_on" = "Konum hizmetlerini etkinleştir"; -"dialog_routing_location_unknown_turn_on" = "Şu anki GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin."; +"dialog_routing_location_unknown_turn_on" = "Mevcut GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin."; "dialog_routing_download_files" = "Gerekli dosyaları indir"; "dialog_routing_download_and_update_all" = "Planlanan yoldaki tüm harita ve rota bilgilerini indirip güncelleyerek rotayı hesaplayın."; "dialog_routing_unable_locate_route" = "Rota belirlenemiyor"; @@ -749,7 +749,7 @@ /* User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". */ "routing_add_finish_point" = "Bir hedef noktası eklemek için aramayı kullanın veya haritaya dokunun"; "planning_route_manage_route" = "Rotayı yönet"; -"button_plan" = "Plan"; +"button_plan" = "Hesapla"; "placepage_remove_stop" = "Durağı Kaldır"; "planning_route_remove_title" = "Kaldırmak için buraya sürükleyin"; "placepage_add_stop" = "Ara nokta ekle"; @@ -814,7 +814,7 @@ /* Speed camera settings menu option - Never warn (about speedcams) */ "pref_tts_speedcams_never" = "Hiçbir zaman uyarma"; -"power_managment_title" = "Düşük güç modu"; +"power_managment_title" = "Güç tasarrufu modu"; "power_managment_description" = "Kimi işlevler pahasına olsa da güç kullanımını düşürmeyi dener."; "power_managment_setting_never" = "Asla"; "power_managment_setting_auto" = "Pil düşükken"; @@ -972,7 +972,7 @@ "app_tip_03" = "Bir yazılım mühendisi / geliştirici tanıyorsanız, ondan ihtiyacınız olan bir özelliği uygulamaya eklemesini isteyebilirsiniz."; /* App tip #04 */ -"app_tip_04" = "Herhangi bir şeyi seçmek için haritaya dokunun. Uzun dokunarak arayüz gizlenip gösterilebilir."; +"app_tip_04" = "Herhangi bir şeyi seçmek için haritada üzerine dokunun. Ekrandaki seçenekleri gizlemek ve geri getirmek için ise basılı tutun."; /* App tip #05 */ "app_tip_05" = "Haritada şu anki konumunuzu seçebileceğinizi biliyor musunuz?"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings index 5c541fdfd..2c7fdcf57 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings @@ -1239,7 +1239,7 @@ "type.shop.department_store" = "Універмаг"; "type.shop.doityourself" = "Будівельний магазин"; "type.shop.dry_cleaning" = "Хімчистка"; -"type.shop.electronics" = "Електротехнiка"; +"type.shop.electronics" = "Електротехніка"; "type.shop.erotic" = "Секс-шоп"; "type.shop.fabric" = "Магазин тканин"; "type.shop.farm" = "Магазин фермерських продуктів"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings index c55d7e80f..0e0b07b5f 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings @@ -672,7 +672,7 @@ /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ "type.landuse.cemetery.christian" = "基督教墓地"; -"type.landuse.religious" = "Religious Land"; +"type.landuse.religious" = "宗教用地"; "type.landuse.commercial" = "商业区"; "type.landuse.construction" = "建设区域"; "type.landuse.education" = "教育设施"; @@ -1265,8 +1265,8 @@ "type.shop.laundry" = "洗衣店"; "type.shop.mall" = "商场"; "type.shop.massage" = "按摩院"; -"type.shop.mobile_phone" = "手机专卖店"; -"type.shop.money_lender" = "商店"; +"type.shop.mobile_phone" = "手机店"; +"type.shop.money_lender" = "借贷机构"; "type.shop.motorcycle" = "摩托车商店"; "type.shop.motorcycle_repair" = "摩托车维修"; "type.shop.music" = "唱片店"; @@ -1492,15 +1492,15 @@ "type.sport.diving" = "高台跳水"; "type.man_made.crane" = "起重机"; "type.railway.station.subway.qingdao" = "地铁车站"; -"type.natural.wetland.tidalflat" = "Tidal Flat"; -"type.natural.wetland.swamp" = "Swamp"; -"type.natural.wetland.saltmarsh" = "Salt Marsh"; -"type.natural.wetland.mangrove" = "Mangrove"; -"type.natural.wetland.fen" = "Fen"; -"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh"; -"type.natural.wetland.reedbed" = "Reed Bed"; -"type.leisure.escape_game" = "Escape Room"; -"type.amenity.luggage_locker" = "Luggage Locker"; -"type.amenity.ranger_station" = "Ranger Station"; -"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; +"type.natural.wetland.tidalflat" = "潮汐平原"; +"type.natural.wetland.swamp" = "沼泽"; +"type.natural.wetland.saltmarsh" = "盐沼"; +"type.natural.wetland.mangrove" = "红树林"; +"type.natural.wetland.fen" = "湿地"; +"type.natural.wetland.saltmarsh.tidal" = "潮汐盐沼"; +"type.natural.wetland.reedbed" = "芦苇地"; +"type.leisure.escape_game" = "密室逃脱"; +"type.amenity.luggage_locker" = "行李寄存点"; +"type.amenity.ranger_station" = "护林站"; +"type.amenity.bicycle_parking.covered" = "有顶棚自行车停车处"; "type.post_office.post_partner" = "Post Partner"; diff --git a/iphone/metadata/pt-PT/keywords.txt b/iphone/metadata/pt-PT/keywords.txt new file mode 100644 index 000000000..ed2eef513 --- /dev/null +++ b/iphone/metadata/pt-PT/keywords.txt @@ -0,0 +1 @@ +comaps,mapas,openstreetmap,osm,viagem,trilho,bicicleta,conduzir,offline,privacidade,navegar,gps diff --git a/iphone/metadata/pt-PT/privacy_url.txt b/iphone/metadata/pt-PT/privacy_url.txt new file mode 100644 index 000000000..ef65b219a --- /dev/null +++ b/iphone/metadata/pt-PT/privacy_url.txt @@ -0,0 +1 @@ +https://www.comaps.app/pt/privacy diff --git a/iphone/metadata/pt-PT/subtitle.txt b/iphone/metadata/pt-PT/subtitle.txt new file mode 100644 index 000000000..bbaf8e8a2 --- /dev/null +++ b/iphone/metadata/pt-PT/subtitle.txt @@ -0,0 +1 @@ +Navega com Privacidade diff --git a/iphone/metadata/pt-PT/support_url.txt b/iphone/metadata/pt-PT/support_url.txt new file mode 100644 index 000000000..f93b754b6 --- /dev/null +++ b/iphone/metadata/pt-PT/support_url.txt @@ -0,0 +1 @@ +https://codeberg.org/comaps/comaps/issues From d7f73f4b9b8301cf3e3d6472b5f71a325b40a609 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 7 Aug 2025 17:57:35 +0700 Subject: [PATCH 175/222] [generator] Fix Features stage crash on an empty relation Signed-off-by: Konstantin Pastbin --- generator/feature_maker.cpp | 8 +++++++- generator/osm2type.cpp | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/generator/feature_maker.cpp b/generator/feature_maker.cpp index 483cf916e..762ad1c59 100644 --- a/generator/feature_maker.cpp +++ b/generator/feature_maker.cpp @@ -51,7 +51,13 @@ std::optional FeatureMakerSimple::GetOrigin(OsmElement const & e) co } else { - CHECK(!e.m_members.empty(), (e.m_id)); + if (e.m_members.empty()) + { + // Such relations are considered invalid but could be present in OSM data still, + // see https://wiki.openstreetmap.org/wiki/Empty_relations + LOG(LWARNING, ("Invalid relation with no members", e.m_id)); + return {}; + } for (auto const & m : e.m_members) { if (m.m_type == OsmElement::EntityType::Node) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 87eca1dd6..36a0ad820 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -1016,6 +1016,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) if (value != "province") return; + ///@todo(pastk) some invalid relations might be empty so this might fail. CHECK(calcOrg, ()); auto const org = calcOrg(p); if (org && s_countriesChecker.IsTransformToState(*org)) @@ -1471,6 +1472,7 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params, static CityBBox s_cityBBox; + ///@todo(pastk) some invalid relations might be empty so this might fail. CHECK(calcOrg, ()); auto const org = calcOrg(p); if (org && s_cityBBox.IsInside(*org)) From 5de22c6de82953accf5dee94f58e7b2747a1ef2f Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 7 Aug 2025 18:32:25 +0700 Subject: [PATCH 176/222] [generator] Improve logging, add comments Signed-off-by: Konstantin Pastbin --- generator/intermediate_data.cpp | 6 ++++-- generator/raw_generator.cpp | 9 ++++++++- generator/translator.cpp | 2 ++ tools/python/maps_generator/generator/settings.py | 2 +- .../maps_generator/var/etc/map_generator.ini.default | 5 +++++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/generator/intermediate_data.cpp b/generator/intermediate_data.cpp index c8b600bc0..8e3032117 100644 --- a/generator/intermediate_data.cpp +++ b/generator/intermediate_data.cpp @@ -114,8 +114,10 @@ public: uint64_t const fileSize = m_fileReader.Size(); CHECK_EQUAL(fileSize % sizeof(LatLon), 0, ("Node's coordinates file is broken")); + LOG(LINFO, ("Start reading nodes storage from", name)); m_data.resize(fileSize / sizeof(LatLon)); m_fileReader.Read(0, m_data.data(), fileSize); + LOG(LINFO, ("Finished reading nodes storage")); } // PointStorageReaderInterface overrides: @@ -404,9 +406,9 @@ IntermediateDataObjectsCache::GetOrCreatePointStorageReader( std::lock_guard lock(m_mutex); + LOG(LINFO, ("Creating nodes storage reader:", strType, name)); auto res = m_objects.try_emplace(key, type, name); - if (res.second) - LOG(LINFO, ("Created nodes reader:", strType, name)); + return res.first->second; } diff --git a/generator/raw_generator.cpp b/generator/raw_generator.cpp index 29426a3ee..32da41033 100644 --- a/generator/raw_generator.cpp +++ b/generator/raw_generator.cpp @@ -162,6 +162,7 @@ bool RawGenerator::Execute() m_queue.reset(); m_intermediateDataObjectsCache.Clear(); + LOG(LINFO, ("Start final processing...")); while (!m_finalProcessors.empty()) { auto const finalProcessor = m_finalProcessors.top(); @@ -244,7 +245,13 @@ bool RawGenerator::GenerateFilteredFeatures() } CHECK(sourceProcessor, ()); + // Create translators threads. + // Each thread may contain separate translators for countries and World + // They process chunks of source data and pass features to a chain of processors. + // The last processor writes to a "processed" queue. TranslatorsPool translators(m_translators, m_threadsCount); + + // The writer thread pops from the "processed" queue and writes to per-country files. RawGeneratorWriter rawGeneratorWriter(m_queue, m_genInfo.m_tmpDir); rawGeneratorWriter.Run(); @@ -267,7 +274,7 @@ bool RawGenerator::GenerateFilteredFeatures() } while (!isEnd); - LOG(LINFO, ("Input was processed.")); + LOG(LINFO, ("OSM source input was processed.")); if (!translators.Finish()) return false; diff --git a/generator/translator.cpp b/generator/translator.cpp index 6b36d088a..662b27f9b 100644 --- a/generator/translator.cpp +++ b/generator/translator.cpp @@ -63,7 +63,9 @@ void Translator::Emit(OsmElement const & src) void Translator::Finish() { + LOG(LINFO, ("Finishing collectors...")); m_collector->Finish(); + LOG(LINFO, ("Finishing processors...")); m_processor->Finish(); } diff --git a/tools/python/maps_generator/generator/settings.py b/tools/python/maps_generator/generator/settings.py index d5ecf443b..01ba96f67 100644 --- a/tools/python/maps_generator/generator/settings.py +++ b/tools/python/maps_generator/generator/settings.py @@ -92,7 +92,7 @@ OSM_TOOLS_PATH = os.path.join(_WORK_PATH, "osmctools") # Generator tool section: USER_RESOURCE_PATH = os.path.join(OMIM_PATH, "data") -NODE_STORAGE = "mem" if total_virtual_memory() / 10 ** 9 >= 64 else "map" +NODE_STORAGE = "map" # Stages section: NEED_PLANET_UPDATE = False diff --git a/tools/python/maps_generator/var/etc/map_generator.ini.default b/tools/python/maps_generator/var/etc/map_generator.ini.default index 3af13c82d..230171874 100644 --- a/tools/python/maps_generator/var/etc/map_generator.ini.default +++ b/tools/python/maps_generator/var/etc/map_generator.ini.default @@ -21,6 +21,11 @@ MAIN_OUT_PATH: ${Developer:OMIM_PATH}/../maps_build USER_RESOURCE_PATH: ${Developer:OMIM_PATH}/data # Features stage only parallelism level. Set to 0 for auto detection. THREADS_COUNT_FEATURES_STAGE: 0 +# How to store all nodes with their coords. +# "map" (default) - fast, suitable to generate a few countries, but is not suitable for the whole planet +# "mem" - fastest, best for the whole planet generation, needs ~100GB memory (as of 2025) +# "raw" - read from a mmapped file, slow, but uses the least memory +NODE_STORAGE: mem [Osm tools] From b09619969569671797fcb9ff0de377e3e44b2e55 Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Thu, 7 Aug 2025 23:15:45 +0100 Subject: [PATCH 177/222] [qt] prep metainfo for Flathub release Signed-off-by: Harry Bond --- packaging/app.comaps.desktop.metainfo.xml | 980 +--------------------- 1 file changed, 6 insertions(+), 974 deletions(-) diff --git a/packaging/app.comaps.desktop.metainfo.xml b/packaging/app.comaps.desktop.metainfo.xml index e43fab58a..2fdbed55a 100644 --- a/packaging/app.comaps.desktop.metainfo.xml +++ b/packaging/app.comaps.desktop.metainfo.xml @@ -21,15 +21,15 @@

- CoMaps is a free Android & iOS offline maps app for travelers, + CoMaps is a free Android & iOS offline maps app for travellers, tourists, hikers, drivers and cyclists. It uses crowd-sourced OpenStreetMap data.

## Features

- The Linux version of CoMaps has not reached feature parity - with the Android and iPhone versions yet, and has not been optimized - for mobile devices yet. + The Linux version of CoMaps does not have feature parity + with the Android and iPhone versions, and has not yet been + optimized for mobile devices.

@@ -64,977 +64,9 @@ - + -

Highlights:

-
    -
  • OpenStreetMap data as of February 27
  • -
  • Improved routing for bicycles
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of February 13
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of January 21
  • -
  • Added Serbian (Cyrillic) and Latvian languages
  • -
  • Added tower POIs
  • -
-

Linux:

-
    -
  • Added Night Mode to preferences dialog
  • -
  • Added Outdoors layer
  • -
  • Removed defunct Traffic layer button
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of November 22
  • -
  • Touch pad pinch zoom gesture on Linux
  • -
  • Various search improvements, translation updates & bug fixes
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of November 7
  • -
  • Added a map language setting
  • -
  • Touch handling on Linux devices is now feature complete
  • -
  • Added water slides, carousels, ferris wheels, etc
  • -
  • Various search improvements, translation updates & bug fixes
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of October 17
  • -
  • More detailed (50m step) altitude isolines for Iceland, India & Morocco
  • -
  • Use a different icon for non-drinking water sources
  • -
  • Added water towers
  • -
  • Fixed Search on Map results prioritization bug
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of October 1
  • -
  • Improved Chinese, Hebrew, Italian translations
  • -
  • Fixed crashes when location access was enabled on some Desktop Environments
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of September 7
  • -
  • Translations: Enhanced Chinese, Hebrew, and Italian, and added translations for trail difficulty.
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of August 10
  • -
  • Improved routing in cases of bad surface and missing speed limit
  • -
  • Display road shields in India
  • -
  • Self-service and outdoor seating support
  • -
  • Use NotoSans font instead of Serif for Hebrew
  • -
  • Add transliteration enable/disable setting
  • -
  • Traffic light icons are displayed in car navigation mode
  • -
  • Selected places with WiFi show emoji symbol 🛜
  • -
  • Fixed wrong selection of a bookmarked place when tapping on its title
  • -
  • Disabled map rotation snapping to the north angle
  • -
  • Properly export modified bookmark names in GPX
  • -
  • Fixed import of KMB files
  • -
-

Translation updates:

-
    -
  • Improved Catalan, Chinese, Hebrew, Hindi, Hungarian, Japanese, Spanish, Turkish, Ukrainian translations
  • -
  • Updated Cyprus, Iraq, Spain map region names and translations
  • -
-
-
- - -

Highlights:

-
    -
  • OpenStreetMap data as of July 23
  • -
  • Fixed multiline RTL texts
  • -
  • Fixed indentation for Chinese, Japanese and Korean characters when Noto font is used
  • -
-
-
- - -

Highlights:

-
    -
  • Better address search in the USA based on Topologically Integrated Geographic Encoding and Referencing system (TIGER) data. Map size for the USA has increased from 10Gb to 13Gb (including Wikipedia and elevation data)
  • -
  • Fixed rendering of texts in Indic (covering Devanagari, Bengali, Gujarati, Gurmukhi, Kannada, Malayalam, Oriya, Tamil, Telugu), Arabic (N'Ko, Syriac, Mongolian), Thai and Lao, Khmer, Myanmar, Tibetan, Hangul, Hebrew scripts
  • -
  • New Malayalam and Bengali fonts
  • -
  • OSM data as of July 2, 2024
  • -
  • A selected place now shows more types/categories/amenities
  • -
  • Display major roads earlier on the world overview map
  • -
  • Display good quality fine gravel pedestrian paths as white dashed
  • -
  • Support more road/path surface types (bricks, stone, grass paver, soil)
  • -
  • Mountain search also shows volcanoes
  • -
  • Better search results for faraway places
  • -
  • Search now finds places with a number in their names
  • -
  • Find parcel lockers using their ref numbers
  • -
-

Linux Desktop:

-
    -
  • Fix a generic Wayland icon displayed instead of Organic Maps icon on some systems
  • -
-

Translation updates:

-
    -
  • Updated Belarusian, Chinese, Dutch, Euskara, Hungarian, Polish, Portuguese, Russian, Ukrainian translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of May 28, 2024
  • -
  • Search for US zip codes and UK (GB) postcodes
  • -
  • Fix missing addresses in fitness centers details
  • -
  • Add "pastry" and "cakes" search keywords
  • -
  • Fix Wikipedia links that contain a question mark
  • -
-

Linux Desktop:

-
    -
  • Improve selected place details dialog
  • -
-

Translation updates:

-
    -
  • Updated Czech, German, Portuguese translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of April 29, 2024
  • -
  • Upgraded to the new OpenStreetMap authentication method (OAuth 2)
  • -
  • Sort bookmarks and tracks in a list by name
  • -
  • Ability to toggle Drive-through in the OSM editor
  • -
  • Show "Can't find a suitable category?" message hint in the OSM editor
  • -
  • Improve bicycle routing for some cases
  • -
-

Linux Desktop:

-
    -
  • Add route marking buttons to place pages
  • -
  • Add an "Exit" menu option and keyboard shortcuts for all menu entries
  • -
  • Improve font clarity on MDPI screens
  • -
-

Styles:

-
    -
  • Show the availability of Drive-through service for selected POIs
  • -
  • More feature types could be added to OSM now, e.g. marketplaces, taxi stands, kiosks, wilderness huts, garden centers, historic aircraft, cannons, boundary stones, tombs, etc.
  • -
  • Elevator icon instead of "stairs" for displaying the level number of selected POI
  • -
  • Better visible in dark mode $ emoji for paid map features
  • -
-

Translation updates:

-
    -
  • Basque, German, Greek and Solvak
  • -
  • Fix missing local language name versions for selected POIs
  • -
  • Simplify handling of multiple languages feature names in the OSM editor and fix related bugs
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of March 26, 2024
  • -
  • Better isolines elevation data for European countries
  • -
  • Bookmark lists are sorted by modification time (recent at the top)
  • -
  • Add "wheelchair" to the search input to limit results to wheelchair-accessible
  • -
  • Searchable orders pickup points (shop=outpost)
  • -
-

Linux Desktop:

-
    -
  • Place information page is much more user-friendly
  • -
-

Styles:

-
    -
  • Added wind turbines and power plant icons
  • -
  • Reduced visibilities of many outdoors-specific POIs when in the main map style, e.g., waterfalls, mountain peaks, shelters, power towers, etc. (use the Outdoors style for those!)
  • -
  • More consistent font sizes and caption appearances
  • -
-

Translation updates:

-
    -
  • Slovak, Italian, Spanish, Hindi
  • -
  • Fixed police, parking, and sights category search for simplified Chinese
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of February 28, 2024
  • -
  • Export all bookmarks as a single KMZ file
  • -
-

Linux Desktop:

-
    -
  • Fixed occasional crash when there was no location service available
  • -
-

Styles:

-
    -
  • Fixed small fonts on detailed zooms
  • -
  • Improved dark style visibility
  • -
-

Translations:

-
    -
  • Updated Brazilian Portugues, Hebrew, Hungarian and Spanish and Mexican Spanish translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of February 2, 2024
  • -
  • Restroom emoji for places with toilets
  • -
  • Display parking operator
  • -
  • More precise turn notifications for small distances
  • -
  • Fixed absent speed limit on some speed cameras
  • -
  • Plus codes search shows results relative to position and to the screen center
  • -
  • Fixed crash in search
  • -
  • Name editing for playgrounds
  • -
  • Parse mlat and mlon parameters from OSM urls
  • -
  • Allow editing Greek names for Cyprus
  • -
  • Hindi support
  • -
  • Better and more precise search on the map, more relevant search results in the list
  • -
-

Styles:

-
    -
  • Orange color for secondary roads
  • -
  • Wider and brighter white tertiary roads
  • -
  • Nicer looking on- and off-ramp road links joins
  • -
  • Raised visibility of secondary and tertiary road links
  • -
  • Less bright farmlands color
  • -
  • Smaller mountain passes/saddles icons
  • -
  • Reduced visibilities of mountain saddles (compared to passes)
  • -
  • New ford icon
  • -
  • Made hospital and clinic icons look different
  • -
  • Reduced visibility of light rail stations
  • -
  • Added Boston and updated Taipei subway icons
  • -
  • Fixed Delhi subway entrance icons, Minsk & Spb subway captions on detailed zoom
  • -
  • Increased font size of towns and suburbs labels and decreased for neighborhoods
  • -
  • Adjust visibilities of many POIs
  • -
-

Outdoor Style:

-
    -
  • Increased 50m & 100m contour lines visibilities
  • -
  • Raised visibility of campsites, survey points, toilets, touristic information features
  • -
  • New power tower and flagpole/mast icons
  • -
  • Made bridleways to be the same brown color as paths
  • -
  • Increased contrast of footways on overview zooms
  • -
-

Translations:

-
    -
  • Updated Catalan, Chinese, Czech, Finnish, French, Romanian, Slovak, Ukrainian translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of January 5, 2024
  • -
  • Added Max Capacity for places
  • -
-

Styles:

-
    -
  • Added Cairns, updated Singapore subway icon
  • -
  • Slightly increased contrast of lines on the World overview map
  • -
  • Make secondary roads a bit brighter than tertiary/etc.
  • -
  • Car navigation style: fixed some footways/paths/tracks being displayed too early as white dashed lines
  • -
  • Main style: fix color of footways with a sac_scale=* tag to be same as path
  • -
  • Fixed very thin lines (e.g. tram lines) having inconsistent transparency/contrast between different devices (driver-dependent)
  • -
  • Fix bookmarked children playground icon
  • -
  • Remove labels and decrease visibility of footway crossings and sidewalks
  • -
  • Tuned contrast of altitude contour lines
  • -
  • Crisper looking lines (no edge blur)
  • -
-

Outdoor Style:

-
    -
  • More contrast-looking paths, tracks, cutlines, rivers, ditches, railways, cycleways, fences, etc.
  • -
  • Reduce visibility of small streams and canals
  • -
  • Increase visibility of fences, walls and ditches
  • -
  • Increase visibilities of bridle/cycle/foot-ways and steps, increase label sizes
  • -
  • Make bridleways' dashes longer
  • -
-

Pistes improvements:

-
    -
  • Add snow parks and new piste types: skitour, winter hike, connection
  • -
  • Color freeride pistes in yellow-orange, consider ungroomed downhill runs as freeride
  • -
  • Better piste names and numbers/refs support
  • -
  • In Outdoors style: increase pistes visibilities and display detailed piste shapes (area fills)
  • -
-

Other:

-
    -
  • Display capacity of parkings, bicycle docks and charging stations when they're selected
  • -
  • Adjust shop, amenity, leisure ranking in search
  • -
-

Linux Desktop:

-
    -
  • Set screen update frequency to 60fps
  • -
-

Translations:

-
    -
  • New Azerbaijani language
  • -
  • Updates to Chinese, Polish, Hebrew, Romanian
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of December 13, 2023
  • -
  • Show Wikipedia articles in a separate dialog
  • -
  • Touchscreen pinch-zoom support
  • -
  • Multiple KML files can be imported from a single KMZ file
  • -
  • A credit card 💳 is displayed for selected places with ATM
  • -
  • A dollar emoji 💲 is displayed where a fee is required
  • -
-

Search:

-
    -
  • Search for village addresses without streets in Austria, Czechia, Germany, Poland, Slovakia and some other countries (addr:place OSM tag support)
  • -
  • Type "skiing" to find downhill & Nordic pistes
  • -
-

Translations:

-
    -
  • Improved Chinese, Dutch, Finnish, Polish, Russian translations
  • -
  • Added Dutch, French, Polish, Romanian, and Russian translations for edition Opening Hours instructions
  • -
  • Fixed missing parking translations
  • -
-

Styles:

-
    -
  • Outdoors map style for hiking, cycling, and exploring the Nature. Type ?olight or ?odark in the search to enable it, and ?light or ?dark to disable it. Any volunteers to add convenient buttons are welcome!
  • -
  • Please provide feedback on how to improve the Outdoors style
  • -
  • Singapore metro icon
  • -
  • Added Hackerspace
  • -
  • Fixed Porto metro icon
  • -
  • Fixed residential leisure garden area fills disappearing on some zoom levels
  • -
  • Display house numbers regardless of buildings' sizes on zoom level 17
  • -
  • Fine-tuned priorities of many POIs in the main style
  • -
  • Less "gaps" in highways on the World map
  • -
  • Removed very short ferry lines from the World map
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of November 13, 2023
  • -
  • It is possible to zoom in deeper now and see more POIs in dense areas
  • -
  • Outdoors map style preview (activate with ?olight or ?odark in search)
  • -
  • Brands are displayed in the Place Page
  • -
-

Search:

-
    -
  • Process platz-pl like strasse-str
  • -
  • Improved address matching
  • -
  • Improved search of brands
  • -
-

Translations:

-
    -
  • Improved Arabic, Basque, Chinese, Czech, Danish, Finnish, Greek, Hungarian, Indonesian, Italian, Korean, Marathi, Polish, Romanian, Slovak, Spanish, Sweden, Thai, Turkish, Ukrainian, and Vietnamese translations
  • -
-

Styles:

-
    -
  • Added flowerbeds, rental shops, bicycle rentals, motorcycle repairs, petting zoo, prison areas, compressed air
  • -
  • Added nature reserves and military zones rendering to the car navigation mode
  • -
  • Added Docklands Light Railway, Porto metro
  • -
  • Display names of ski pistes
  • -
  • Tuned/updated icons of fitness centre, yoga, theatre, artwork, statue, theme park, bbq, lighthouse, windmill, heliport & helipad, hunting stand, Kingdom Hall of Jehovah's Witnesses, paid & private versions of parkings and parking entrances, convenience / deli / farm / grocery / health_food shops, tobacco shop
  • -
  • Better farmyard & garage landuse area fills
  • -
  • Increased scrubs, alpine huts visibility
  • -
  • Updated sanitary dump station icons and adjusted its priority
  • -
  • Reduced visibility of cave entrances and improved the icon
  • -
  • Increased visibility of standalone house numbers
  • -
  • Reduced Tokyo subway visibility -- kudos to charlie2clarke
  • -
  • Removed minor road markers/shields cluttering the map in Estonia
  • -
  • Fix colors of Estonia and Germany road markers / shields
  • -
  • Increased visibilities of road markers / shields on tertiary and residential road
  • -
  • Fixed "gaps" in some densely mapped lines
  • -
  • Fixed "gaps" in the outlines of bridges and other compound lines
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of September 20
  • -
  • Add positioning support via GeoClue2
  • -
  • Use OpenGL ES 3.0 instead of desktop OpenGL
  • -
  • Added new route type "Ruler" (aka Helicopter Routing) to measure straight distances quickly
  • -
  • Set decimal and grouping separators depending on the system locale
  • -
  • Caves can be added in the Editor
  • -
-

Search:

-
    -
  • Parking entrances are searchable
  • -
  • Improved street matching and results relevance
  • -
  • Search for grocery and houseware
  • -
-

Translations:

-
    -
  • Improved Arabic, Polish, and Spanish translations
  • -
-

Styles:

-
    -
  • New or updated icons for factory, winery, bookcase, library, brothel, bicycle repair station, bicycle rental, bicycle parking, sauna, lottery, bookmaker, massage, sewing, books, underground parking, disabled parking space, gate, excrement bags vending, wholesale shop, outdoor seating, handicraft, grinding mill, caterer, HVAC, key cutter and locksmith
  • -
  • Added vehicle inspection, public bath, strip club, gambling, cycle barrier, waterways (drain, ditch, moat, wastewater), aquarium, assembly point, adult gaming center, amusement arcade, Mormon churches, visitor center, industrial mine, historical objects (cannon, anchor, stone, aircraft, tank, mine, wreck, locomotive)
  • -
  • Added bridges and tunnels rendering for cycleways, footways, paths, tracks, bridleways, steps
  • -
  • Render barrier=ditch differently from waterway=ditch
  • -
  • Reduced priorities of river names (and of other lower-importance lines) in navigation mode
  • -
  • Tuned road names and road shield priorities
  • -
  • Fixed icons display for parking buildings
  • -
  • Reduced visibility of minor and private parking icons, removed area fill for underground parking
  • -
  • Reduced fire hydrant visibility
  • -
  • Display house numbers above icons and main POI captions, and don’t display house numbers for buildings that are too small for the current zoom level
  • -
  • Don't display star icons for squares
  • -
  • Fine-tune house numbers font and drawing priority
  • -
  • Added highway-pedestrian, bridleway, and cycleway lines for detailed zooms (z18-) in navigation mode
  • -
  • Pedestrian tunnels are not visible in navigation mode
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of August 14, 2023
  • -
  • Updated more than a year old Wikipedia articles
  • -
  • Added missing isolines for some regions of Argentina, Chile, Kazakhstan, Tibet, USA, Russia (map sizes increased)
  • -
  • More dense isolines in many areas
  • -
  • Removed too small isolines at overview zoom levels
  • -
  • Reduced many other map sizes
  • -
  • Import comments from GPX cmt tag
  • -
  • Treat GPX track segments as part of the singular track they belong to
  • -
  • Fixed a bug when editing social contacts
  • -
  • Dog Park can be added in the Editor
  • -
  • Updated Persian voice directions
  • -
-

Routing:

-
    -
  • Updated road surface factors for car routing profile
  • -
  • Better pedestrian routing in Turkey and Georgia
  • -
  • Fixed cross-region routing when "avoid …" options are enabled
  • -
-

Search:

-
    -
  • Fixed search for addresses in Czech and Slovakia
  • -
  • Improved street matching
  • -
  • Remove Tourist Information, Place of Worship, Park, Information Board, and Tourist Map from the Sightseeings category
  • -
  • Do not filter duplicated search results except for very close bus stops
  • -
  • Better ranking when searching by category
  • -
  • Fixed search by a house name
  • -
  • Faster search on the map screen
  • -
-

Styles:

-
    -
  • Added ferry routes to the World map
  • -
  • Removed square background from parking icons
  • -
  • Added separate icons for paid and private parking
  • -
  • Made the bicycle parking icon differ more from the motorcycle one
  • -
  • Updated parking entrance icon
  • -
  • Street-side and lane parkings use a smaller icon and appear later when zooming in
  • -
  • Added motorcycle parking and parking entrance icons to the navigation mode
  • -
  • Fixed motorway=trunk links visibility in navigation mode
  • -
  • Improved motorway=trunk colors
  • -
  • Added Tehran metro icon
  • -
  • Revamped priorities system, especially for POIs
  • -
-
-
- - -

Highlights:

-
    -
  • Fresh OpenStreetMap data as of July 10, 2023
  • -
  • Use Qt6 instead of Qt5, please report any log errors or issues
  • -
  • Add preference for larger map font size
  • -
  • Feature's layer is displayed in the Place Page
  • -
  • Fixed crash when rendering large objects
  • -
  • Faster loading of bookmarks and tracks
  • -
  • Support altitude, OsmAnd, and Garmin colors in imported GPX tracks
  • -
  • Fixed pedestrian ETA for big slopes
  • -
  • Prefer tertiary roads to service roads in car routing
  • -
  • Better Devanagari (Marathi) font
  • -
-

Search:

-
    -
  • Improved search results ranking
  • -
  • Fixed shop categories search
  • -
  • Fixed airport search results with empty names
  • -
-

Translations:

-
    -
  • Updated Catalan, Czech, Finnish, French, German, Italian, Polish, Spanish, Swedish, and Turkish translations
  • -
-

Map Styles:

-
    -
  • Improve visibility and findability of highway services and rest areas
  • -
  • Added second-hand category, auction, collectors shops, turnstile & exit
  • -
  • Fixed underwater tunnels not being visible
  • -
  • Fixed areal water tunnels being drawn over other areas
  • -
  • Introduced more detailed railway-rail-* types
  • -
  • Fixed railway-abandoned/preserved bridges
  • -
  • Added a bridge structure outline man_made-bridge
  • -
  • Added community center, conference center, exhibition center, events venue
  • -
  • Increased shop icons priority
  • -
  • Added boundary=protected_area
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of June 2, 2023
  • -
  • GPX import support
  • -
  • Fixed disappearing bookmark lists when wrong characters were saved in a bookmark name or description
  • -
  • Improved car and bicycle routing
  • -
  • Fixed bookmarks dialog color in the dark mode
  • -
-

Map Styles:

-
    -
  • Fixed funicular icon
  • -
  • Changed desert color in the dark mode
  • -
  • Added Fish Pass
  • -
  • New Icon for Parcel Locker
  • -
  • Fixed icon for northernmost Munich underground station
  • -
-

Translations:

-
    -
  • Corrected Basque, Belarusian, British, English, and Ukrainian translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of May 3
  • -
  • Fixed OpenGL issues on some devices
  • -
  • Search supports addr:interpolation addresses
  • -
  • Faster rendering of subway layer
  • -
  • Fixed wrong postcodes in Paris
  • -
  • Fixed missing Wikipedia links
  • -
  • Fixed car routing via roundabouts
  • -
-

Map Styles:

-
    -
  • Changed gate icon
  • -
  • Changed Lyon subway icon
  • -
  • Fixed US road shields
  • -
  • Fixed priority of water areas
  • -
  • Added camera shop, interior_decoration, antiques, art, cheese shop
  • -
-

Translations:

-
    -
  • Improved English, German, Brazilian Portuguese translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of March 29
  • -
  • Correctly import KML bookmarks with track data
  • -
  • Allow adding music and musical_instruments in the Editor
  • -
  • Sewing shops and haberdasheries are searchable
  • -
  • Changed displayed name to Organic Maps
  • -
  • OM version is selectable in About
  • -
-

Map Styles:

-
    -
  • Distinguish supermarkets and convenience stores
  • -
  • New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
  • -
  • Added money transfer, bicycle charging stations, power plant
  • -
  • Made captions mandatory for capitals with a star icon
  • -
  • Made park, forest, and scrub colors different
  • -
  • Added metal construction icons
  • -
  • Improved aerial ways, cable cars, power lines, fences
  • -
  • Reduce Barcelona subway visibility
  • -
  • Fixed isolines that are drawn over buildings, roads, etc.
  • -
  • Fixed some POI captions displayed earlier than their icons
  • -
-

Translations:

-
    -
  • Improved German, Turkish, Belarusian, Hungarian translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of February 27
  • -
  • Fixed and improved search
  • -
  • Split vegan and vegetarian cuisines in search
  • -
-

Map Styles:

-
    -
  • Fixed styles for airports, land uses, waterways, and hatching fill areas
  • -
  • Some smaller areas are not obscured by large ones anymore
  • -
  • Added healthcare specialists: alternative, audiologist, blood_donation, optometrist, podiatrist, psychotherapist, sample_collection, speech_therapist
  • -
  • Added communication towers, loading docks, solar, wind, gas, and hydropower generators
  • -
  • Fixed the Bilbao metro icon
  • -
  • Historic ruins can now be added in the Editor
  • -
-

Translations:

-
    -
  • Improved Arabic, Norwegian, Portuguese, and Turkish translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria
  • -
  • Filtered wrong search results in the list and on the map
  • -
  • Fixed crash on opening
  • -
-

Map Styles:

-
    -
  • Better icons for main and secondary building entrances
  • -
-

Translations:

-
    -
  • Fixed Persian, Polish, and German translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of January 21, 2023
  • -
  • Fixed import of some KML tracks
  • -
  • Automatic search for the current position in 30 hours of inactivity instead of 8 hours
  • -
  • Improved search categories results
  • -
  • Proper spelling of Australia in search results
  • -
  • leisure=track is now searchable
  • -
-

Routing:

-
    -
  • Proper handling of elevation for hiking and cycling
  • -
  • Fixed inter-region routing
  • -
  • Fixed routing via some bridges
  • -
  • Busways are supported
  • -
  • Added Croatia to Schengen area
  • -
-

Map Styles:

-
    -
  • Fixed Buenos Aires metro icons
  • -
  • Added Bowling Alley
  • -
  • Fixed historic=fountain and tourism=information-office icon
  • -
  • Equal icon sizes for springs & hot springs
  • -
-

Editor:

-
    -
  • Allowed editing names with /\°[] symbols
  • -
  • Added amenity=public_bookcase
  • -
  • Increased the maximum editable building floors from 25 to 50
  • -
-

Translations:

-
    -
  • Fixed Brazil, Czech, French, Hungarian, Spanish (Mexican), Turkish
  • -
  • Fixed TTS translations for Finnish and Portuguese
  • -
-

Linux:

-
    -
  • Import upper-case KML and KMZ files on case-sensitive Linux file systems
  • -
  • Use Organic Maps server to check if a connection is alive
  • -
-
-
- - -

Highlights:

-
    -
  • New OpenStreetMap data as of December 16, 2022
  • -
  • Improved routing algorithm
  • -
  • Do not route over highway=construction :)
  • -
  • Support multiple track geometry in KML files
  • -
  • Fixed KML 2.3 track import from OpenTracks
  • -
  • Faster parsing and rendering of complex KML tracks
  • -
  • Allow adding some shops, galleries, music schools in Editor
  • -
  • Improved city borders in search results
  • -
-

Map Styles:

-
    -
  • Improved, less bright icons in Night mode
  • -
  • Fixed subway icons in some cities
  • -
  • Properly draw barriers for areas and relations
  • -
  • Fixed duplicated names on the world map
  • -
  • Updated cave, mountain pass, peak, volcano, emergency phone, historic ship, ice cream, nightclub, music shop, stadium, video games icons
  • -
  • Fixed wrong priorities of leisure=pitch, historic, post office
  • -
  • More consistent filled/round icons (round means some kind of business/service)
  • -
-

Translations:

-
    -
  • TTS (Text-To-Speech) for Brazil, Mexican Spanish and Norwegian
  • -
  • Fixed German and Hungarian search strings
  • -
  • Updated Czech, Spanish translations
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of November 19
  • -
  • Fixed map dragging on Linux
  • -
  • Use "+" key to zoom in
  • -
  • Improved docs about building OM with WSL
  • -
  • Use high-resolution icons on high-DPI displays
  • -
-

Routing and Navigation:

-
    -
  • Corrected bicycle's speed for better routing
  • -
-

Styles:

-
    -
  • Fixed some improperly overlapping types
  • -
  • Added highway=busway and physiotherapist
  • -
  • Islands and archipelagos are now visible on World Map
  • -
  • Draw waterway=dam as background area
  • -
  • Water draw priority is lesser now than pier
  • -
  • Fixed leisure areas
  • -
-
-
- - -

Highlights:

-
    -
  • New OSM maps data as of October 29
  • -
  • Fixed search indicator in Viewport mode
  • -
  • Fixed search table update, now old results are always replaced by new ones
  • -
  • Minor performance improvements
  • -
-

Routing and Navigation:

-
    -
  • Dump corrupted KMLs to the log on startup
  • -
  • Show "Roads to avoid" options and warnings on the route also for walking, cycling, and metro routes
  • -
  • Fixed some routing issues, including wrong routing via highway exits/links
  • -
  • Enable Catalan TTS
  • -
  • Show speed camera on tap
  • -
-

Search:

-
    -
  • Show all found results on the map screen
  • -
  • Improved villages search
  • -
  • Show only matched categories if they were selected from the list, not names
  • -
  • Fixed street synonyms for nordic languages
  • -
-

Styles:

-
    -
  • Use regional metro/subway icons for entrances and stations
  • -
  • Added brewery, plumber, tailor, carpenter, sawmill, beekeeper, blacksmith, electrician, painter, and other craft icons
  • -
  • Added natural=shrubbery, natural=desert, leisure=dance, amenity=charging_station-motorcar, and more barrier types
  • -
  • Draw international airport icon on z7-9
  • -
  • Draw metro for major cities starting from z12
  • -
  • Do not draw railway station icon for building=train_station
  • -
  • Updated icons for garden, park, forest, national park, nature reserve, power, chimney
  • -
  • Add historic battlefield, gallows, pillory, memorial cross, stolperstein and war_memorial
  • -
  • Fixed historic=* priority
  • -
  • Support sauna=yes tags
  • -
  • Better colors for natural=scrub
  • -
  • Draw entrance icon instead of a dot
  • -
-

Translations:

-
    -
  • Use larger, more geographically significant names for Oregon maps in Downloader
  • -
  • Updated Catalan, Chinese, Dutch, Finnish, German, Hungarian, Italian, Polish, Portuguese (European and Brazilian), Turkish translations
  • -
-
-
- - -
    -
  • New OSM maps data as of September 12
  • -
  • Fixed wrong elevation data between -1,-1 and 1,1 latitudes and longitudes
  • -
  • Fixed crash on startup after editing some OSM objects
  • -
  • Bookmark lists are now sorted by recently modified time (sorting by name is planned!)
  • -
  • Improved displaying of the next street name directions
  • -
  • Show features in the viewport at the top of search results
  • -
  • Significantly speedup some search scenarios
  • -
  • Improved category ranking & address search.
  • -
  • Fixed highlighted hotel search results icon on the map
  • -
  • Improved German category search
  • -
  • Added driving_school, music_school, language_school, archaeological_site, craft-painter
  • -
  • Removed backgrounds from historic cemetery icons
  • -
  • Added different castle types: castrum, fortified_church, fortress, hillfort, kremlin, manor, palace & shiro
  • -
  • Increased visibility of education & some sports
  • -
  • Separated furniture & kitchen types
  • -
  • Better looking leisure=track
  • -
  • Fixed vending=fuel icon
  • -
-
-
- - -
    -
  • Fixed issue when some found objects were not highlighted on the map
  • -
  • Removed common street search synonyms like parkway, path, line, walk, trail, etc.
  • -
  • Fixed coordinates search if the query contains a newline
  • -
  • Ignore non-relevant search results for coordinates
  • -
  • Better search for capitals
  • -
  • Treat 'emergency' as a last-choice feature type
  • -
  • Added Catalan street search synonyms
  • -
  • Properly filter equal streets in search results
  • -
  • Improved visibility of military areas and boundaries
  • -
  • Show disabled parking spaces
  • -
  • Do not draw icon for residential gardens
  • -
  • Render farm yard
  • -
  • Add parking_entrance
  • -
  • Add playground and internet cafe icon
  • -
  • Add second_hand and charity
  • -
  • Add table_tennis, volleyball, beachvolleyball, skateboard, chess, padel, handball, futsal, hockey, badminton, pelota
  • -
  • Removed background circles from icons
  • -
-
-
- - -
    -
  • New OSM data as of July 18, 2022
  • -
  • Added missing shop types from OpenStreetMap tags: antiques, art, baby_goods, bag, boutique, charity, cheese, craft, dairy, deli, electrical, farm, fishing, grocery, health_food, houseware, interior_decoration, kitchen, lottery, medical_supply, nutrition_supplements, paint, pastry, perfumery, second_hand, sewing, storage_rental, tobacco, trade, watches, wholesale
  • -
  • Properly select max speed in some routing cases
  • -
  • sport=* tags have higher priority than leisure=pitch
  • -
  • Fill transit mark place page with feature info
  • -
  • Show text info about the next turn's street longer
  • -
  • Use building:min_level for 3D buildings
  • -
  • Allow removing cuisines from selection in the Editor
  • -
  • Fix Belarusian, German, Russian, and Ukrainian translations
  • -
  • Add missing translations for OSM natural=* and amenity=events_venue types
  • -
  • Fix assertion failure in ES3 scenario on Linux, now OM should work on mobile Linux too
  • -
-
-
- - -
    -
  • Improved/fixed the drawing of pattern lines
  • -
  • Icons for information=board/map
  • -
  • Fixed categories search with stop words
  • -
  • Made all existing sports searchable
  • -
  • amenity=parking can be added on the map via Editor
  • -
  • Fixed place=square visibility at 16+ zoom
  • -
  • Made streams & rivers visible on the beach
  • -
  • Made hedges and power lines less contrast
  • -
  • Improved Portuguese (Brasil), Spanish, Italian, French, and Euskara, enabled Marathi translations
  • -
-
-
- - -
    -
  • New OSM data as of June 13, 2022
  • -
  • Cross-region and other routing fixes
  • -
  • Nicer fences, city walls, paths/tracks, waterfalls, fountains, and drinking_water
  • -
  • Added icons for guidepost, plaque, bicycle rental
  • -
  • Typing category like "food" in the search also matches features' names
  • -
  • Added cliffs, embankments, bicycle repair stations, graves, water tunnels, craft=*
  • -
  • Road shields for Cyprus
  • -
  • Better displaying of the next turn street
  • -
  • Added Marathi localization
  • -
-
-
- - -
    -
  • Do not draw place=region.
  • -
  • Fix crash on routing.
  • -
-
-
- - -
    -
  • Fixed road shields rendering in some places
  • -
  • Improved car and pedestrian directions
  • -
  • Improved cross-region routing
  • -
  • Fixed some pedestrian/bike/car routing issues
  • -
  • Some performance optimizations
  • -
  • Fixed some translations
  • -
  • Added Marathi language
  • -
  • Added Devanagari font
  • -
-
-
- - -
    -
  • New OSM data as of April 15, 2022
  • -
  • Fixed annoying "Location is Disabled"
  • -
  • Show search results on map works!
  • -
  • Experimental Wikipedia articles everywhere
  • -
  • Improved car directions
  • -
  • Speed and battery optimizations
  • -
  • Routing improvements
  • -
  • Fixed subway in some cities
  • -
  • Added Euskara (Basque) translations
  • -
  • Improved Italian and German translations
  • -
  • Fixed menu colors and refreshed navigation menu
  • -
  • Added news, matrix, email, OSM links
  • -
  • RTL layout fixes
  • -
-

The full changelog: organicmaps.app

-
-
- - -
    -
  • New OSM data as of March 14, 2022
  • -
  • Wikipedia articles for well-known places
  • -
  • Search for organic shops and restaurants
  • -
  • Material style for bottom menus and "show on map"
  • -
  • Filter inaccurate network locations
  • -
  • Fixed compass overlapped by layers button for RTL
  • -
  • Tuned visibility of steps, footways, community_centre
  • -
  • Brighter roads in dark mode
  • -
  • Darker farmlands and parkings
  • -
  • Added bubble_tea and water_well
  • -
  • Fixed some icons
  • -
  • Improved routing
  • -
  • Improved ar, es, ro translations
  • -
+

CoMaps is now on Linux!

From 04246a55f2a1719ad1300110649cb2789ce0ed6b Mon Sep 17 00:00:00 2001 From: Eivind Samseth Date: Fri, 1 Aug 2025 21:37:52 +0200 Subject: [PATCH 178/222] [generator] Add check_date and variants Includes survey:date and check_date:opening_hours Only apply to amenity and shop types for now [generator] Add check_date to further types [generator] Improve date validation Check if it can be parsed to a proper date Signed-off-by: Eivind Samseth --- feature_list/feature_list.cpp | 6 ++++-- generator/osm2meta.cpp | 36 +++++++++++++++++++++++++++++++++++ generator/osm2meta.hpp | 1 + indexer/feature_meta.cpp | 6 ++++++ indexer/feature_meta.hpp | 2 ++ indexer/ftypes_matcher.cpp | 8 ++++++++ indexer/ftypes_matcher.hpp | 9 +++++++++ 7 files changed, 66 insertions(+), 2 deletions(-) diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp index 77afd7cd6..a8d357912 100644 --- a/feature_list/feature_list.cpp +++ b/feature_list/feature_list.cpp @@ -267,6 +267,8 @@ public: string const denomination(meta.Get(feature::Metadata::FMD_DENOMINATION)); string const wheelchair(GetWheelchairType(f)); string const opening_hours(meta.Get(feature::Metadata::FMD_OPEN_HOURS)); + string const check_date(meta.Get(feature::Metadata::FMD_CHECK_DATE)); + string const check_date_opening_hours(meta.Get(feature::Metadata::FMD_CHECK_DATE_OPEN_HOURS)); string const wikipedia(meta.Get(feature::Metadata::FMD_WIKIPEDIA)); string const wikimedia_commons(meta.Get(feature::Metadata::FMD_WIKIMEDIA_COMMONS)); string const panoramax(meta.Get(feature::Metadata::FMD_PANORAMAX)); @@ -277,7 +279,7 @@ public: vector columns = { osmId, uid, lat, lon, mwmName, category, name, std::string(city), addrStreet, addrHouse, phone, website, stars, std::string(metaOperator), internet, - denomination, wheelchair, opening_hours, wikipedia, floor, fee, atm, contact_facebook, + denomination, wheelchair, opening_hours, check_date, check_date_opening_hours, wikipedia, floor, fee, atm, contact_facebook, contact_instagram, contact_twitter, contact_vk, contact_line, contact_fediverse, contact_bluesky, wikimedia_commons, panoramax}; AppendNames(f, columns); @@ -290,7 +292,7 @@ void PrintHeader() vector columns = {"id", "old_id", "lat", "lon", "mwm", "category", "name", "city", "street", "house", "phone", "website", "cuisines", "stars", "operator", - "internet", "denomination", "wheelchair", "opening_hours", "wikipedia", + "internet", "denomination", "wheelchair", "opening_hours", "check_date", "check_date_opening_hours", "wikipedia", "floor", "fee", "atm", "contact_facebook", "contact_instagram", "contact_twitter", "contact_vk", "contact_line", "contact_fediverse", "contact_bluesky", "wikimedia_commons", "panoramax"}; // Append all supported name languages in order. diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp index 1f4f689e0..7ad81cb71 100644 --- a/generator/osm2meta.cpp +++ b/generator/osm2meta.cpp @@ -148,6 +148,28 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_opening_hours(std::strin return v; } +std::string MetadataTagProcessorImpl::ValidateAndFormat_date(std::string const & v) +{ + // Check if the date is in the format YYYY-MM-DD, and that it parses to a valid date. + std::regex const dateRegex(R"(^(\d{4})-(\d{2})-(\d{2})$)"); + std::smatch match; + if (std::regex_match(v, match, dateRegex)) + { + int year = std::stoi(match[1]); + int month = std::stoi(match[2]); + int day = std::stoi(match[3]); + + std::tm tm = {}; + std::istringstream ss(v); + ss >> std::get_time(&tm, "%Y-%m-%d"); + if (!ss.fail() && tm.tm_year + 1900 == year && tm.tm_mon + 1 == month && tm.tm_mday == day) + return v; + } + + LOG(LDEBUG, ("Invalid check_date tag value:", v)); + return {}; +} + std::string MetadataTagProcessorImpl::ValidateAndFormat_ele(std::string const & v) const { if (IsNoNameNoAddressBuilding(m_params)) @@ -532,10 +554,24 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const & if (!Metadata::TypeFromString(k, mdType)) return; + auto const & types = m_params.m_types; + std::string valid; switch (mdType) { case Metadata::FMD_OPEN_HOURS: valid = ValidateAndFormat_opening_hours(v); break; + case Metadata::FMD_CHECK_DATE: + if (ftypes::IsCheckDateChecker::Instance()(types)) + valid = ValidateAndFormat_date(v); + else + return; + break; + case Metadata::FMD_CHECK_DATE_OPEN_HOURS: + if (ftypes::IsCheckDateChecker::Instance()(types)) + valid = ValidateAndFormat_date(v); + else + return; + break; case Metadata::FMD_FAX_NUMBER: // The same validator as for phone. case Metadata::FMD_PHONE_NUMBER: valid = ValidateAndFormat_phone(v); break; case Metadata::FMD_STARS: valid = ValidateAndFormat_stars(v); break; diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp index 2e3834912..f9bd112ab 100644 --- a/generator/osm2meta.hpp +++ b/generator/osm2meta.hpp @@ -15,6 +15,7 @@ struct MetadataTagProcessorImpl static std::string ValidateAndFormat_url(std::string const & v) ; static std::string ValidateAndFormat_phone(std::string const & v) ; static std::string ValidateAndFormat_opening_hours(std::string const & v) ; + static std::string ValidateAndFormat_date(std::string const & v) ; std::string ValidateAndFormat_ele(std::string const & v) const; static std::string ValidateAndFormat_destination(std::string const & v) ; static std::string ValidateAndFormat_local_ref(std::string const & v) ; diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp index 7108856ed..cb4ebdcc1 100644 --- a/indexer/feature_meta.cpp +++ b/indexer/feature_meta.cpp @@ -75,6 +75,10 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType) { if (k == "opening_hours") outType = Metadata::FMD_OPEN_HOURS; + else if (k == "check_date" || k == "survey:date") + outType = Metadata::FMD_CHECK_DATE; + else if (k == "check_date:opening_hours") + outType = Metadata::FMD_CHECK_DATE_OPEN_HOURS; else if (k == "phone" || k == "contact:phone" || k == "contact:mobile" || k == "mobile") outType = Metadata::FMD_PHONE_NUMBER; else if (k == "fax" || k == "contact:fax") @@ -237,6 +241,8 @@ string ToString(Metadata::EType type) { case Metadata::FMD_CUISINE: return "cuisine"; case Metadata::FMD_OPEN_HOURS: return "opening_hours"; + case Metadata::FMD_CHECK_DATE: return "check_date"; + case Metadata::FMD_CHECK_DATE_OPEN_HOURS: return "check_date:opening_hours"; case Metadata::FMD_PHONE_NUMBER: return "phone"; case Metadata::FMD_FAX_NUMBER: return "fax"; case Metadata::FMD_STARS: return "stars"; diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp index a5bd21fe9..1d765f938 100644 --- a/indexer/feature_meta.hpp +++ b/indexer/feature_meta.hpp @@ -158,6 +158,8 @@ public: FMD_CONTACT_FEDIVERSE = 50, FMD_CONTACT_BLUESKY = 51, FMD_PANORAMAX = 52, + FMD_CHECK_DATE = 53, + FMD_CHECK_DATE_OPEN_HOURS = 54, FMD_COUNT }; diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 50cb56634..b968b2179 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -500,6 +500,14 @@ IsAmenityChecker::IsAmenityChecker() : BaseChecker(1 /* level */) m_types.push_back(classif().GetTypeByPath({"amenity"})); } +IsCheckDateChecker::IsCheckDateChecker() : BaseChecker(1 /* level */) +{ + Classificator const & c = classif(); + for (auto const * path : {"amenity", "shop", "leisure", "tourism", "craft", + "emergency", "healthcare", "office"}) + m_types.push_back(c.GetTypeByPath({path})); +} + AttractionsChecker::AttractionsChecker() : BaseChecker(2 /* level */) { base::StringIL const primaryAttractionTypes[] = { diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index c4ea6c25f..ea639000e 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -319,6 +319,15 @@ public: uint32_t GetType() const { return m_types[0]; } }; +class IsCheckDateChecker : public BaseChecker +{ + IsCheckDateChecker(); +public: + DECLARE_CHECKER_INSTANCE(IsCheckDateChecker); + + uint32_t GetType() const { return m_types[0]; } +}; + class AttractionsChecker : public BaseChecker { size_t m_additionalTypesStart; From 8f5c8a5bd7a2ee22996f75ad364d0c5091cddfa2 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Tue, 8 Jul 2025 18:38:28 +0200 Subject: [PATCH 179/222] [data] Refactor resources folder Signed-off-by: Andrei Shkrob --- .gitignore | 6 +- .../sdk/src/main/assets/resources-6plus_dark | 1 - .../sdk/src/main/assets/resources-6plus_light | 1 - android/sdk/src/main/assets/resources-default | 1 - .../sdk/src/main/assets/resources-hdpi_dark | 1 - .../sdk/src/main/assets/resources-hdpi_light | 1 - .../sdk/src/main/assets/resources-mdpi_dark | 1 - .../sdk/src/main/assets/resources-mdpi_light | 1 - .../sdk/src/main/assets/resources-xhdpi_dark | 1 - .../sdk/src/main/assets/resources-xhdpi_light | 1 - .../sdk/src/main/assets/resources-xxhdpi_dark | 1 - .../src/main/assets/resources-xxhdpi_light | 1 - .../src/main/assets/resources-xxxhdpi_dark | 1 - .../src/main/assets/resources-xxxhdpi_light | 1 - android/sdk/src/main/assets/symbols | 1 + data/{resources-svg => symbols-svg}/README.md | 0 .../ic_facebook_white.svg | 0 .../ic_follow.svg | 0 .../ic_instagram_white.svg | 0 .../ic_layer_contours.svg | 0 .../ic_layer_outdoor_lake.svg | 0 .../ic_layer_outdoor_river.svg | 0 .../ic_layer_outdoor_river_r2.svg | 0 .../ic_layer_subway.svg | 0 .../ic_level_white.svg | 0 .../ic_line_white.svg | 0 .../ic_twitter_white.svg | 0 .../ic_vk_white.svg | 0 .../ic_wikimedia_commons_white.svg | 0 .../ios_ic_category_secondhand_dark.svg | 0 .../ios_ic_category_secondhand_light.svg | 0 .../6plus/dark}/area-hatching.png | Bin .../6plus/dark}/traffic-arrow.png | Bin .../6plus/light}/area-hatching.png | Bin .../6plus/light}/traffic-arrow.png | Bin .../default}/arrow.obj | 0 .../default}/arrow_shadow.obj | 0 .../default}/default.ui | 0 .../default}/smaa-area.png | Bin .../default}/smaa-search.png | Bin .../hdpi/dark}/area-hatching.png | Bin .../hdpi/dark}/traffic-arrow.png | Bin .../hdpi/light}/area-hatching.png | Bin .../hdpi/light}/traffic-arrow.png | Bin .../mdpi/dark}/area-hatching.png | Bin .../mdpi/dark}/traffic-arrow.png | Bin .../mdpi/light}/area-hatching.png | Bin .../mdpi/light}/traffic-arrow.png | Bin .../xhdpi/dark}/area-hatching.png | Bin .../xhdpi/dark}/traffic-arrow.png | Bin .../xhdpi/light}/area-hatching.png | Bin .../xhdpi/light}/traffic-arrow.png | Bin .../xxhdpi/dark}/area-hatching.png | Bin .../xxhdpi/dark}/traffic-arrow.png | Bin .../xxhdpi/light}/area-hatching.png | Bin .../xxhdpi/light}/traffic-arrow.png | Bin .../xxxhdpi/dark}/area-hatching.png | Bin .../xxxhdpi/dark}/traffic-arrow.png | Bin .../xxxhdpi/light}/area-hatching.png | Bin .../xxxhdpi/light}/traffic-arrow.png | Bin dev_sandbox/CMakeLists.txt | 26 +--- docs/STRUCTURE.md | 7 +- drape_frontend/gui/skin.cpp | 4 +- indexer/map_style_reader.cpp | 14 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 56 +------- platform/platform_tests/CMakeLists.txt | 1 - platform/platform_tests/apk_test.cpp | 126 ------------------ platform/platform_tests/platform_test.cpp | 2 +- qt/CMakeLists.txt | 32 ++--- qt/build_style/build_skins.cpp | 6 +- tools/unix/generate_symbols.sh | 51 ++++--- 71 files changed, 62 insertions(+), 283 deletions(-) delete mode 120000 android/sdk/src/main/assets/resources-6plus_dark delete mode 120000 android/sdk/src/main/assets/resources-6plus_light delete mode 120000 android/sdk/src/main/assets/resources-default delete mode 120000 android/sdk/src/main/assets/resources-hdpi_dark delete mode 120000 android/sdk/src/main/assets/resources-hdpi_light delete mode 120000 android/sdk/src/main/assets/resources-mdpi_dark delete mode 120000 android/sdk/src/main/assets/resources-mdpi_light delete mode 120000 android/sdk/src/main/assets/resources-xhdpi_dark delete mode 120000 android/sdk/src/main/assets/resources-xhdpi_light delete mode 120000 android/sdk/src/main/assets/resources-xxhdpi_dark delete mode 120000 android/sdk/src/main/assets/resources-xxhdpi_light delete mode 120000 android/sdk/src/main/assets/resources-xxxhdpi_dark delete mode 120000 android/sdk/src/main/assets/resources-xxxhdpi_light create mode 120000 android/sdk/src/main/assets/symbols rename data/{resources-svg => symbols-svg}/README.md (100%) rename data/{resources-svg => symbols-svg}/ic_facebook_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_follow.svg (100%) rename data/{resources-svg => symbols-svg}/ic_instagram_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_contours.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_lake.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river_r2.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_subway.svg (100%) rename data/{resources-svg => symbols-svg}/ic_level_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_line_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_twitter_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_vk_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_wikimedia_commons_white.svg (100%) rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_dark.svg (100%) rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_light.svg (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/area-hatching.png (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/traffic-arrow.png (100%) rename data/{resources-6plus_light => symbols/6plus/light}/area-hatching.png (100%) rename data/{resources-6plus_light => symbols/6plus/light}/traffic-arrow.png (100%) rename data/{resources-default => symbols/default}/arrow.obj (100%) rename data/{resources-default => symbols/default}/arrow_shadow.obj (100%) rename data/{resources-default => symbols/default}/default.ui (100%) rename data/{resources-default => symbols/default}/smaa-area.png (100%) rename data/{resources-default => symbols/default}/smaa-search.png (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/area-hatching.png (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/traffic-arrow.png (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/area-hatching.png (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/traffic-arrow.png (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/area-hatching.png (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/traffic-arrow.png (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/area-hatching.png (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/traffic-arrow.png (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/area-hatching.png (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/area-hatching.png (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/traffic-arrow.png (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/area-hatching.png (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/area-hatching.png (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/traffic-arrow.png (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/area-hatching.png (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/area-hatching.png (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/traffic-arrow.png (100%) delete mode 100644 platform/platform_tests/apk_test.cpp diff --git a/.gitignore b/.gitignore index 8910d4ccc..0dc3565c5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,10 +14,10 @@ stxxl.errlog stxxl.log screenlog.0 -data/resources-*_design +data/symbols/*/design/ # symbols png/sdf are now generated at build -data/resources-*_*/symbols.png -data/resources-*_*/symbols.sdf +data/symbols/**/symbols.png +data/symbols/**/symbols.sdf data/colors_design.txt data/patterns_design.txt data/bookmarks diff --git a/android/sdk/src/main/assets/resources-6plus_dark b/android/sdk/src/main/assets/resources-6plus_dark deleted file mode 120000 index 543501d63..000000000 --- a/android/sdk/src/main/assets/resources-6plus_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-6plus_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-6plus_light b/android/sdk/src/main/assets/resources-6plus_light deleted file mode 120000 index dd322dc38..000000000 --- a/android/sdk/src/main/assets/resources-6plus_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-6plus_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-default b/android/sdk/src/main/assets/resources-default deleted file mode 120000 index 9a8aaa181..000000000 --- a/android/sdk/src/main/assets/resources-default +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-default \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-hdpi_dark b/android/sdk/src/main/assets/resources-hdpi_dark deleted file mode 120000 index 21d8f368d..000000000 --- a/android/sdk/src/main/assets/resources-hdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-hdpi_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-hdpi_light b/android/sdk/src/main/assets/resources-hdpi_light deleted file mode 120000 index 5da93ccad..000000000 --- a/android/sdk/src/main/assets/resources-hdpi_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-hdpi_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-mdpi_dark b/android/sdk/src/main/assets/resources-mdpi_dark deleted file mode 120000 index f59648be5..000000000 --- a/android/sdk/src/main/assets/resources-mdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-mdpi_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-mdpi_light b/android/sdk/src/main/assets/resources-mdpi_light deleted file mode 120000 index 40e9f0d61..000000000 --- a/android/sdk/src/main/assets/resources-mdpi_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-mdpi_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xhdpi_dark b/android/sdk/src/main/assets/resources-xhdpi_dark deleted file mode 120000 index 127d046ad..000000000 --- a/android/sdk/src/main/assets/resources-xhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xhdpi_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xhdpi_light b/android/sdk/src/main/assets/resources-xhdpi_light deleted file mode 120000 index 864558920..000000000 --- a/android/sdk/src/main/assets/resources-xhdpi_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xhdpi_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xxhdpi_dark b/android/sdk/src/main/assets/resources-xxhdpi_dark deleted file mode 120000 index d9877f68f..000000000 --- a/android/sdk/src/main/assets/resources-xxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxhdpi_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xxhdpi_light b/android/sdk/src/main/assets/resources-xxhdpi_light deleted file mode 120000 index f0643e9d1..000000000 --- a/android/sdk/src/main/assets/resources-xxhdpi_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxhdpi_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xxxhdpi_dark b/android/sdk/src/main/assets/resources-xxxhdpi_dark deleted file mode 120000 index 072a2b1ec..000000000 --- a/android/sdk/src/main/assets/resources-xxxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxxhdpi_dark \ No newline at end of file diff --git a/android/sdk/src/main/assets/resources-xxxhdpi_light b/android/sdk/src/main/assets/resources-xxxhdpi_light deleted file mode 120000 index ab6082743..000000000 --- a/android/sdk/src/main/assets/resources-xxxhdpi_light +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxxhdpi_light \ No newline at end of file diff --git a/android/sdk/src/main/assets/symbols b/android/sdk/src/main/assets/symbols new file mode 120000 index 000000000..60317a425 --- /dev/null +++ b/android/sdk/src/main/assets/symbols @@ -0,0 +1 @@ +../../../../../data/symbols \ No newline at end of file diff --git a/data/resources-svg/README.md b/data/symbols-svg/README.md similarity index 100% rename from data/resources-svg/README.md rename to data/symbols-svg/README.md diff --git a/data/resources-svg/ic_facebook_white.svg b/data/symbols-svg/ic_facebook_white.svg similarity index 100% rename from data/resources-svg/ic_facebook_white.svg rename to data/symbols-svg/ic_facebook_white.svg diff --git a/data/resources-svg/ic_follow.svg b/data/symbols-svg/ic_follow.svg similarity index 100% rename from data/resources-svg/ic_follow.svg rename to data/symbols-svg/ic_follow.svg diff --git a/data/resources-svg/ic_instagram_white.svg b/data/symbols-svg/ic_instagram_white.svg similarity index 100% rename from data/resources-svg/ic_instagram_white.svg rename to data/symbols-svg/ic_instagram_white.svg diff --git a/data/resources-svg/ic_layer_contours.svg b/data/symbols-svg/ic_layer_contours.svg similarity index 100% rename from data/resources-svg/ic_layer_contours.svg rename to data/symbols-svg/ic_layer_contours.svg diff --git a/data/resources-svg/ic_layer_outdoor_lake.svg b/data/symbols-svg/ic_layer_outdoor_lake.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_lake.svg rename to data/symbols-svg/ic_layer_outdoor_lake.svg diff --git a/data/resources-svg/ic_layer_outdoor_river.svg b/data/symbols-svg/ic_layer_outdoor_river.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_river.svg rename to data/symbols-svg/ic_layer_outdoor_river.svg diff --git a/data/resources-svg/ic_layer_outdoor_river_r2.svg b/data/symbols-svg/ic_layer_outdoor_river_r2.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_river_r2.svg rename to data/symbols-svg/ic_layer_outdoor_river_r2.svg diff --git a/data/resources-svg/ic_layer_subway.svg b/data/symbols-svg/ic_layer_subway.svg similarity index 100% rename from data/resources-svg/ic_layer_subway.svg rename to data/symbols-svg/ic_layer_subway.svg diff --git a/data/resources-svg/ic_level_white.svg b/data/symbols-svg/ic_level_white.svg similarity index 100% rename from data/resources-svg/ic_level_white.svg rename to data/symbols-svg/ic_level_white.svg diff --git a/data/resources-svg/ic_line_white.svg b/data/symbols-svg/ic_line_white.svg similarity index 100% rename from data/resources-svg/ic_line_white.svg rename to data/symbols-svg/ic_line_white.svg diff --git a/data/resources-svg/ic_twitter_white.svg b/data/symbols-svg/ic_twitter_white.svg similarity index 100% rename from data/resources-svg/ic_twitter_white.svg rename to data/symbols-svg/ic_twitter_white.svg diff --git a/data/resources-svg/ic_vk_white.svg b/data/symbols-svg/ic_vk_white.svg similarity index 100% rename from data/resources-svg/ic_vk_white.svg rename to data/symbols-svg/ic_vk_white.svg diff --git a/data/resources-svg/ic_wikimedia_commons_white.svg b/data/symbols-svg/ic_wikimedia_commons_white.svg similarity index 100% rename from data/resources-svg/ic_wikimedia_commons_white.svg rename to data/symbols-svg/ic_wikimedia_commons_white.svg diff --git a/data/resources-svg/ios_ic_category_secondhand_dark.svg b/data/symbols-svg/ios_ic_category_secondhand_dark.svg similarity index 100% rename from data/resources-svg/ios_ic_category_secondhand_dark.svg rename to data/symbols-svg/ios_ic_category_secondhand_dark.svg diff --git a/data/resources-svg/ios_ic_category_secondhand_light.svg b/data/symbols-svg/ios_ic_category_secondhand_light.svg similarity index 100% rename from data/resources-svg/ios_ic_category_secondhand_light.svg rename to data/symbols-svg/ios_ic_category_secondhand_light.svg diff --git a/data/resources-6plus_dark/area-hatching.png b/data/symbols/6plus/dark/area-hatching.png similarity index 100% rename from data/resources-6plus_dark/area-hatching.png rename to data/symbols/6plus/dark/area-hatching.png diff --git a/data/resources-6plus_dark/traffic-arrow.png b/data/symbols/6plus/dark/traffic-arrow.png similarity index 100% rename from data/resources-6plus_dark/traffic-arrow.png rename to data/symbols/6plus/dark/traffic-arrow.png diff --git a/data/resources-6plus_light/area-hatching.png b/data/symbols/6plus/light/area-hatching.png similarity index 100% rename from data/resources-6plus_light/area-hatching.png rename to data/symbols/6plus/light/area-hatching.png diff --git a/data/resources-6plus_light/traffic-arrow.png b/data/symbols/6plus/light/traffic-arrow.png similarity index 100% rename from data/resources-6plus_light/traffic-arrow.png rename to data/symbols/6plus/light/traffic-arrow.png diff --git a/data/resources-default/arrow.obj b/data/symbols/default/arrow.obj similarity index 100% rename from data/resources-default/arrow.obj rename to data/symbols/default/arrow.obj diff --git a/data/resources-default/arrow_shadow.obj b/data/symbols/default/arrow_shadow.obj similarity index 100% rename from data/resources-default/arrow_shadow.obj rename to data/symbols/default/arrow_shadow.obj diff --git a/data/resources-default/default.ui b/data/symbols/default/default.ui similarity index 100% rename from data/resources-default/default.ui rename to data/symbols/default/default.ui diff --git a/data/resources-default/smaa-area.png b/data/symbols/default/smaa-area.png similarity index 100% rename from data/resources-default/smaa-area.png rename to data/symbols/default/smaa-area.png diff --git a/data/resources-default/smaa-search.png b/data/symbols/default/smaa-search.png similarity index 100% rename from data/resources-default/smaa-search.png rename to data/symbols/default/smaa-search.png diff --git a/data/resources-hdpi_dark/area-hatching.png b/data/symbols/hdpi/dark/area-hatching.png similarity index 100% rename from data/resources-hdpi_dark/area-hatching.png rename to data/symbols/hdpi/dark/area-hatching.png diff --git a/data/resources-hdpi_dark/traffic-arrow.png b/data/symbols/hdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-hdpi_dark/traffic-arrow.png rename to data/symbols/hdpi/dark/traffic-arrow.png diff --git a/data/resources-hdpi_light/area-hatching.png b/data/symbols/hdpi/light/area-hatching.png similarity index 100% rename from data/resources-hdpi_light/area-hatching.png rename to data/symbols/hdpi/light/area-hatching.png diff --git a/data/resources-hdpi_light/traffic-arrow.png b/data/symbols/hdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-hdpi_light/traffic-arrow.png rename to data/symbols/hdpi/light/traffic-arrow.png diff --git a/data/resources-mdpi_dark/area-hatching.png b/data/symbols/mdpi/dark/area-hatching.png similarity index 100% rename from data/resources-mdpi_dark/area-hatching.png rename to data/symbols/mdpi/dark/area-hatching.png diff --git a/data/resources-mdpi_dark/traffic-arrow.png b/data/symbols/mdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-mdpi_dark/traffic-arrow.png rename to data/symbols/mdpi/dark/traffic-arrow.png diff --git a/data/resources-mdpi_light/area-hatching.png b/data/symbols/mdpi/light/area-hatching.png similarity index 100% rename from data/resources-mdpi_light/area-hatching.png rename to data/symbols/mdpi/light/area-hatching.png diff --git a/data/resources-mdpi_light/traffic-arrow.png b/data/symbols/mdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-mdpi_light/traffic-arrow.png rename to data/symbols/mdpi/light/traffic-arrow.png diff --git a/data/resources-xhdpi_dark/area-hatching.png b/data/symbols/xhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xhdpi_dark/area-hatching.png rename to data/symbols/xhdpi/dark/area-hatching.png diff --git a/data/resources-xhdpi_dark/traffic-arrow.png b/data/symbols/xhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xhdpi_dark/traffic-arrow.png rename to data/symbols/xhdpi/dark/traffic-arrow.png diff --git a/data/resources-xhdpi_light/area-hatching.png b/data/symbols/xhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xhdpi_light/area-hatching.png rename to data/symbols/xhdpi/light/area-hatching.png diff --git a/data/resources-xhdpi_light/traffic-arrow.png b/data/symbols/xhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xhdpi_light/traffic-arrow.png rename to data/symbols/xhdpi/light/traffic-arrow.png diff --git a/data/resources-xxhdpi_dark/area-hatching.png b/data/symbols/xxhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xxhdpi_dark/area-hatching.png rename to data/symbols/xxhdpi/dark/area-hatching.png diff --git a/data/resources-xxhdpi_dark/traffic-arrow.png b/data/symbols/xxhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xxhdpi_dark/traffic-arrow.png rename to data/symbols/xxhdpi/dark/traffic-arrow.png diff --git a/data/resources-xxhdpi_light/area-hatching.png b/data/symbols/xxhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xxhdpi_light/area-hatching.png rename to data/symbols/xxhdpi/light/area-hatching.png diff --git a/data/resources-xxhdpi_light/traffic-arrow.png b/data/symbols/xxhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xxhdpi_light/traffic-arrow.png rename to data/symbols/xxhdpi/light/traffic-arrow.png diff --git a/data/resources-xxxhdpi_dark/area-hatching.png b/data/symbols/xxxhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xxxhdpi_dark/area-hatching.png rename to data/symbols/xxxhdpi/dark/area-hatching.png diff --git a/data/resources-xxxhdpi_dark/traffic-arrow.png b/data/symbols/xxxhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xxxhdpi_dark/traffic-arrow.png rename to data/symbols/xxxhdpi/dark/traffic-arrow.png diff --git a/data/resources-xxxhdpi_light/area-hatching.png b/data/symbols/xxxhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xxxhdpi_light/area-hatching.png rename to data/symbols/xxxhdpi/light/area-hatching.png diff --git a/data/resources-xxxhdpi_light/traffic-arrow.png b/data/symbols/xxxhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xxxhdpi_light/traffic-arrow.png rename to data/symbols/xxxhdpi/light/traffic-arrow.png diff --git a/dev_sandbox/CMakeLists.txt b/dev_sandbox/CMakeLists.txt index c4bc21782..4e2debc7c 100644 --- a/dev_sandbox/CMakeLists.txt +++ b/dev_sandbox/CMakeLists.txt @@ -83,14 +83,9 @@ function(copy_resources) endfunction() copy_resources( + fonts + symbols countries-strings - resources-default - resources-mdpi_light - resources-hdpi_light - resources-xhdpi_light - resources-xxhdpi_light - resources-xxxhdpi_light - resources-6plus_light vulkan_shaders categories.txt @@ -109,23 +104,6 @@ copy_resources( types.txt World.mwm WorldCoasts.mwm - - fonts/blacklist.txt - fonts/whitelist.txt - fonts/unicode_blocks.txt - fonts/00_NotoNaskhArabic-Regular.ttf - fonts/00_NotoSansBengali-Regular.ttf - fonts/00_NotoSansHebrew-Regular.ttf - fonts/00_NotoSansMalayalam-Regular.ttf - fonts/00_NotoSansThai-Regular.ttf - fonts/00_NotoSerifDevanagari-Regular.ttf - fonts/01_dejavusans.ttf - fonts/02_droidsans-fallback.ttf - fonts/03_jomolhari-id-a3d.ttf - fonts/04_padauk.ttf - fonts/05_khmeros.ttf - fonts/06_code2000.ttf - fonts/07_roboto_medium.ttf ) if (NOT PLATFORM_LINUX) diff --git a/docs/STRUCTURE.md b/docs/STRUCTURE.md index e118f1e10..1fd0491e0 100644 --- a/docs/STRUCTURE.md +++ b/docs/STRUCTURE.md @@ -43,13 +43,14 @@ Automatically generated: ### Styles and icons -- `resources-default/` - -- `resources-svg/` - social networks icons +- `symbols/` - symbols for different screen DPIs +- `symbols/default/` - default resources used on all sceen DPIs +- `symbols-svg/` - social networks icons - `search-icons/svg/` - source SVG files for search categories icons - `styles/` - map [style files](STYLES.md#files) Automatically [generated](STYLES.md#technical-details): -- `resources-*/` - icons skin files in various resolutions for `dark` and `clear` (light) themes. +- `symbols/` - icons skin files in various resolutions for `dark` and `light` themes. - `drules_proto*` - binary drawing rules files. - `colors.txt`,`patterns.txt`,`visibility.txt` diff --git a/drape_frontend/gui/skin.cpp b/drape_frontend/gui/skin.cpp index 623087b73..c0f3f230f 100644 --- a/drape_frontend/gui/skin.cpp +++ b/drape_frontend/gui/skin.cpp @@ -288,7 +288,7 @@ ReaderPtr ResolveGuiSkinFile(std::string const & deviceType) std::unique_ptr reader; try { - reader = pl.GetReader("resources-default/" + deviceType + ".ui"); + reader = pl.GetReader("symbols/default/" + deviceType + ".ui"); } catch(FileAbsentException & e) { @@ -299,7 +299,7 @@ ReaderPtr ResolveGuiSkinFile(std::string const & deviceType) { try { - reader = pl.GetReader("resources-default/default.ui"); + reader = pl.GetReader("symbols/default/default.ui"); } catch(FileAbsentException & e) { diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index ba4f7091e..cc0f98550 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -7,8 +7,8 @@ namespace { -std::string const kSuffixDark = "_dark"; -std::string const kSuffixLight = "_light"; +std::string const kSuffixDark = "dark"; +std::string const kSuffixLight = "light"; std::string const kSuffixDefaultDark = "_default_dark"; std::string const kSuffixDefaultLight = "_default_light"; std::string const kSuffixVehicleDark = "_vehicle_dark"; @@ -42,7 +42,7 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle) case MapStyleOutdoorsDark: return kSuffixOutdoorsDark; case MapStyleMerged: - return std::string(); + return {}; case MapStyleCount: break; @@ -70,7 +70,7 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle) case MapStyleOutdoorsLight: return kSuffixLight; case MapStyleMerged: - return std::string(); + return {}; case MapStyleCount: break; @@ -122,9 +122,7 @@ ReaderPtr StyleReader::GetDrawingRulesReader() const ReaderPtr StyleReader::GetResourceReader(std::string const & file, std::string_view density) const { - std::string const resourceDir = - std::string("resources-").append(density) + GetStyleResourcesSuffix(GetCurrentStyle()); - std::string resFile = base::JoinPath(resourceDir, file); + std::string resFile = base::JoinPath("symbols", std::string{density}, GetStyleResourcesSuffix(GetCurrentStyle()), file); auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile); if (GetPlatform().IsFileExistsByFullPath(overriddenResFile)) @@ -140,7 +138,7 @@ ReaderPtr StyleReader::GetResourceReader(std::string const & file, ReaderPtr StyleReader::GetDefaultResourceReader(std::string const & file) const { - return GetPlatform().GetReader(base::JoinPath("resources-default", file)); + return GetPlatform().GetReader(base::JoinPath("symbols/default", file)); } StyleReader & GetStyleReader() diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 0cb9197a6..9df408e00 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039371B52C5B68CD00708377 /* UIFont+monospaced.swift */; }; 165953742CB1D85500CFED7C /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 165953732CB1D83700CFED7C /* fonts */; }; + 165953942CB44B5600CFED7C /* symbols in Resources */ = {isa = PBXBuildFile; fileRef = 165953932CB44B3B00CFED7C /* symbols */; }; 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; }; 272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */; }; @@ -202,8 +203,6 @@ 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */ = {isa = PBXBuildFile; fileRef = 408645FB21495EB1000A4A1D /* categories_cuisines.txt */; }; 44360A0D2A7D34990016F412 /* TransportRuler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44360A0C2A7D34990016F412 /* TransportRuler.swift */; }; 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44360A102A7D35440016F412 /* TransportRuler.xib */; }; - 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */; }; - 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */; }; 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */; }; 4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */; }; 462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 462452E72BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm */; }; @@ -281,31 +280,23 @@ 6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; }; 6741A9451BF340DE002C974C /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; 6741A9491BF340DE002C974C /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; }; - 6741A94A1BF340DE002C974C /* resources-6plus_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */; }; - 6741A94D1BF340DE002C974C /* resources-xxhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */; }; 6741A94F1BF340DE002C974C /* MWMDefaultAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F198C1AB81A00006EAF7E /* MWMDefaultAlert.xib */; }; 6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B701B4A41D40081A24A /* MWMDownloaderDialogHeader.xib */; }; 6741A9521BF340DE002C974C /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; }; - 6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */; }; 6741A95C1BF340DE002C974C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; }; 6741A95D1BF340DE002C974C /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; }; 6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; }; - 6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */; }; 6741A9681BF340DE002C974C /* faq.html in Resources */ = {isa = PBXBuildFile; fileRef = 978D4A30199A11E600D72CA7 /* faq.html */; }; 6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */; }; 6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */; }; 6741A9711BF340DE002C974C /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; }; - 6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */; }; 6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; }; 6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; }; 6741A97E1BF340DE002C974C /* drules_proto_default_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */; }; - 6741A97F1BF340DE002C974C /* resources-mdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */; }; 6741A9871BF340DE002C974C /* drules_proto_default_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */; }; 6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; }; - 6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; }; 6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; }; - 6741A9981BF340DE002C974C /* resources-xhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */; }; 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; }; 6741A9A31BF340DE002C974C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; @@ -329,7 +320,6 @@ 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */; }; 676507601C10559800830BB3 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; }; 676507611C10559B00830BB3 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; }; - 677A2DE21C0DD50900635A00 /* resources-default in Resources */ = {isa = PBXBuildFile; fileRef = A367C93A1B17334800E2B6E7 /* resources-default */; }; 6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; }; 8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */; }; 8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */; }; @@ -547,8 +537,6 @@ EDF838C42C00B9D6007E4E67 /* FileManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDF838B32C00B9C7007E4E67 /* FileManagerMock.swift */; }; EDFDFB482B7139670013A44C /* Social Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB472B7139670013A44C /* Social Media.swift */; }; EDFE1A4A2DF1989700FDEA38 /* UIAlertController+UnknownCurrentPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFE1A492DF1989700FDEA38 /* UIAlertController+UnknownCurrentPosition.swift */; }; - F607C1881C032A8800B53A87 /* resources-hdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_light */; }; - F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; }; F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; }; F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; }; F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F62607FC207B790300176C5A /* SpinnerAlert.swift */; }; @@ -764,6 +752,7 @@ /* Begin PBXFileReference section */ 039371B52C5B68CD00708377 /* UIFont+monospaced.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+monospaced.swift"; sourceTree = ""; }; 165953732CB1D83700CFED7C /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../data/fonts; sourceTree = ""; }; + 165953932CB44B3B00CFED7C /* symbols */ = {isa = PBXFileReference; lastKnownFileType = folder; name = symbols; path = ../../data/symbols; sourceTree = ""; }; 1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = ""; tabWidth = 2; }; 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = ""; tabWidth = 2; }; @@ -1119,8 +1108,6 @@ 408645FB21495EB1000A4A1D /* categories_cuisines.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories_cuisines.txt; path = ../../data/categories_cuisines.txt; sourceTree = ""; }; 44360A0C2A7D34990016F412 /* TransportRuler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransportRuler.swift; sourceTree = ""; }; 44360A102A7D35440016F412 /* TransportRuler.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TransportRuler.xib; sourceTree = ""; }; - 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_light"; path = "../../data/resources-xxxhdpi_light"; sourceTree = ""; }; - 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_dark"; path = "../../data/resources-xxxhdpi_dark"; sourceTree = ""; }; 451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = ""; }; 452FCA3A1B6A3DF7007019AB /* colors.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = colors.txt; path = ../../data/colors.txt; sourceTree = ""; }; 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_vehicle_light.bin; path = ../../data/drules_proto_vehicle_light.bin; sourceTree = ""; }; @@ -1213,15 +1200,7 @@ 49AB95972CB2FE5300468EA2 /* UIButton+ImagePadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+ImagePadding.swift"; sourceTree = ""; }; 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_dark.bin; path = ../../data/drules_proto_default_dark.bin; sourceTree = ""; }; 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_light.bin; path = ../../data/drules_proto_default_light.bin; sourceTree = ""; }; - 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_light"; path = "../../data/resources-6plus_light"; sourceTree = ""; }; - 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_light"; path = "../../data/resources-mdpi_light"; sourceTree = ""; }; - 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_light"; path = "../../data/resources-xhdpi_light"; sourceTree = ""; }; - 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_light"; path = "../../data/resources-xxhdpi_light"; sourceTree = ""; }; 4A300ED31C6DCFD400140018 /* countries-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "countries-strings"; path = "../../data/countries-strings"; sourceTree = ""; }; - 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_dark"; path = "../../data/resources-6plus_dark"; sourceTree = ""; }; - 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_dark"; path = "../../data/resources-mdpi_dark"; sourceTree = ""; }; - 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_dark"; path = "../../data/resources-xhdpi_dark"; sourceTree = ""; }; - 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = ""; }; 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeechTests.mm; sourceTree = ""; tabWidth = 2; }; 4B83AE472C2E59F800B0C3BC /* TTSTester.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = TTSTester.h; sourceTree = ""; tabWidth = 2; }; 4B83AE482C2E59F800B0C3BC /* TTSTester.mm */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = TTSTester.mm; sourceTree = ""; tabWidth = 2; }; @@ -1345,7 +1324,6 @@ 99F8B4C523B644A6009FF0B4 /* MapStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapStyleSheet.swift; sourceTree = ""; }; 99F9A0E42462CA0E00AE21E0 /* DownloadAllView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadAllView.swift; sourceTree = ""; }; 99F9A0E62462CA1700AE21E0 /* DownloadAllView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadAllView.xib; sourceTree = ""; }; - A367C93A1B17334800E2B6E7 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-default"; path = "../../data/resources-default"; sourceTree = ""; }; A630D1E9207CA95900976DEA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = ""; }; A630D1EB207CA96700976DEA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = ""; }; A630D1EC207CA96D00976DEA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = da; path = da.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -1551,8 +1529,6 @@ EDFE1A492DF1989700FDEA38 /* UIAlertController+UnknownCurrentPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+UnknownCurrentPosition.swift"; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - F607C1831C032A8800B53A87 /* resources-hdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_light"; path = "../../data/resources-hdpi_light"; sourceTree = ""; }; - F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = ""; }; F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = ""; tabWidth = 2; }; F607C18D1C047FDC00B53A87 /* MWMSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = MWMSegue.m; sourceTree = ""; tabWidth = 2; }; F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = opening_hours_how_to_edit.html; path = ../../data/opening_hours_how_to_edit.html; sourceTree = ""; }; @@ -3947,6 +3923,7 @@ isa = PBXGroup; children = ( 165953732CB1D83700CFED7C /* fonts */, + 165953932CB44B3B00CFED7C /* symbols */, 47AEF83F2231249E00D20538 /* categories_brands.txt */, 408645FB21495EB1000A4A1D /* categories_cuisines.txt */, FAAFD696139D9BE2000AE70C /* categories.txt */, @@ -3968,19 +3945,6 @@ F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, 451950391B7A3E070085DA05 /* patterns.txt */, - 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */, - 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */, - A367C93A1B17334800E2B6E7 /* resources-default */, - F607C1831C032A8800B53A87 /* resources-hdpi_light */, - F607C1841C032A8800B53A87 /* resources-hdpi_dark */, - 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */, - 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */, - 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */, - 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */, - 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */, - 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */, - 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */, - 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */, FAAEA7D0161BD26600CCD661 /* synonyms.txt */, BB25B1A51FB32767007276FA /* transit_colors.txt */, FA64D9A813F975AD00350ECF /* types.txt */, @@ -4202,6 +4166,7 @@ buildActionMask = 2147483647; files = ( 165953742CB1D85500CFED7C /* fonts in Resources */, + 165953942CB44B5600CFED7C /* symbols in Resources */, 47AEF8402231249E00D20538 /* categories_brands.txt in Resources */, F6C3A1B221AC22810060EEC8 /* Alert 5.m4a in Resources */, 3404F49A2028A20D0090E401 /* BMCCategoryCell.xib in Resources */, @@ -4233,7 +4198,6 @@ 993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */, F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */, 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */, - 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */, 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */, 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */, 99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */, @@ -4304,7 +4268,6 @@ 34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */, BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */, 34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */, - 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */, F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */, 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */, F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */, @@ -4312,20 +4275,9 @@ F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */, 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */, 676507601C10559800830BB3 /* patterns.txt in Resources */, - 6741A94A1BF340DE002C974C /* resources-6plus_light in Resources */, 9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */, - 6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */, - 677A2DE21C0DD50900635A00 /* resources-default in Resources */, - F607C1881C032A8800B53A87 /* resources-hdpi_light in Resources */, - F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */, FA637ED229A500BE00D8921A /* drules_proto_outdoors_light.bin in Resources */, - 6741A97F1BF340DE002C974C /* resources-mdpi_light in Resources */, - 6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */, - 6741A9981BF340DE002C974C /* resources-xhdpi_light in Resources */, - 6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */, - 6741A94D1BF340DE002C974C /* resources-xxhdpi_light in Resources */, 3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */, - 6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */, 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */, 6741A9421BF340DE002C974C /* sound-strings in Resources */, F69018BD1E9F7CB600B3C10B /* MWMAutoupdateController.xib in Resources */, diff --git a/platform/platform_tests/CMakeLists.txt b/platform/platform_tests/CMakeLists.txt index b3cb32c5f..454c2e55b 100644 --- a/platform/platform_tests/CMakeLists.txt +++ b/platform/platform_tests/CMakeLists.txt @@ -1,7 +1,6 @@ project(platform_tests) set(SRC - apk_test.cpp country_file_tests.cpp distance_tests.cpp duration_tests.cpp diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp deleted file mode 100644 index efbbb7e69..000000000 --- a/platform/platform_tests/apk_test.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "testing/testing.hpp" - -#include "platform/platform.hpp" - -#include "coding/zip_reader.hpp" -#include "coding/internal/file_data.hpp" - -#include "base/file_name_utils.hpp" -#include "base/thread.hpp" -#include "base/thread_pool.hpp" -#include "base/logging.hpp" - -#include -#include -#include -#include - -namespace apk_test -{ -using std::string, std::vector; - -char const * arrFiles[] = { - "copyright.html", - "resources-mdpi_light/symbols.sdf", - "resources-mdpi_light/symbols.png", - "resources-hdpi_light/symbols.sdf", - "resources-hdpi_light/symbols.png", - "resources-xhdpi_light/symbols.sdf", - "resources-xhdpi_light/symbols.png", - "categories.txt", - "categories_cuisines.txt", - "classificator.txt", - "types.txt", - "fonts/blacklist.txt", - "fonts/whitelist.txt", - "fonts/unicode_blocks.txt", - "languages.txt", - "drules_proto_default_light.bin", - "packed_polygons.bin", - "countries.txt" -}; - -class ApkTester : public threads::IRoutine -{ - static const int COUNT = ARRAY_SIZE(arrFiles); - string const & m_cont; - -public: - explicit ApkTester(string const & cont) : m_cont(cont), m_hashes(COUNT) - { - } - - virtual void Do() - { - string const prefix("assets/"); - - while (true) - { - size_t ind = rand() % COUNT; - if (m_hashes[ind] != 0) - { - ind = COUNT; - for (size_t i = 0; i < COUNT; ++i) - if (m_hashes[i] == 0) - { - ind = i; - break; - } - } - - if (ind == COUNT) - break; - - try - { - ZipFileReader reader(m_cont, prefix + arrFiles[ind]); - - size_t const size = reader.Size(); - vector buffer(size); - reader.Read(0, &buffer[0], size); - - m_hashes[ind] = accumulate(buffer.begin(), buffer.end(), static_cast(0)); - } - catch (Reader::Exception const & ex) - { - LOG(LERROR, (ex.Msg())); - break; - } - } - } - - vector m_hashes; -}; - -/* -UNIT_TEST(ApkReader_Multithreaded) -{ - /// @todo Update test with current apk path. - string const path = base::JoinPath(GetPlatform().WritableDir(), "../android/MapsWithMePro/bin/MapsWithMePro-production.apk"); - - uint64_t size; - if (!base::GetFileSize(path, size)) - { - LOG(LINFO, ("Apk not found")); - return; - } - - srand(static_cast(size)); - - size_t const count = 20; - base::thread_pool::routine_simple::ThreadPool pool(count); - - for (size_t i = 0; i < count; ++i) - pool.Add(make_unique(path)); - - pool.Join(); - - typedef ApkTester const * PtrT; - PtrT etalon = dynamic_cast(pool.GetRoutine(0)); - for (size_t i = 1; i < count; ++i) - { - PtrT p = dynamic_cast(pool.GetRoutine(i)); - TEST_EQUAL(etalon->m_hashes, p->m_hashes, ()); - } -*/ -} // namespace apk_test diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index f1c6e7997..e9d4dd6ae 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -68,7 +68,7 @@ UNIT_TEST(GetReader) { char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp"; char const * arr[] = { - "resources-mdpi_light/symbols.sdf", + "symbols/mdpi/light/symbols.sdf", "classificator.txt", "minsk-pass.mwm" }; diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index daab7bc43..5a5dbd7d3 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -109,13 +109,7 @@ endfunction() copy_resources( countries-strings fonts - resources-default - resources-mdpi_light - resources-hdpi_light - resources-xhdpi_light - resources-xxhdpi_light - resources-xxxhdpi_light - resources-6plus_light + symbols welcome.html categories.txt @@ -185,12 +179,12 @@ endif() if (BUILD_DESIGNER) execute_process( - COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_light/ ${OMIM_ROOT}/data/resources-mdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-hdpi_light/ ${OMIM_ROOT}/data/resources-hdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xhdpi_light/ ${OMIM_ROOT}/data/resources-xhdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxhdpi_light/ ${OMIM_ROOT}/data/resources-xxhdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-6plus_light/ ${OMIM_ROOT}/data/resources-6plus_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxxhdpi_light/ ${OMIM_ROOT}/data/resources-xxxhdpi_design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/mdpi/light/ ${OMIM_ROOT}/data/symbols/mdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/hdpi/light/ ${OMIM_ROOT}/data/symbols/hdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xhdpi/light/ ${OMIM_ROOT}/data/symbols/xhdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxhdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/6plus/light/ ${OMIM_ROOT}/data/symbols/6plus/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxxhdpi/design/ COMMAND cp -f ${OMIM_ROOT}/data/drules_proto_default_light.bin ${OMIM_ROOT}/data/drules_proto_default_design.bin COMMAND cp -f ${OMIM_ROOT}/data/colors.txt ${OMIM_ROOT}/data/colors_design.txt COMMAND cp -f ${OMIM_ROOT}/data/patterns.txt ${OMIM_ROOT}/data/patterns_design.txt @@ -202,12 +196,12 @@ if (BUILD_DESIGNER) mapcss-dynamic.txt mapcss-mapping.csv patterns_design.txt - resources-mdpi_design - resources-hdpi_design - resources-xhdpi_design - resources-xxhdpi_design - resources-xxxhdpi_design - resources-6plus_design + symbols/mdpi/design + symbols/hdpi/design + symbols/xhdpi/design + symbols/xxhdpi/design + symbols/xxxhdpi/design + symbols/6plus/design ) execute_process( diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp index 12873c210..121a5364d 100644 --- a/qt/build_style/build_skins.cpp +++ b/qt/build_style/build_skins.cpp @@ -177,7 +177,7 @@ void BuildSkins(QString const & styleDir, QString const & outputDir) for (SkinType s : g_skinTypes) { QString const suffix = SkinSuffix(s); - QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"}); + QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"}); int const size = resolution2size.at(suffix.toStdString()); // SkinSize(s); bool const colorCorrection = SkinCoorrectColor(s); @@ -192,8 +192,8 @@ void ApplySkins(QString const & outputDir) for (SkinType s : g_skinTypes) { QString const suffix = SkinSuffix(s); - QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"}); - QString const resourceSkinDir = JoinPathQt({resourceDir, "resources-" + suffix + "_design"}); + QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"}); + QString const resourceSkinDir = JoinPathQt({resourceDir, "symbols", suffix, "design"}); if (!QFileInfo::exists(resourceSkinDir) && !QDir().mkdir(resourceSkinDir)) throw std::runtime_error("Cannot create resource skin directory: " + resourceSkinDir.toStdString()); diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index e552e3b4c..295bdafcb 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -67,44 +67,39 @@ function BuildSkin() { ln -s "$STYLE_PATH/$resourceName$symbolsSuffix" "$PNG_PATH" # Run skin generator "$SKIN_GENERATOR" --symbolWidth $symbolSize --symbolHeight $symbolSize --symbolsDir "$STYLE_PATH/$symbolsFolder" \ - --skinName "$DATA_PATH/resources-$resourceName$suffix/basic" --skinSuffix="$symbolsSuffix" + --skinName "$DATA_PATH/symbols/$resourceName/$suffix/basic" --skinSuffix="$symbolsSuffix" # Reset environment rm -r "$PNG_PATH" || true } +symbols_name=(6plus mdpi hdpi xhdpi xxhdpi xxxhdpi) + # Cleanup -cleanup=(resources-{{6plus,mdpi,hdpi,xhdpi,xxhdpi,xxxhdpi}{_dark,_light}}) -for item in ${cleanup[*]} -do - rm -rf "$DATA_PATH/$item" || true - mkdir "$DATA_PATH/$item" -done +rm -rf "$DATA_PATH"/symbols/*/*/symbols.* # Build styles -BuildSkin default dark mdpi 18 _dark symbols -BuildSkin default dark hdpi 27 _dark symbols -BuildSkin default dark xhdpi 36 _dark symbols -BuildSkin default dark 6plus 43 _dark symbols -BuildSkin default dark xxhdpi 54 _dark symbols -BuildSkin default dark xxxhdpi 64 _dark symbols +BuildSkin default dark mdpi 18 dark symbols +BuildSkin default dark hdpi 27 dark symbols +BuildSkin default dark xhdpi 36 dark symbols +BuildSkin default dark 6plus 43 dark symbols +BuildSkin default dark xxhdpi 54 dark symbols +BuildSkin default dark xxxhdpi 64 dark symbols -BuildSkin default light mdpi 18 _light symbols -BuildSkin default light hdpi 27 _light symbols -BuildSkin default light xhdpi 36 _light symbols -BuildSkin default light 6plus 43 _light symbols -BuildSkin default light xxhdpi 54 _light symbols -BuildSkin default light xxxhdpi 64 _light symbols +BuildSkin default light mdpi 18 light symbols +BuildSkin default light hdpi 27 light symbols +BuildSkin default light xhdpi 36 light symbols +BuildSkin default light 6plus 43 light symbols +BuildSkin default light xxhdpi 54 light symbols +BuildSkin default light xxxhdpi 64 light symbols -rm -rf "$OMIM_PATH"/data/resources-{*} - -rm -rf "$OMIM_PATH"/data/resources-*_design - -for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do - optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_light/symbols.png - optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_dark/symbols.png +for i in ${symbols_name[*]}; do + optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/light/symbols.png + optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/dark/symbols.png done -for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do - cp -r "$OMIM_PATH"/data/resources-${i}_light/ "$OMIM_PATH"/data/resources-${i}_design/ +rm -rf "$DATA_PATH"/symbols/*/design/ + +for i in ${symbols_name[*]}; do + cp -r "$DATA_PATH"/symbols/"${i}"/light/ "$DATA_PATH"/symbols/"${i}"/design/ done From 07c26a5ab821d2517c630904fe160281a36a794a Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Thu, 10 Jul 2025 21:39:32 +0200 Subject: [PATCH 180/222] [data] move case folding data into test folder Signed-off-by: Andrei Shkrob --- base/base_tests/string_utils_test.cpp | 2 +- data/{ => test_data}/CaseFolding.test | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename data/{ => test_data}/CaseFolding.test (100%) diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp index 99dcab7d4..1df5cf608 100644 --- a/base/base_tests/string_utils_test.cpp +++ b/base/base_tests/string_utils_test.cpp @@ -23,7 +23,7 @@ UNIT_TEST(LowerUniChar) { // Load unicode case folding table. - static char constexpr kFile[] = "./data/CaseFolding.test"; + static char constexpr kFile[] = "./data/test_data/CaseFolding.test"; std::ifstream file(kFile); TEST(file.is_open(), (kFile)); diff --git a/data/CaseFolding.test b/data/test_data/CaseFolding.test similarity index 100% rename from data/CaseFolding.test rename to data/test_data/CaseFolding.test From f05a9c9eb4c6beddc8b518e46854a7be6d2a0d10 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sun, 27 Jul 2025 21:25:36 +0200 Subject: [PATCH 181/222] [android] Migrate routing screens to Material Signed-off-by: Jean-Baptiste Charron --- .../BaseRoutingErrorDialogFragment.java | 6 ++--- .../routing/ManageRouteAdapter.java | 12 ++++----- .../routing/NavigationController.java | 9 ++++--- .../routing/RoutingBottomMenuController.java | 8 +++--- .../routing/RoutingErrorDialogFragment.java | 4 +-- .../app/organicmaps/widget/menu/NavMenu.java | 20 +++++++------- .../widget/placepage/DirectionFragment.java | 10 +++---- .../res/layout-land/fragment_direction.xml | 8 +++--- .../main/res/layout-land/layout_nav_top.xml | 8 +++--- .../src/main/res/layout/dialog_missed_map.xml | 2 +- .../main/res/layout/fragment_direction.xml | 8 +++--- .../src/main/res/layout/fragment_routing.xml | 2 +- .../src/main/res/layout/item_missed_map.xml | 4 +-- .../main/res/layout/item_missed_map_group.xml | 4 +-- .../res/layout/layout_nav_bottom_numbers.xml | 18 ++++++------- .../src/main/res/layout/layout_nav_top.xml | 8 +++--- .../res/layout/manage_route_bottom_sheet.xml | 26 +++++++++++-------- .../res/layout/manage_route_list_item.xml | 8 +++--- .../main/res/layout/menu_route_plan_line.xml | 2 +- .../app/src/main/res/layout/routing_plan.xml | 6 ++--- 20 files changed, 89 insertions(+), 84 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java index e91b3ae21..1628b7bbf 100644 --- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java @@ -9,7 +9,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ExpandableListAdapter; import android.widget.ExpandableListView; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import app.organicmaps.R; @@ -19,6 +18,7 @@ import app.organicmaps.sdk.downloader.CountryItem; import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.google.android.material.textview.MaterialTextView; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -93,9 +93,9 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment { @SuppressLint("InflateParams") final View countryView = View.inflate(requireActivity(), R.layout.dialog_missed_map, null); - ((TextView) countryView.findViewById(R.id.tv__title)).setText(map.name); + ((MaterialTextView) countryView.findViewById(R.id.tv__title)).setText(map.name); - final TextView szView = countryView.findViewById(R.id.tv__size); + final MaterialTextView szView = countryView.findViewById(R.id.tv__size); szView.setText(StringUtils.getFileSizeString(requireContext(), map.totalSize)); ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) szView.getLayoutParams(); lp.rightMargin = 0; diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java index 09abd815e..bf7f32769 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java +++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java @@ -8,11 +8,11 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.imageview.ShapeableImageView; +import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.RouteMarkData; @@ -232,16 +232,16 @@ public class ManageRouteAdapter extends RecyclerView.Adapter - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - + android:layout_gravity="center_vertical" + android:text="@string/cancel" + android:textColor="?android:attr/textColorPrimary" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" />