mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-06 12:34:24 +00:00
Compare commits
12 Commits
release/20
...
x7z4w-om
| Author | SHA1 | Date | |
|---|---|---|---|
|
22cc10d127 | ||
|
bf6f33e5ed | ||
|
cf38a8702b | ||
|
|
c63135159c | ||
|
|
61f665c7d4 | ||
|
3c6aec1219 | ||
|
|
239c9f8de0 | ||
|
|
9cff373c8b | ||
|
|
45616db65c | ||
|
|
d23d153aef | ||
|
|
240059ca5b | ||
|
|
1d1f8d74d4 |
@@ -1,10 +1,8 @@
|
||||
• Karten-Daten vom 6. September
|
||||
• Zeitstrafen für Radrouting
|
||||
• Farbige POI-Beschriftungen in Autonavigation
|
||||
• POI-Suche nach Filialnamen
|
||||
• Abspannportale, Sicherheitskabinen & Büros hinzugefügt
|
||||
• Aktualisierte Symbole für Türme, Nachtclubs, Apotheken und Fahnenmasten
|
||||
• Lesezeichen-Farbe in GPX-Exporten
|
||||
• Farbfüllung von Fußgängerbereiche auf Plätzen
|
||||
• Android Auto: Anzeige Ausfahrtsnummern in Kreisverkehren
|
||||
Weitere Änderungen in Codeberg-Versionshinweisen!
|
||||
• OpenStreetMap-Daten vom 22. August
|
||||
• Neue Geschwindigkeitsanzeige & Details aufgezeichneter Strecken
|
||||
• Besserer dunkler Modus, neue farbige Labels
|
||||
• Anzeige wann Orte & Öffnungszeiten überprüft wurden
|
||||
• Routenplanung berücksichtigt Stoppschilder, Ampeln & bedingte Einschränkungen.
|
||||
• GPS-Peilung wird statt Kompass bevorzugt & höhere GPS-Frequenz.
|
||||
• Adressen & Notizen im OSM-Editor unterstützt.
|
||||
• Mehr Verbesserungen an UI-Elementen & Kartenstil, alle Details in den Codeberg-Versionshinweisen!
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
• OpenStreetMap data as of September 6
|
||||
• Turn penalties for bicycle routing
|
||||
• Colored POI labels for car navigation map style
|
||||
• Search POIs by branch name
|
||||
• Added power portals, security booths and offices
|
||||
• Update icons for towers, nightclubs, chemists, flagpoles
|
||||
• Save bookmark color to GPX exports
|
||||
• Color fill pedestrian parts of squares
|
||||
• Android Auto: display roundabout exit numbers
|
||||
• OpenStreetMap data as of August 22
|
||||
• New current speed indicator, display track info
|
||||
• Improved dark map style, added coloured labels
|
||||
• Display when places & opening hours were last checked
|
||||
• Routing now considers turns, stop signs, lights & conditional restrictions
|
||||
• Prefer GPS bearing over compass and increase location poll rate
|
||||
• Enable adding standalone addresses & notes in the editor
|
||||
• Various UI element & map style improvements
|
||||
Check our Codeberg release notes for more changes!
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
• Datos a 6 de septiembre
|
||||
• Penalizaciones de giros en rutas de bici
|
||||
• Etiquetas de puntos de interés en color en navegación
|
||||
• Buscar por nombre de sucursal
|
||||
• Añadir portales de energía, cabinas de seguridad y oficinas
|
||||
• Nuevos iconos: torres, discotecas, parafarmacias y mástiles
|
||||
• Guardar color en exportaciones GPX
|
||||
• Colorear áreas peatonales de plazas
|
||||
• Android Auto: mostrar números de salida de rotondas
|
||||
Más detalles en Codeberg
|
||||
• Datos de OSM a 22-08-2025
|
||||
• Nuevo indicador de velocidad e información de pista
|
||||
• Modo oscuro mejorado y nombres de POI coloreados
|
||||
• Indicador de última revisión de lugares y horarios de apertura
|
||||
• Rutas mejoradas teniendo en cuenta giros, señales de STOP, semáforos y restricciones
|
||||
• Mayor precisión para determinar tu localización y sentido
|
||||
• Añade direcciones y notas con el editor
|
||||
• Otras mejoras en elementos de la interfaz y estilo del mapa
|
||||
Entra en nuestro Codeberg para más cambios!
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
• Données OSM du 06 septembre
|
||||
• Pénalités dans les calculs d'itinéraires vélos
|
||||
• Ajout de labels colorés en mode navigation
|
||||
• Support du tag branch dans la recherche
|
||||
• Ajout des portiques électriques, postes de sécurité
|
||||
• Mise à jour des icônes de tours, boîtes de nuits, chimiste et mat
|
||||
• Enregistrement de la couleur des signets dans les exports GPX
|
||||
• Android Auto: Affichage du numéro de sortie des ronds-points
|
||||
• Données OSM du 22 août
|
||||
• Nouvel indicateur de vitesse et détails des pistes
|
||||
• Amélioration du style sombre, ajout de labels colorées
|
||||
• Affichage de la date de dernière vérification d'un lieu
|
||||
• Support dans le routage des virages, signalisations et restrictions
|
||||
• Amélioration de la boussole et de la précision GPS
|
||||
• Support des adresses et des notes dans l'éditeur
|
||||
• Diverses améliorations d'UI et du style de la carte
|
||||
Plus d'informations sur notre Codeberg
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
• OpenStreetMap aggiornato al 6 Settembre
|
||||
• Bici: miglior stima del tempo di percorrenza
|
||||
• Auto: punti d'interesse colorati
|
||||
• Cerca i punti d'interesse tramite filiale
|
||||
• Aggiunte strutture alta tensione, cabine di sicurezza e uffici
|
||||
• Aggiornate le icone per torri, discoteche, farmacie e aste per bandiere
|
||||
• Salva il colore dei Preferiti nel GPX
|
||||
• Evidenziate le aree pedonali nelle piazze
|
||||
• AndroidAuto: aggiunto il numero dell'uscita nelle rotonde
|
||||
Visita Codeberg per ulteriori dettagli
|
||||
@@ -1,10 +1,8 @@
|
||||
• Dados OSM de 6/09
|
||||
• Penalidades de conversão para bicicleta
|
||||
• Etiquetas de POI coloridas para o estilo do mapa de navegação de carros
|
||||
• Busca de POIs por nome de filial
|
||||
• Adição de portais de energia, guaritas e escritórios
|
||||
• Atualização de ícones para torres, discotecas, farmácias e mastros
|
||||
• Salva a cor dos favoritos nas exportações GPX
|
||||
• Preenchimento de praças pavimentadas
|
||||
• Android Auto: exibe números de saída de rotatória
|
||||
Confira nossas notas de lançamento do Codeberg para mais mudanças
|
||||
• Dados OSM de 22/08
|
||||
• Novo indicador de velocidade e tela de informações de trilha
|
||||
• Melhor estilo de mapa escuro, rótulos coloridos adicionados
|
||||
• Exibição da última atualização de locais e horários de funcionamento
|
||||
• O roteamento agora considera conversões, PARE, semáforos, e restrições condicionais
|
||||
• Preferência por orientação GPS em vez de bússola e aumento da frequência de localização
|
||||
• Editor: adição de endereços e notas independentes
|
||||
• Melhorias em elementos da interface e estilo de mapa
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
• Данные на 6 сентября
|
||||
• Предупреждения на веломаршруте
|
||||
• Цветные метки POI при автонавигации
|
||||
• Поиск POI по названию ветки
|
||||
• Добавлены высоковольтные опоры, помещения охраны и офисы
|
||||
• Обновлены значки башен,вышек,мачт,ночных клубов,аптек
|
||||
• Сохранение цвета закладок при экспорте в GPX (через OM)
|
||||
• Отображение цветом пешеходных зон
|
||||
• Android Auto: отображение номеров съездов на кольцевых развязках
|
||||
Посмотрите примечания к выпуску Codeberg, чтобы узнать о других изменениях!
|
||||
• Данные 22 августа
|
||||
• Новый спидометр,информация о маршруте
|
||||
• Улучшен тёмный стиль,цветные метки
|
||||
• Время последней проверки часов работы
|
||||
• Построении маршрута учитывает повороты, знак «Стоп»,светофоры и ограничения
|
||||
• Предпочтение отдается GPS-координатам,а не компасу,увеличена частота опроса местоположения
|
||||
• Можно добавлять отдельные адреса и заметки в редакторе
|
||||
• Улучшены различные элементы пользовательского интерфейса и стиль карты
|
||||
Ознакомьтесь с примечания к релизу про изменения!
|
||||
|
||||
@@ -1 +1 @@
|
||||
version: 2025.10.02-2-FDroid+25100202
|
||||
version: 2025.03.02-7-FDroid+25030207
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/map_buttons_bottom"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton.Bottom"
|
||||
style="@style/MwmWidget.MapButton.Bottom"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clipChildren="false"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/btn_bookmarks"
|
||||
android:tint="?iconTint"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:contentDescription="@string/bookmarks"
|
||||
app:srcCompat="@drawable/ic_bookmarks"
|
||||
app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
|
||||
app:srcCompat="@drawable/ic_bookmarks" />
|
||||
@@ -6,7 +6,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
style="@style/MwmWidget.M3.FAB.MapButton.Bottom"
|
||||
style="@style/MwmWidget.MapButton.Bottom"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/my_position"
|
||||
android:tint="?iconTint"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton"
|
||||
android:contentDescription="@string/core_my_position"
|
||||
app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:contentDescription="@string/core_my_position" />
|
||||
@@ -3,8 +3,6 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/btn_search"
|
||||
android:tint="?iconTint"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:contentDescription="@string/search"
|
||||
app:srcCompat="@drawable/ic_search"
|
||||
app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
|
||||
app:srcCompat="@drawable/ic_search" />
|
||||
@@ -8,17 +8,13 @@
|
||||
android:orientation="vertical">
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/nav_zoom_in"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
|
||||
android:tint="?iconTint"
|
||||
style="@style/MwmWidget.MapButton.Zoom"
|
||||
app:srcCompat="@drawable/ic_plus"
|
||||
app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
|
||||
android:layout_marginBottom="@dimen/margin_half"
|
||||
android:contentDescription="@string/zoom_in"/>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/nav_zoom_out"
|
||||
style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
|
||||
android:tint="?iconTint"
|
||||
style="@style/MwmWidget.MapButton.Zoom"
|
||||
app:srcCompat="@drawable/ic_minus"
|
||||
app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
|
||||
android:contentDescription="@string/zoom_out"/>
|
||||
</LinearLayout>
|
||||
@@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
</resources>
|
||||
@@ -49,7 +49,7 @@
|
||||
<string name="unsupported_phone">Hardveres gyorsítású OpenGL szükséges. Sajnos az Ön eszköze nem támogatott.</string>
|
||||
<string name="download">Letöltés</string>
|
||||
<!-- Used in DownloadResources startup screen -->
|
||||
<string name="disconnect_usb_cable">A CoMaps használatához válassza le az USB-kábelt, vagy helyezze be a memóriakártyát</string>
|
||||
<string name="disconnect_usb_cable">A CoMaps használatához válassza lei az USB-kábelt, vagy helyezze be a memóriakártyát</string>
|
||||
<!-- Used in DownloadResources startup screen -->
|
||||
<string name="not_enough_free_space_on_sdcard">Az alkalmazás használatához először szabadítson fel némi helyet az SD-kártyán/USB-tárolón</string>
|
||||
<string name="download_resources">Mielőtt elkezdené használni az alkalmazást, töltse le az áttekintő világtérképet az eszközre. \nEz %s tárhelyet fog igénybe venni.</string>
|
||||
@@ -245,7 +245,7 @@
|
||||
<!-- Button in the main Help dialog -->
|
||||
<string name="copyright">Szerzői jogok</string>
|
||||
<!-- Text in menu + Button in the main Help dialog -->
|
||||
<string name="report_a_bug">Hibajelentés</string>
|
||||
<string name="report_a_bug">Hiba jelentése</string>
|
||||
<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
|
||||
<string name="compass_calibration_recommended">Javítsa a nyíl irányát a telefon nyolcas mozgatásával az iránytű kalibrálásához.</string>
|
||||
<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
|
||||
@@ -278,9 +278,9 @@
|
||||
<!-- Item in context menu. -->
|
||||
<string name="downloader_update_map">Térkép frissítése</string>
|
||||
<!-- Preference title -->
|
||||
<string name="google_play_services">Google Fused helymeghatározási szolgáltatás</string>
|
||||
<string name="google_play_services">Google helymeghatározási szolgáltatás</string>
|
||||
<!-- Preference text -->
|
||||
<string name="pref_use_google_play">Egy saját fejlesztésű szolgáltatás, amely GPS, Wi-Fi, mobilhálózatok stb. segítségével pontosabban határozza meg a felhasználó tartózkodási helyét. Kapcsolatba léphet a Google kiszolgálóival.</string>
|
||||
<string name="pref_use_google_play">A Google szolgáltatása, amely a GPS, a Wi-Fi, a mobilhálózatok stb. kombinálásával határozza meg az Ön tartózkodási helyét. Ez csatlakozik a Google szervereihez, és adatokat gyűjt Önről.</string>
|
||||
<!-- Preference title -->
|
||||
<!-- Preference description -->
|
||||
<!-- Text for routing error dialog -->
|
||||
@@ -347,7 +347,7 @@
|
||||
<string name="dialog_routing_end_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a célállomást.</string>
|
||||
<string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást</string>
|
||||
<string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet</string>
|
||||
<string name="dialog_routing_intermediate_not_determined">Pontosítsa a köztes helyet</string>
|
||||
<string name="dialog_routing_intermediate_not_determined">Állítsa be a köztes helyet</string>
|
||||
<string name="dialog_routing_system_error">Rendszerhiba</string>
|
||||
<string name="dialog_routing_application_error">Az alkalmazás hibája miatt nem lehet létrehozni az útvonalat</string>
|
||||
<string name="dialog_routing_try_again">Próbálja meg újra</string>
|
||||
@@ -363,9 +363,9 @@
|
||||
<string name="hide">Elrejtés</string>
|
||||
<string name="categories">Kategóriák</string>
|
||||
<string name="history">Előzmények</string>
|
||||
<string name="search_not_found">Nincs találat</string>
|
||||
<string name="search_not_found">Hoppá, nincs találat</string>
|
||||
<!-- The message when user did not find anything in the search. -->
|
||||
<string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.</string>
|
||||
<string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.</string>
|
||||
<string name="search_history_title">Keresési előzmények</string>
|
||||
<string name="search_history_text">Legutóbbi keresések megtekintése</string>
|
||||
<string name="clear_search">Keresési előzmények törlése</string>
|
||||
@@ -437,7 +437,7 @@
|
||||
<string name="downloader_update_maps">Térképek frissítése</string>
|
||||
<string name="downloader_mwm_migration_dialog">Az útvonal létrehozásához frissítenie kell az összes térképet, majd újra meg kell terveznie az útvonalat.</string>
|
||||
<string name="downloader_search_field_hint">Térkép keresése</string>
|
||||
<string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az eszköze kapcsolódik az internethez</string>
|
||||
<string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az Ön készüléke kapcsolódik az internethez</string>
|
||||
<string name="downloader_no_space_title">Nincs elegendő tárhely</string>
|
||||
<string name="downloader_no_space_message">Törölje a felesleges adatokat</string>
|
||||
<string name="editor_login_error_dialog">Bejelentkezési hiba</string>
|
||||
@@ -457,10 +457,10 @@
|
||||
<string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
|
||||
<!-- OSM explanation on Android login screen -->
|
||||
<string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez a CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen jobb térképet készíteni mindenki számára!</string>
|
||||
<string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot vagy jelentkezzen be, hogy közzétehesse a térképszerkesztéseit a világ számára</string>
|
||||
<string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
|
||||
<!-- Downloaded 10 **of** 20 <- it is that "of" -->
|
||||
<string name="downloader_of">%1$d / %2$d</string>
|
||||
<string name="download_over_mobile_header">Biztosan letölti mobiladat-kapcsolaton keresztül?</string>
|
||||
<string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
|
||||
<string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat</string>
|
||||
<string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
|
||||
<!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
|
||||
@@ -507,7 +507,7 @@
|
||||
<string name="editor_share_to_all_dialog_title">Szeretné elküldeni az összes felhasználónak?</string>
|
||||
<!-- Dialog before publishing the modifications to the public map. -->
|
||||
<string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen magánjellegű vagy személyes adatokat</string>
|
||||
<string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük adódik</string>
|
||||
<string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük van</string>
|
||||
<string name="navigation_stop_button">Megállítás</string>
|
||||
<!-- Shown as toast when starting the recent track recording -->
|
||||
<string name="track_recording">Nyomvonal rögzítése</string>
|
||||
@@ -515,13 +515,13 @@
|
||||
<string name="accept">Elfogadás</string>
|
||||
<!-- For the first routing -->
|
||||
<string name="decline">Elutasítás</string>
|
||||
<string name="mobile_data_dialog">Mobiladat-forgalom használata a részletes információk megjelenítéséhez?</string>
|
||||
<string name="mobile_data_dialog">Mobilinternet használata a részletes információk megjelenítéséhez?</string>
|
||||
<string name="mobile_data_option_always">Mindig használja</string>
|
||||
<string name="mobile_data_option_today">Csak ma</string>
|
||||
<string name="mobile_data_option_not_today">Ma ne használja</string>
|
||||
<string name="mobile_data">Mobiladat-forgalom</string>
|
||||
<string name="mobile_data">Mobilinternet</string>
|
||||
<!-- NOTE to translators: please synchronize your translation with the English one. -->
|
||||
<string name="mobile_data_description">A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez internetkapcsolatra van szükség</string>
|
||||
<string name="mobile_data_description">A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség</string>
|
||||
<string name="mobile_data_option_never">Soha ne használja</string>
|
||||
<string name="mobile_data_option_ask">Mindig kérdezzen rá</string>
|
||||
<string name="traffic_update_maps_text">A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket</string>
|
||||
@@ -608,7 +608,7 @@
|
||||
<string name="power_managment_setting_never">Soha</string>
|
||||
<string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
|
||||
<string name="power_managment_setting_manual_max">Mindig</string>
|
||||
<string name="enable_logging_warning_message">Engedélyezze ideiglenesen ezt a beállítást, hogy rögzíthesse és elküldhesse nekünk a problémájával kapcsolatos részletes diagnosztikai naplókat a „Névjegy és súgó” képernyő „Hibajelentés” funkciójával. A naplók tartalmazhatnak helyadatokat.</string>
|
||||
<string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt a beállítást, akkor rögzítheti, és az „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra kattintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
|
||||
<string name="driving_options_title">Útvonaltervezési beállítások</string>
|
||||
<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
|
||||
<string name="avoid_tolls">Díjköteles utak elkerülése</string>
|
||||
@@ -695,9 +695,9 @@
|
||||
<!-- Description in preferences -->
|
||||
<string name="enable_keep_screen_on_description">Ha engedélyezve van, a képernyő mindig be lesz kapcsolva a térkép megjelenítésekor.</string>
|
||||
<!-- A preference title; keep short! -->
|
||||
<string name="enable_show_on_lock_screen">Megjelenítés zárolt képernyőn</string>
|
||||
<string name="enable_show_on_lock_screen">Megjelenítés a zárolt képernyőn</string>
|
||||
<!-- Description in preferences -->
|
||||
<string name="enable_show_on_lock_screen_description">Ha engedélyezve van, nem kell minden alkalommal feloldania az eszközt, amíg az alkalmazás fut.</string>
|
||||
<string name="enable_show_on_lock_screen_description">Ha engedélyezve van, nem kell minden alkalommal feloldania a telefont, amíg az alkalmazás fut.</string>
|
||||
<!-- Current language of the map! -->
|
||||
<string name="change_map_locale">Térkép nyelve</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
@@ -822,8 +822,8 @@
|
||||
<string name="app_site_url">https://comaps.app/hu/</string>
|
||||
<string name="saved">Mentett</string>
|
||||
<string name="about_headline">Közösség által működtetett nyílt projekt</string>
|
||||
<string name="closed_now">Jelenleg zárva</string>
|
||||
<string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve: %s</string>
|
||||
<string name="closed_now">Most zárva van</string>
|
||||
<string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
|
||||
<string name="hours_confirmed_time_ago">Megerősítve: %s</string>
|
||||
<string name="editor_level">Emelet (0 a földszint)</string>
|
||||
<string name="error_enter_correct_level">Adja meg az emeletek számát</string>
|
||||
@@ -833,7 +833,7 @@
|
||||
<string name="error_enter_correct_bluesky_page">Adjon meg egy érvényes Bluesky felhasználónevet vagy webcímet</string>
|
||||
<string name="osm_note_toast">A megjegyzés el lesz küldve az OpenStreetMap közösségnek</string>
|
||||
<string name="pref_left_button_disable">Letiltás</string>
|
||||
<string name="pref_backup_now_summary_progress">Biztonsági mentés folyamatban…</string>
|
||||
<string name="pref_backup_now_summary_progress">A biztonsági mentés folyamatban van…</string>
|
||||
<string name="pref_backup_now_summary">Készítsen biztonsági mentést most</string>
|
||||
<string name="pref_backup_now_summary_ok">A biztonsági mentés sikeresen befejeződött</string>
|
||||
<string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és nyomvonalak a biztonsági mentéshez</string>
|
||||
@@ -849,21 +849,21 @@
|
||||
<string name="backup_interval_every_week">Hetente</string>
|
||||
<string name="pref_backup_interval_title">Automatikus biztonsági mentés</string>
|
||||
<string name="backup_interval_every_day">Naponta</string>
|
||||
<string name="pref_backup_now_summary_failed">Nem sikerült létrehozni a biztonsági mentést</string>
|
||||
<string name="pref_backup_now_summary_failed">Nem sikerült létrehozni a biztonsági mentés</string>
|
||||
<string name="backup_interval_manual_only">Ki (csak kézileg)</string>
|
||||
<string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem érhető el, vagy nem írható. Válasszon másik mappát.</string>
|
||||
<string name="at">ekkor: %s</string>
|
||||
<string name="open_now">Jelenleg nyitva</string>
|
||||
<string name="open_now">Most nyitva van</string>
|
||||
<string name="delete_track_dialog_title">Törli a következőt: %s?</string>
|
||||
<string name="clear">Törlés</string>
|
||||
<string name="route_type">Útvonal típusa</string>
|
||||
<string name="route_type">Az útvonal típusa</string>
|
||||
<string name="vehicle">Gépjármű</string>
|
||||
<string name="pedestrian">Gyalogos</string>
|
||||
<string name="bicycle">Kerékpár</string>
|
||||
<string name="ruler">Vonalzó</string>
|
||||
<string name="bookmark_color">Könyvjelző színe</string>
|
||||
<string name="about_help">Névjegy és súgó</string>
|
||||
<string name="about_help">Névjegy és segítség</string>
|
||||
<string name="share_track">Nyomvonal megosztása</string>
|
||||
<string name="pref_tts_no_system_tts_short">Nem található szövegfelovasási szolgáltatás (TTS), ellenőrizze az alkalmazás beállításait a „Hangutasítások” müpontban</string>
|
||||
<string name="dialog_report_error_with_logs">Küldjön hibajelentést:\n - „Naplózás engedélyezése” a beállításokban\n - reprodukálja a hibát\n - A „Névjegy és súgó” képernyőn nyomja meg a „Hibajelentés” gombot, és küldje el e-mailben vagy csevegésben.\n - naplózás kikapcsolása</string>
|
||||
<string name="dialog_report_error_with_logs">Küldjön hibajelentést:\n - „Naplózás engedélyezése” a beállításokban\n - reprodukálja a hibát\n - „A CoMaps névjegye” képernyőn nyomja meg a „HIBA JELENTÉSE” gombot, és küldje el e-mailben vagy csevegésben.\n - naplózás kikapcsolása</string>
|
||||
</resources>
|
||||
|
||||
@@ -831,6 +831,4 @@
|
||||
<string name="about_help">Om & Hjälp</string>
|
||||
<string name="share_track">Dela spår</string>
|
||||
<string name="delete_track_dialog_title">Ta bort %s?</string>
|
||||
<string name="existence_confirmed_time_ago">Existens bekräftad %s</string>
|
||||
<string name="hours_confirmed_time_ago">Bekräftat %s</string>
|
||||
</resources>
|
||||
|
||||
@@ -432,13 +432,4 @@
|
||||
<style name="MwmWidget.M3.FAB.MapButton.Square">
|
||||
<item name="backgroundTint">?menuBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.M3.FAB.MapButton.Zoom">
|
||||
<item name="maxImageSize">34dp</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.M3.FAB.MapButton.Bottom">
|
||||
<item name="android:maxWidth">@dimen/map_buttons_bottom_max_width</item>
|
||||
<item name="android:padding">@dimen/nav_frame_padding</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
</resources>
|
||||
@@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
</resources>
|
||||
@@ -38,8 +38,4 @@
|
||||
<string name="today">Gaur</string>
|
||||
<string name="yesterday">Atzo</string>
|
||||
<string name="days_ago">duela %s egun</string>
|
||||
<string name="week_ago">duela %s aste</string>
|
||||
<string name="weeks_ago">duela %s aste</string>
|
||||
<string name="month_ago">duela %s hilabete</string>
|
||||
<string name="year_ago">duela %s urte</string>
|
||||
</resources>
|
||||
|
||||
@@ -424,6 +424,7 @@
|
||||
<string name="type.highway.pedestrian.area">Oinezkoen eremua</string>
|
||||
<!-- These translations are used for all type.highway.*.bridge. -->
|
||||
<string name="type.highway.pedestrian.bridge">Oinezkoen zubia</string>
|
||||
|
||||
<string name="type.highway.pedestrian.square">Plaza</string>
|
||||
<!-- These translations are used for all type.highway.*.tunnel. -->
|
||||
<string name="type.highway.pedestrian.tunnel">Oinezkoen tunela</string>
|
||||
@@ -1349,5 +1350,4 @@
|
||||
<string name="type.natural.wetland.saltmarsh">Gatz-padura</string>
|
||||
<string name="type.natural.wetland.saltmarsh.tidal">Mareako gatz-padura</string>
|
||||
<string name="type.railway.station.subway.qingdao">Metro geltokia</string>
|
||||
<string name="type.amenity.animal_shelter">Animalien babeslekua</string>
|
||||
</resources>
|
||||
|
||||
@@ -365,6 +365,7 @@
|
||||
<string name="type.highway.pedestrian">Fuessgängerzone</string>
|
||||
<string name="type.highway.pedestrian.area">Fuessgängerzone</string>
|
||||
<string name="type.highway.pedestrian.bridge">Fuessgängerzonebrugg</string>
|
||||
|
||||
<string name="type.highway.pedestrian.square">Platz</string>
|
||||
<string name="type.highway.primary">Hauptstrass</string>
|
||||
<string name="type.highway.primary.bridge">Brugg</string>
|
||||
@@ -1303,5 +1304,4 @@
|
||||
<string name="type.office.security">Sicherheitsdienst</string>
|
||||
<string name="type.building.guardhouse">Pförtnerhüüsli</string>
|
||||
<string name="type.power.portal">Abspannportal</string>
|
||||
<string name="type.shop.lighting">Lampelade</string>
|
||||
</resources>
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<string name="type.amenity.hospital">Kórház</string>
|
||||
<string name="type.amenity.hunting_stand">Magasles</string>
|
||||
<string name="type.amenity.ice_cream">Fagylaltárus</string>
|
||||
<string name="type.amenity.internet_cafe">Internetkávézó</string>
|
||||
<string name="type.amenity.internet_cafe">Internet kávézó</string>
|
||||
<string name="type.amenity.kindergarten">Óvoda</string>
|
||||
<string name="type.amenity.library">Könyvtár</string>
|
||||
<string name="type.amenity.loading_dock">Rakodórámpa</string>
|
||||
@@ -1006,7 +1006,7 @@
|
||||
<string name="type.shop.laundry">Mosoda</string>
|
||||
<string name="type.shop.mall">Bevásárlóközpont</string>
|
||||
<string name="type.shop.massage">Masszázsszalon</string>
|
||||
<string name="type.shop.mobile_phone">Mobiltelefon-bolt</string>
|
||||
<string name="type.shop.mobile_phone">Mobiltelefon bolt</string>
|
||||
<string name="type.shop.money_lender">Pénzkölcsönző</string>
|
||||
<string name="type.shop.motorcycle">Motorkerékpár-szaküzlet</string>
|
||||
<string name="type.shop.motorcycle_repair">Motorkerékpár-szerviz</string>
|
||||
|
||||
@@ -418,6 +418,7 @@
|
||||
<string name="type.highway.pedestrian.area">Rua pedonal</string>
|
||||
<!-- These translations are used for all type.highway.*.bridge. -->
|
||||
<string name="type.highway.pedestrian.bridge">Ponte</string>
|
||||
|
||||
<string name="type.highway.pedestrian.square">Praça ou largo</string>
|
||||
<!-- These translations are used for all type.highway.*.tunnel. -->
|
||||
<string name="type.highway.pedestrian.tunnel">Túnel</string>
|
||||
@@ -1398,5 +1399,4 @@
|
||||
<string name="type.office.security">Escritório dos Guardas de Segurança</string>
|
||||
<string name="type.building.guardhouse">Cabine de Segurança</string>
|
||||
<string name="type.power.portal">Portal de Energia</string>
|
||||
<string name="type.shop.lighting">Loja de Iluminação</string>
|
||||
</resources>
|
||||
|
||||
@@ -1379,6 +1379,4 @@
|
||||
<string name="type.attraction.bumper_car">Mașinuțe de distracții</string>
|
||||
<string name="type.attraction.big_wheel">Roată panoramică</string>
|
||||
<string name="type.tourism.camp_site">Loc de campare</string>
|
||||
<string name="type.shop.lighting">Magazin de corpuri de iluminat</string>
|
||||
<string name="type.tourism.hostel">Hostel</string>
|
||||
</resources>
|
||||
|
||||
@@ -1397,5 +1397,4 @@
|
||||
<string name="type.office.security">Канцеларија обезбеђења</string>
|
||||
<string name="type.building.guardhouse">Кућица обезбеђења</string>
|
||||
<string name="type.power.portal">Носач електричних водова</string>
|
||||
<string name="type.shop.lighting">Продавница расвете</string>
|
||||
</resources>
|
||||
|
||||
@@ -32,11 +32,4 @@
|
||||
<string name="mb">MB</string>
|
||||
<string name="today">Idag</string>
|
||||
<string name="yesterday">Igår</string>
|
||||
<string name="days_ago">för %s dagar sedan</string>
|
||||
<string name="week_ago">för %s vecka sedan</string>
|
||||
<string name="weeks_ago">för %s veckor sedan</string>
|
||||
<string name="month_ago">för %s månad sedan</string>
|
||||
<string name="months_ago">för %s månader sedan</string>
|
||||
<string name="year_ago">för %s år sedan</string>
|
||||
<string name="years_ago">för %s år sedan</string>
|
||||
</resources>
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
"Albania":"Albánia",
|
||||
"Algeria":"Algéria",
|
||||
"Algeria_Central":"Algéria - Közép",
|
||||
"Algeria_Coast":"Algéria – észak",
|
||||
"Algeria_Coast":"Algéria - Észak",
|
||||
"Andorra":"Andorra",
|
||||
"Angola":"Angola",
|
||||
"Anguilla":"Anguilla",
|
||||
"Antarctica":"Antarktisz",
|
||||
"Antigua and Barbuda":"Antigua és Barbuda",
|
||||
"Argentina":"Argentína",
|
||||
"Argentina_Buenos Aires_North":"Buenos Aires tartomány – észak",
|
||||
"Argentina_Buenos Aires_South":"Buenos Aires tartomány – dél",
|
||||
"Argentina_Buenos Aires_North":"Buenos Aires tartomány - Észak",
|
||||
"Argentina_Buenos Aires_South":"Buenos Aires tartomány - Dél",
|
||||
"Argentina_Cuyo":"Cuyo",
|
||||
"Argentina_Mesopotamia":"Mezopotámia",
|
||||
"Argentina_Northwest":"Északnyugat-Argentína",
|
||||
@@ -33,7 +33,7 @@
|
||||
"Austria":"Ausztria",
|
||||
"Austria_Burgenland":"Burgenland",
|
||||
"Austria_Carinthia":"Karintia",
|
||||
"Austria_Lower Austria_West":"Alsó-Ausztria – nyugat",
|
||||
"Austria_Lower Austria_West":"Alsó-Ausztria - Nyugat",
|
||||
"Austria_Lower Austria_Wien":"Bécs és alsó-Ausztria kelet",
|
||||
"Austria_Salzburg":"Salzburg",
|
||||
"Austria_Styria":"Stájerország",
|
||||
@@ -68,8 +68,8 @@
|
||||
"Bermuda":"Bermuda",
|
||||
"Bhutan":"Bhután",
|
||||
"Bolivia":"Bolívia",
|
||||
"Bolivia_North":"Bolívia – észak",
|
||||
"Bolivia_South":"Bolívia – dél",
|
||||
"Bolivia_North":"Bolívia - Észak",
|
||||
"Bolivia_South":"Bolívia - Dél",
|
||||
"Bosnia and Herzegovina":"Bosznia-Hercegovina",
|
||||
"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Brčkói körzet",
|
||||
"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Bosznia-hercegovinai Föderáció",
|
||||
@@ -89,7 +89,7 @@
|
||||
"Brazil_South Region":"Dél-Brazília",
|
||||
"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 – észak",
|
||||
"Brazil_Southeast Region_Minas Gerais_North":"Minas Gerais - Észak",
|
||||
"Brazil_Southeast Region_Rio de Janeiro":"Rio de Janeiro",
|
||||
"Brazil_Southeast Region_Sao Paulo_Campinas":"São Paulo - Campinas",
|
||||
"Brazil_Southeast Region_Sao Paulo_City":"São Paulo - Santos",
|
||||
@@ -104,46 +104,46 @@
|
||||
"Cambodia":"Kambodzsa",
|
||||
"Cameroon":"Kamerun",
|
||||
"Cameroon_Central":"Kamerun - Közép",
|
||||
"Cameroon_West":"Kamerun – nyugat",
|
||||
"Cameroon_West":"Kamerun - Nyugat",
|
||||
"Campo de Hielo Sur":"Dél-patagóniai jégmező",
|
||||
"Canada":"Kanada",
|
||||
"Canada_Alberta":"Alberta",
|
||||
"Canada_Alberta_Edmonton":"Edmonton",
|
||||
"Canada_Alberta_North":"Alberta – észak",
|
||||
"Canada_Alberta_South":"Alberta – dél",
|
||||
"Canada_Alberta_North":"Alberta - Észak",
|
||||
"Canada_Alberta_South":"Alberta - Dél",
|
||||
"Canada_British Columbia":"Brit Columbia",
|
||||
"Canada_British Columbia_Central":"Brit Columbia - Közép",
|
||||
"Canada_British Columbia_Far_North":"Brit Columbia – kelet",
|
||||
"Canada_British Columbia_Far_North":"Brit Columbia - Kelet",
|
||||
"Canada_British Columbia_Islands":"Vancouver-sziget",
|
||||
"Canada_British Columbia_North":"Brit Columbia – nyugat",
|
||||
"Canada_British Columbia_Northeast":"Brit Columbia – észak",
|
||||
"Canada_British Columbia_North":"Brit Columbia - Nyugat",
|
||||
"Canada_British Columbia_Northeast":"Brit Columbia - Észak",
|
||||
"Canada_British Columbia_Southeast":"Kelowna",
|
||||
"Canada_British Columbia_Vancouver":"Vancouver",
|
||||
"Canada_Labrador":"Labrador",
|
||||
"Canada_Labrador_North":"Labrador – észak",
|
||||
"Canada_Labrador_South":"Labrador – dél",
|
||||
"Canada_Labrador_West":"Labrador – nyugat",
|
||||
"Canada_Labrador_North":"Labrador - Észak",
|
||||
"Canada_Labrador_South":"Labrador - Dél",
|
||||
"Canada_Labrador_West":"Labrador - Nyugat",
|
||||
"Canada_Manitoba":"Manitoba",
|
||||
"Canada_Manitoba_Northeast":"Manitoba – észak",
|
||||
"Canada_Manitoba_Northwest":"Manitoba – nyugat",
|
||||
"Canada_Manitoba_Northeast":"Manitoba - Észak",
|
||||
"Canada_Manitoba_Northwest":"Manitoba - Nyugat",
|
||||
"Canada_Manitoba_South":"Brandon",
|
||||
"Canada_Manitoba_Winnipeg":"Winnipeg",
|
||||
"Canada_New Brunswick":"Új-Brunswick",
|
||||
"Canada_Newfoundland":"Új-Fundland",
|
||||
"Canada_Newfoundland_East":"Új-Fundland – kelet",
|
||||
"Canada_Newfoundland_North":"Új-Fundland – észak",
|
||||
"Canada_Newfoundland_South":"Új-Fundland – dél",
|
||||
"Canada_Newfoundland_West":"Új-Fundland – nyugat",
|
||||
"Canada_Newfoundland_East":"Új-Fundland - Kelet",
|
||||
"Canada_Newfoundland_North":"Új-Fundland - Észak",
|
||||
"Canada_Newfoundland_South":"Új-Fundland - Dél",
|
||||
"Canada_Newfoundland_West":"Új-Fundland - Nyugat",
|
||||
"Canada_Northwest Territories":"Északnyugati területek",
|
||||
"Canada_Northwest Territories_East":"Északnyugati területek – kelet",
|
||||
"Canada_Northwest Territories_North":"Északnyugati területek – észak",
|
||||
"Canada_Northwest Territories_East":"Északnyugati területek - Kelet",
|
||||
"Canada_Northwest Territories_North":"Északnyugati területek - Észak",
|
||||
"Canada_Northwest Territories_Yellowknife":"Yellowknife",
|
||||
"Canada_Nova Scotia":"Új-Skócia",
|
||||
"Canada_Nova Scotia_Halifax":"Halifax",
|
||||
"Canada_Nova Scotia_Sydney":"Sydney",
|
||||
"Canada_Nunavut":"Nunavut",
|
||||
"Canada_Nunavut_North":"Nunavut – észak",
|
||||
"Canada_Nunavut_South":"Nunavut – dél",
|
||||
"Canada_Nunavut_North":"Nunavut - Észak",
|
||||
"Canada_Nunavut_South":"Nunavut - Dél",
|
||||
"Canada_Ontario":"Ontario",
|
||||
"Canada_Ontario_Bame":"Barrie",
|
||||
"Canada_Ontario_Kingston":"Kingston",
|
||||
@@ -155,12 +155,12 @@
|
||||
"Canada_Ontario_Northeastern_SW":"Sault Ste. Marie",
|
||||
"Canada_Ontario_Northeastern_Wawa":"Wawa",
|
||||
"Canada_Ontario_Northern":"Thunder Bay",
|
||||
"Canada_Ontario_Northwestern":"Ontario – észak",
|
||||
"Canada_Ontario_Northwestern":"Ontario - Észak",
|
||||
"Canada_Ontario_Toronto":"Toronto",
|
||||
"Canada_Prince Edward Island":"Prince Edward-sziget",
|
||||
"Canada_Quebec":"Québec",
|
||||
"Canada_Quebec_Quebec":"Québec City",
|
||||
"Canada_Quebek_Far North":"Québec – észak",
|
||||
"Canada_Quebek_Far North":"Québec - Észak",
|
||||
"Canada_Quebek_Montreal":"Montréal",
|
||||
"Canada_Quebek_North":"Sept-Îles",
|
||||
"Canada_Quebek_Southeast_Rimouski":"Rimouski",
|
||||
@@ -168,10 +168,10 @@
|
||||
"Canada_Quebek_West_Chibougamau":"Chibougamau",
|
||||
"Canada_Quebek_West_Rouyn-Noranda":"Rouyn-Noranda",
|
||||
"Canada_Saskatchewan":"Saskatchewan",
|
||||
"Canada_Saskatchewan_North":"Saskatchewan – észak",
|
||||
"Canada_Saskatchewan_South":"Saskatchewan – dél",
|
||||
"Canada_Saskatchewan_North":"Saskatchewan - Észak",
|
||||
"Canada_Saskatchewan_South":"Saskatchewan - Dél",
|
||||
"Canada_Yukon":"Yukon",
|
||||
"Canada_Yukon_North":"Yukon – észak",
|
||||
"Canada_Yukon_North":"Yukon - Észak",
|
||||
"Canada_Yukon_Whitehorse":"Whitehorse",
|
||||
"Cape Verde":"Zöld-foki Köztársaság",
|
||||
"Caribees":"Kis-Antillák",
|
||||
@@ -181,8 +181,8 @@
|
||||
"Central Anatolia Region":"Közép-anatóliai régió",
|
||||
"Chad":"Csád",
|
||||
"Chile":"Chile",
|
||||
"Chile_North":"Chile – észak",
|
||||
"Chile_South":"Chile – dél",
|
||||
"Chile_North":"Chile - Észak",
|
||||
"Chile_South":"Chile - Dél",
|
||||
"China_Anhui":"Anhui",
|
||||
"China_Chongqing":"Csungking",
|
||||
"China_Fujian":"Fucsien",
|
||||
@@ -212,9 +212,9 @@
|
||||
"China_Yunnan":"Jünnan",
|
||||
"China_Zhejiang":"Csöcsiang",
|
||||
"Colombia":"Kolumbia",
|
||||
"Colombia_East":"Kolumbia – kelet",
|
||||
"Colombia_North":"Kolumbia – észak",
|
||||
"Colombia_West":"Kolumbia – nyugat",
|
||||
"Colombia_East":"Kolumbia - Kelet",
|
||||
"Colombia_North":"Kolumbia - Észak",
|
||||
"Colombia_West":"Kolumbia - Nyugat",
|
||||
"Colorado":"Colorado",
|
||||
"Comoros":"Comore-szigetek",
|
||||
"Congo-Brazzaville":"Kongói Köztársaság",
|
||||
@@ -238,8 +238,8 @@
|
||||
"Czech_Severovychod_Kralovehradecky kraj":"Hradec Králové-i kerület",
|
||||
"Czech_Severovychod_Liberecky kraj":"Libereci kerület",
|
||||
"Czech_Severovychod_Pardubicky kraj":"Pardubicei kerület",
|
||||
"Czech_Stredni Cechy_East":"Közép-csehországi kerület – kelet",
|
||||
"Czech_Stredni Cechy_West":"Közép-csehországi kerület – nyugat",
|
||||
"Czech_Stredni Cechy_East":"Közép-csehországi kerület - Kelet",
|
||||
"Czech_Stredni Cechy_West":"Közép-csehországi kerület - Nyugat",
|
||||
"Czech_Ustecky kraj":"Ústí nad Labem-i kerület",
|
||||
"Czech_Zlinsky Kraj":"Zlíni kerület",
|
||||
"Denmark":"Dánia",
|
||||
@@ -258,8 +258,8 @@
|
||||
"Equatorial Guinea":"Egyenlítői-Guinea",
|
||||
"Eritrea":"Eritrea",
|
||||
"Estonia":"Észtország",
|
||||
"Estonia_East":"Észtország – kelet",
|
||||
"Estonia_West":"Észtország – nyugat",
|
||||
"Estonia_East":"Észtország - Kelet",
|
||||
"Estonia_West":"Észtország - Nyugat",
|
||||
"Ethiopia":"Etiópia",
|
||||
"Falkland Islands":"Falkland-szigetek",
|
||||
"Faroe Islands":"Feröer-szigetek",
|
||||
@@ -393,14 +393,14 @@
|
||||
"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart":"Stuttgart - Stuttgart",
|
||||
"Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen":"Tübingen",
|
||||
"Germany_Berlin":"Berlin",
|
||||
"Germany_Brandenburg_North":"Brandenburg – észak",
|
||||
"Germany_Brandenburg_South":"Brandenburg – dél",
|
||||
"Germany_Brandenburg_North":"Brandenburg - Észak",
|
||||
"Germany_Brandenburg_South":"Brandenburg - Dél",
|
||||
"Germany_Free State of Bavaria":"Bajorország",
|
||||
"Germany_Free State of Bavaria_Lower Bavaria":"Alsó-Bajorország",
|
||||
"Germany_Free State of Bavaria_Lower Franconia":"Alsó-Frankföld",
|
||||
"Germany_Free State of Bavaria_Middle Franconia":"Közép-Frankföld",
|
||||
"Germany_Free State of Bavaria_Swabia":"Svábföld",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_East":"Felső-Bajorország – kelet",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_East":"Felső-Bajorország - Kelet",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt":"Felső-Bajorország - Ingolstadt",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_Munchen":"Felső-Bajorország - München",
|
||||
"Germany_Free State of Bavaria_Upper Franconia":"Felső-Frankföld",
|
||||
@@ -457,8 +457,8 @@
|
||||
"Honduras":"Honduras",
|
||||
"Hungary":"Magyarország",
|
||||
"Hungary_Kozep-Magyarorszag":"Közép-Magyarország",
|
||||
"Hungary_Northern Great Plain":"Magyarország – kelet (Észak Alföld és észak)",
|
||||
"Hungary_Transdanubia":"Magyarország – nyugat (Dunántúl)",
|
||||
"Hungary_Northern Great Plain":"Magyarország - Kelet (Észak-Alföld)",
|
||||
"Hungary_Transdanubia":"Magyarország - Nyugat (Dunántúl)",
|
||||
"Iceland":"Izland",
|
||||
"Illinois":"Illinois",
|
||||
"India":"India",
|
||||
@@ -498,7 +498,7 @@
|
||||
"Indiana":"Indiana",
|
||||
"Indonesia":"Indonézia",
|
||||
"Indonesia_Central":"Sulawesi, Kalimantan",
|
||||
"Indonesia_East":"Indonézia – kelet",
|
||||
"Indonesia_East":"Indonézia - Kelet",
|
||||
"Indonesia_Jawa Barat":"Nyugat-Jáva tartomány",
|
||||
"Indonesia_Jawa Tengah":"Közép-Jáva tartomány",
|
||||
"Indonesia_Jawa Timur":"Kelet-Jáva tartomány",
|
||||
@@ -506,8 +506,8 @@
|
||||
"Indonesia_West":"Szumátra",
|
||||
"Iowa":"Iowa",
|
||||
"Iran":"Irán",
|
||||
"Iran_North":"Irán – észak",
|
||||
"Iran_South":"Irán – dél",
|
||||
"Iran_North":"Irán - Észak",
|
||||
"Iran_South":"Irán - Dél",
|
||||
"Iraq":"Irak",
|
||||
"Ireland":"Írország",
|
||||
"Ireland_Connacht":"Connacht",
|
||||
@@ -568,8 +568,8 @@
|
||||
"Italy_Sardinia":"Szardínia",
|
||||
"Italy_Sicily":"Szicília",
|
||||
"Italy_Trentino-Alto Adige Sudtirol":"Trentino-Dél-Tirol",
|
||||
"Italy_Tuscany_Grosseto":"Toszkána – délkelet",
|
||||
"Italy_Tuscany_Massa e Carrara":"Toszkána – északnyugat",
|
||||
"Italy_Tuscany_Grosseto":"Toszkána - Délkelet",
|
||||
"Italy_Tuscany_Massa e Carrara":"Toszkána - Északnyugat",
|
||||
"Italy_Umbria":"Umbria",
|
||||
"Italy_Veneto":"Veneto",
|
||||
"Italy_Veneto_Belluno":"Belluno megye",
|
||||
@@ -598,9 +598,9 @@
|
||||
"Japan_Chugoku Region_Tottori":"Tottori prefektúra",
|
||||
"Japan_Chugoku Region_Yamaguchi":"Jamagucsi prefektúra",
|
||||
"Japan_Hokkaido Region":"Hokkaidó",
|
||||
"Japan_Hokkaido Region_East":"Hokkaidó – kelet",
|
||||
"Japan_Hokkaido Region_North":"Hokkaidó – észak",
|
||||
"Japan_Hokkaido Region_West":"Hokkaidó – nyugat",
|
||||
"Japan_Hokkaido Region_East":"Hokkaidó - Kelet",
|
||||
"Japan_Hokkaido Region_North":"Hokkaidó - Észak",
|
||||
"Japan_Hokkaido Region_West":"Hokkaidó - Nyugat",
|
||||
"Japan_Kanto":"Kantó régió",
|
||||
"Japan_Kanto_Chiba":"Csiba prefektúra",
|
||||
"Japan_Kanto_Gunma":"Gunma prefektúra",
|
||||
@@ -673,10 +673,10 @@
|
||||
"Mexico_California":"Alsó-Kalifornia",
|
||||
"Mexico_Central_East":"Nuevo León",
|
||||
"Mexico_Central_West":"Nayarit",
|
||||
"Mexico_East":"Mexikó – kelet",
|
||||
"Mexico_East":"Mexikó - Kelet",
|
||||
"Mexico_Mexico":"Mexikóváros",
|
||||
"Mexico_North":"Mexikó – észak",
|
||||
"Mexico_South":"Mexikó – dél",
|
||||
"Mexico_North":"Mexikó - Észak",
|
||||
"Mexico_South":"Mexikó - Dél",
|
||||
"Michigan":"Michigan",
|
||||
"Minnesota":"Minnesota",
|
||||
"Missouri":"Missouri",
|
||||
@@ -688,7 +688,7 @@
|
||||
"Morocco":"Marokkó",
|
||||
"Morocco_Doukkala-Abda":"Doukkala-Abda",
|
||||
"Morocco_Rabat-Sale-Zemmour-Zaer":"Rabat-Salé-Zemmour-Zaer",
|
||||
"Morocco_Southern":"Marokkó – dél",
|
||||
"Morocco_Southern":"Marokkó - Dél",
|
||||
"Morocco_Western Sahara":"Nyugat-Szahara",
|
||||
"Mozambique":"Mozambik",
|
||||
"Myanmar":"Mianmar",
|
||||
@@ -696,8 +696,8 @@
|
||||
"Namibia":"Namíbia",
|
||||
"Nauru":"Nauru",
|
||||
"Nepal":"Nepál",
|
||||
"Nepal_East":"Nepál – kelet",
|
||||
"Nepal_West":"Nepál – nyugat",
|
||||
"Nepal_East":"Nepál - Kelet",
|
||||
"Nepal_West":"Nepál - Nyugat",
|
||||
"Netherlands":"Hollandia",
|
||||
"Netherlands_Drenthe":"Drenthe",
|
||||
"Netherlands_Flevoland":"Flevoland",
|
||||
@@ -762,12 +762,12 @@
|
||||
"Pennsylvania":"Pennsylvania",
|
||||
"People's Republic of China":"Kína",
|
||||
"Peru":"Peru",
|
||||
"Peru_North":"Peru – észak",
|
||||
"Peru_South":"Peru – dél",
|
||||
"Peru_North":"Peru - Észak",
|
||||
"Peru_South":"Peru - Dél",
|
||||
"Philippines":"Fülöp-szigetek",
|
||||
"Philippines_Luzon_Manila":"Manila",
|
||||
"Philippines_Luzon_North":"Luzon – észak",
|
||||
"Philippines_Luzon_South":"Luzon – dél",
|
||||
"Philippines_Luzon_North":"Luzon - Észak",
|
||||
"Philippines_Luzon_South":"Luzon - Dél",
|
||||
"Philippines_Mindanao":"Mindanao",
|
||||
"Philippines_Visayas":"Visayas",
|
||||
"Pitcairn Islands":"Pitcairn",
|
||||
@@ -789,8 +789,8 @@
|
||||
"Poland_Warmian-Masurian Voivodeship":"Varmia-Mazúria vajdaság",
|
||||
"Poland_West Pomeranian Voivodeship":"Nyugat-Pomerániai vajdaság",
|
||||
"Portugal":"Portugália",
|
||||
"Portugal_North":"Portugália – észak",
|
||||
"Portugal_South":"Portugália – dél",
|
||||
"Portugal_North":"Portugália - Észak",
|
||||
"Portugal_South":"Portugália - Dél",
|
||||
"Qatar":"Katar",
|
||||
"Republic of Kosovo":"Koszovó",
|
||||
"Romania":"Románia",
|
||||
@@ -805,7 +805,7 @@
|
||||
"Russia_Altai Republic":"Altaji Köztársaság",
|
||||
"Russia_Amur Oblast":"Amuri terület",
|
||||
"Russia_Arkhangelsk Oblast_Central":"Arhangelszki terület - Közép",
|
||||
"Russia_Arkhangelsk Oblast_North":"Arhangelszki terület – észak",
|
||||
"Russia_Arkhangelsk Oblast_North":"Arhangelszki terület - Észak",
|
||||
"Russia_Astrakhan Oblast":"Asztraháni terület",
|
||||
"Russia_Bashkortostan":"Baskír Köztársaság",
|
||||
"Russia_Belgorod Oblast":"Belgorodi terület",
|
||||
@@ -830,13 +830,13 @@
|
||||
"Russia_Kirov Oblast":"Kirovi terület",
|
||||
"Russia_Komi Republic":"Komi Köztársaság",
|
||||
"Russia_Kostroma Oblast":"Kosztromai terület",
|
||||
"Russia_Krasnodar Krai":"Krasznodari határterület – észak",
|
||||
"Russia_Krasnodar Krai":"Krasznodari határterület - Észak",
|
||||
"Russia_Krasnodar Krai_Adygeya":"Krasznodari határterület, Adige Köztársaság",
|
||||
"Russia_Krasnoyarsk Krai":"Krasznojarszki határterület",
|
||||
"Russia_Kurgan Oblast":"Kurgani terület",
|
||||
"Russia_Kursk Oblast":"Kurszki terület",
|
||||
"Russia_Leningradskaya Oblast_Karelsky":"Leningrádi terület – észak",
|
||||
"Russia_Leningradskaya Oblast_Southeast":"Leningrádi terület – dél",
|
||||
"Russia_Leningradskaya Oblast_Karelsky":"Leningrádi terület - Észak",
|
||||
"Russia_Leningradskaya Oblast_Southeast":"Leningrádi terület - Dél",
|
||||
"Russia_Lipetsk Oblast":"Lipecki terület",
|
||||
"Russia_Magadan Oblast":"Magadani terület",
|
||||
"Russia_Mari El":"Mari Köztársaság",
|
||||
@@ -929,8 +929,8 @@
|
||||
"South Carolina":"Dél-Karolina",
|
||||
"South Georgia and the South Sandwich Islands":"Dél-Georgia és Déli-Sandwich-szigetek",
|
||||
"South Korea":"Dél-Korea",
|
||||
"South Korea_North":"Dél-Korea – észak",
|
||||
"South Korea_South":"Dél-Korea – dél",
|
||||
"South Korea_North":"Dél-Korea - Észak",
|
||||
"South Korea_South":"Dél-Korea - Dél",
|
||||
"South Ossetia":"Dél-Oszétia",
|
||||
"South Sudan":"Dél-Szudán",
|
||||
"Spain":"Spanyolország",
|
||||
@@ -983,8 +983,8 @@
|
||||
"Tennessee":"Tennessee",
|
||||
"Texas":"Texas",
|
||||
"Thailand":"Thaiföld",
|
||||
"Thailand_North":"Thaiföld – észak",
|
||||
"Thailand_South":"Thaiföld – dél",
|
||||
"Thailand_North":"Thaiföld - Észak",
|
||||
"Thailand_South":"Thaiföld - Dél",
|
||||
"The Bahamas":"Bahama-szigetek",
|
||||
"The Gambia":"Gambia",
|
||||
"Togo":"Togo",
|
||||
@@ -1029,7 +1029,7 @@
|
||||
"US_California_Bakersfield_Lancaster":"Lancaster",
|
||||
"US_California_Chico":"Chico",
|
||||
"US_California_LA":"Los Angeles",
|
||||
"US_California_LA North":"Los Angeles – észak",
|
||||
"US_California_LA North":"Los Angeles - Észak",
|
||||
"US_California_Redding":"Redding",
|
||||
"US_California_Sacramento_Fresno":"Fresno",
|
||||
"US_California_Sacramento_Sacramento":"Sacramento",
|
||||
@@ -1039,7 +1039,7 @@
|
||||
"US_California_Santa_Clara_Santa Cruz":"Santa Cruz",
|
||||
"US_Colorado_Aspen":"Aspen",
|
||||
"US_Colorado_Denver":"Denver",
|
||||
"US_Colorado_South":"Colorado – dél",
|
||||
"US_Colorado_South":"Colorado - Dél",
|
||||
"US_Connecticut":"Connecticut",
|
||||
"US_Delaware":"Delaware",
|
||||
"US_Florida_Jacksonville":"Jacksonville",
|
||||
@@ -1049,56 +1049,56 @@
|
||||
"US_Georgia":"Georgia",
|
||||
"US_Georgia_Atlanta":"Atlanta",
|
||||
"US_Georgia_Macon":"Macon",
|
||||
"US_Georgia_North":"Georgia – észak",
|
||||
"US_Georgia_South":"Georgia – dél",
|
||||
"US_Georgia_North":"Georgia - Észak",
|
||||
"US_Georgia_South":"Georgia - Dél",
|
||||
"US_Guam":"Guam",
|
||||
"US_Hawaii":"Hawaii",
|
||||
"US_Idaho":"Idaho",
|
||||
"US_Illinois_Chickago":"Chicago",
|
||||
"US_Illinois_Elgin":"Elgin",
|
||||
"US_Illinois_Rockford":"Rockford",
|
||||
"US_Illinois_South":"Illinois – dél",
|
||||
"US_Illinois_South":"Illinois - Dél",
|
||||
"US_Illinois_Springfield":"Springfield",
|
||||
"US_Indiana_North":"Indiana – észak",
|
||||
"US_Indiana_South":"Indiana – dél",
|
||||
"US_Indiana_North":"Indiana - Észak",
|
||||
"US_Indiana_South":"Indiana - Dél",
|
||||
"US_Iowa_Des Moines":"Des Moines",
|
||||
"US_Iowa_Waterloo":"Waterloo",
|
||||
"US_Iowa_West":"Iowa – nyugat",
|
||||
"US_Kansas_East":"Kansas – kelet",
|
||||
"US_Kansas_West":"Kansas – nyugat",
|
||||
"US_Kentucky_East":"Kentucky – kelet",
|
||||
"US_Kentucky_West":"Kentucky – nyugat",
|
||||
"US_Louisiana_Central":"Louisiana – nyugat",
|
||||
"US_Iowa_West":"Iowa - Nyugat",
|
||||
"US_Kansas_East":"Kansas - Kelet",
|
||||
"US_Kansas_West":"Kansas - Nyugat",
|
||||
"US_Kentucky_East":"Kentucky - Kelet",
|
||||
"US_Kentucky_West":"Kentucky - Nyugat",
|
||||
"US_Louisiana_Central":"Louisiana - Nyugat",
|
||||
"US_Louisiana_New Orleans":"New Orleans",
|
||||
"US_Maine":"Maine",
|
||||
"US_Maryland_Baltimore":"Baltimore",
|
||||
"US_Maryland_and_DC":"Washington D.C. – nyugat",
|
||||
"US_Maryland_and_DC":"Washington D.C. - Nyugat",
|
||||
"US_Massachusetts_Boston":"Boston",
|
||||
"US_Massachusetts_Central":"Worcester",
|
||||
"US_Massachusetts_Plymouth":"Plymouth",
|
||||
"US_Massachusetts_Southeastern":"Barnstable",
|
||||
"US_Massachusetts_West":"Springfield",
|
||||
"US_Michigan_Detroit":"Detroit",
|
||||
"US_Michigan_North":"Michigan – észak",
|
||||
"US_Michigan_South":"Michigan – dél",
|
||||
"US_Michigan_North":"Michigan - Észak",
|
||||
"US_Michigan_South":"Michigan - Dél",
|
||||
"US_Minnesota_Minneapolis":"Minneapolis",
|
||||
"US_Minnesota_North":"Minnesota – észak",
|
||||
"US_Minnesota_North":"Minnesota - Észak",
|
||||
"US_Minnesota_Rochester":"Rochester",
|
||||
"US_Minnesota_Saint Cloud":"St. Cloud",
|
||||
"US_Mississippi":"Mississippi",
|
||||
"US_Missouri_East":"Missouri – kelet",
|
||||
"US_Missouri_West":"Missouri – nyugat",
|
||||
"US_Missouri_East":"Missouri - Kelet",
|
||||
"US_Missouri_West":"Missouri - Nyugat",
|
||||
"US_Montana":"Montana",
|
||||
"US_Nebraska":"Nebraska",
|
||||
"US_Nevada":"Nevada",
|
||||
"US_New Hampshire":"New Hampshire",
|
||||
"US_New Jersey_North":"New Jersey – észak",
|
||||
"US_New Jersey_South":"New Jersey – dél",
|
||||
"US_New Jersey_North":"New Jersey - Észak",
|
||||
"US_New Jersey_South":"New Jersey - Dél",
|
||||
"US_New Mexico":"Új-Mexikó",
|
||||
"US_New York_East":"New York - Long Island",
|
||||
"US_New York_New York":"New York - New York City",
|
||||
"US_New York_North":"New York – észak",
|
||||
"US_New York_West":"New York – nyugat",
|
||||
"US_New York_North":"New York - Észak",
|
||||
"US_New York_West":"New York - Nyugat",
|
||||
"US_North Carolina_Asheville":"Asheville",
|
||||
"US_North Carolina_Charlotte":"Charlotte",
|
||||
"US_North Carolina_Greensboro":"Greensboro",
|
||||
@@ -1110,11 +1110,11 @@
|
||||
"US_North Dakota_Minot":"Minot",
|
||||
"US_Ohio_Cleveland":"Cleveland",
|
||||
"US_Ohio_Dayton":"Dayton",
|
||||
"US_Oklahoma_East":"Oklahoma – kelet",
|
||||
"US_Oklahoma_West":"Oklahoma – nyugat",
|
||||
"US_Oklahoma_East":"Oklahoma - Kelet",
|
||||
"US_Oklahoma_West":"Oklahoma - Nyugat",
|
||||
"US_Oregon_Eugene":"Eugene",
|
||||
"US_Oregon_Portland":"Portland",
|
||||
"US_Oregon_West":"Oregon – kelet",
|
||||
"US_Oregon_West":"Oregon - Kelet",
|
||||
"US_Pennsylvania_Central":"Altoona",
|
||||
"US_Pennsylvania_Pittsburgh":"Pittsburgh",
|
||||
"US_Pennsylvania_Reading":"Reading",
|
||||
@@ -1124,8 +1124,8 @@
|
||||
"US_South Carolina_Columbia":"Columbia",
|
||||
"US_South Carolina_Florence":"Florence",
|
||||
"US_South Dakota":"Dél-Dakota",
|
||||
"US_Tennessee_East":"Tennessee – kelet",
|
||||
"US_Tennessee_West":"Tennessee – nyugat",
|
||||
"US_Tennessee_East":"Tennessee - Kelet",
|
||||
"US_Tennessee_West":"Tennessee - Nyugat",
|
||||
"US_Texas_Austin":"Austin",
|
||||
"US_Texas_Dallas":"Dallas",
|
||||
"US_Texas_Houston":"Houston",
|
||||
@@ -1200,54 +1200,54 @@
|
||||
"Austria_Upper Austria_Linz":"Felső-Ausztria - Linz",
|
||||
"Austria_Upper Austria_Wels":"Felső-Ausztria - Wels",
|
||||
"Brazil_Goias_Brasilia":"Goiás - Brazíliaváros",
|
||||
"Brazil_Goias_North":"Goiás – észak",
|
||||
"Brazil_North Region_East":"Északi régió – kelet",
|
||||
"Brazil_North Region_West":"Északi régió – nyugat",
|
||||
"Brazil_Northeast Region_East":"Északkeleti régió – kelet",
|
||||
"Brazil_Northeast Region_West":"Északkeleti régió – nyugat",
|
||||
"Brazil_Parana_East":"Paraná – kelet",
|
||||
"Brazil_Parana_West":"Paraná – nyugat",
|
||||
"Brazil_South Region_East":"Déli régió – kelet",
|
||||
"Brazil_South Region_West":"Déli régió – nyugat",
|
||||
"Bulgaria_East":"Bulgária – kelet",
|
||||
"Bulgaria_West":"Bulgária – nyugat",
|
||||
"Brazil_Goias_North":"Goiás - Észak",
|
||||
"Brazil_North Region_East":"Északi régió - Kelet",
|
||||
"Brazil_North Region_West":"Északi régió - Nyugat",
|
||||
"Brazil_Northeast Region_East":"Északkeleti régió - Kelet",
|
||||
"Brazil_Northeast Region_West":"Északkeleti régió - Nyugat",
|
||||
"Brazil_Parana_East":"Paraná - Kelet",
|
||||
"Brazil_Parana_West":"Paraná - Nyugat",
|
||||
"Brazil_South Region_East":"Déli régió - Kelet",
|
||||
"Brazil_South Region_West":"Déli régió - Nyugat",
|
||||
"Bulgaria_East":"Bulgária - Kelet",
|
||||
"Bulgaria_West":"Bulgária - Nyugat",
|
||||
"Chile_Central":"Chile - Közép",
|
||||
"Congo-Kinshasa_Kivu":"Kivu",
|
||||
"Congo-Kinshasa_West":"Kongó – nyugat",
|
||||
"Congo-Kinshasa_West":"Kongó - Nyugat",
|
||||
"Croatia_Central":"Horvátország - Közép",
|
||||
"Croatia_West":"Horvátország – nyugat",
|
||||
"Ecuador_East":"Ecuador – kelet",
|
||||
"Ecuador_West":"Ecuador – nyugat",
|
||||
"Finland_Eastern Finland_North":"Kelet-Finnország – észak",
|
||||
"Finland_Eastern Finland_South":"Kelet-Finnország – dél",
|
||||
"Croatia_West":"Horvátország - Nyugat",
|
||||
"Ecuador_East":"Ecuador - Kelet",
|
||||
"Ecuador_West":"Ecuador - Nyugat",
|
||||
"Finland_Eastern Finland_North":"Kelet-Finnország - Észak",
|
||||
"Finland_Eastern Finland_South":"Kelet-Finnország - Dél",
|
||||
"Finland_Western Finland_Jyvaskyla":"Nyugat-Finnország - Jyväskylä",
|
||||
"Finland_Western Finland_Tampere":"Nyugat-Finnország - Tampere",
|
||||
"France_Free County_North":"Franche-Comté – észak",
|
||||
"France_Free County_South":"Franche-Comté – dél",
|
||||
"France_Free County_North":"Franche-Comté - Észak",
|
||||
"France_Free County_South":"Franche-Comté - Dél",
|
||||
"France_Pays de la Loire_Loire-Atlantique_Nantes":"Loire-Atlantique - Nantes",
|
||||
"France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire":"Loire-Atlantique - Saint-Nazaire",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_South":"Felső-Bajorország – dél",
|
||||
"India_Karnataka_North":"Karnátaka – észak",
|
||||
"India_Karnataka_South":"Karnátaka – dél",
|
||||
"Iran_East":"Irán – kelet",
|
||||
"Germany_Free State of Bavaria_Upper Bavaria_South":"Felső-Bajorország - Dél",
|
||||
"India_Karnataka_North":"Karnátaka - Észak",
|
||||
"India_Karnataka_South":"Karnátaka - Dél",
|
||||
"Iran_East":"Irán - Kelet",
|
||||
"Iraq_North":"Észak-Irak",
|
||||
"Iraq_South":"Közép- és Dél-Irak",
|
||||
"Japan_Chubu Region_Aichi_Nagoya":"Aicsi - Nagoja",
|
||||
"Japan_Chubu Region_Aichi_Toyohashi":"Aicsi - Tojohasi",
|
||||
"Japan_Hokkaido Region_Sapporo":"Szapporo",
|
||||
"Japan_Kinki Region_Osaka_Osaka":"Oszaka",
|
||||
"Japan_Kinki Region_Osaka_West":"Oszaka – nyugat",
|
||||
"Kazakhstan_North":"Kazahsztán – észak",
|
||||
"Kazakhstan_South":"Kazahsztán – dél",
|
||||
"Lithuania_East":"Litvánia – kelet",
|
||||
"Lithuania_West":"Litvánia – nyugat",
|
||||
"Japan_Kinki Region_Osaka_West":"Oszaka - Nyugat",
|
||||
"Kazakhstan_North":"Kazahsztán - Észak",
|
||||
"Kazakhstan_South":"Kazahsztán - Dél",
|
||||
"Lithuania_East":"Litvánia - Kelet",
|
||||
"Lithuania_West":"Litvánia - Nyugat",
|
||||
"Mexico_Chihuahua":"Chihuahua",
|
||||
"Mexico_Sonora":"Sonora",
|
||||
"Nepal_Kathmandu":"Katmandu",
|
||||
"Nepal_Madhyamanchal":"Központi fejlesztési térség",
|
||||
"Nepal_Purwanchal":"Keleti fejlesztési térség",
|
||||
"Nigeria_North":"Nigéria – észak",
|
||||
"Nigeria_South":"Nigéria – dél",
|
||||
"Nigeria_North":"Nigéria - Észak",
|
||||
"Nigeria_South":"Nigéria - Dél",
|
||||
"Norway_Hordaland":"Hordaland",
|
||||
"Norway_Nordland":"Nordland",
|
||||
"Norway_North Trondelag":"Nord-Trøndelag",
|
||||
@@ -1256,45 +1256,45 @@
|
||||
"Peru_Lima":"Lima",
|
||||
"Portugal_Islands":"Portugál szigetek",
|
||||
"Portugal_Viseu":"Viseu",
|
||||
"Russia_Krasnoyarsk Krai_North":"Krasznojarszki határterület – észak",
|
||||
"Russia_Krasnoyarsk Krai_South":"Krasznojarszki határterület – dél",
|
||||
"Russia_Moscow Oblast_East":"Moszkvai terület – kelet",
|
||||
"Russia_Moscow Oblast_West":"Moszkvai terület – nyugat",
|
||||
"Russia_Perm Krai_North":"Permi határterület – észak",
|
||||
"Russia_Perm Krai_South":"Permi határterület – dél",
|
||||
"Russia_Republic of Karelia_North":"Karél Köztársaság – észak",
|
||||
"Russia_Republic of Karelia_South":"Karél Köztársaság – dél",
|
||||
"Russia_Sverdlovsk Oblast_North":"Szverdlovszki terület – észak",
|
||||
"Russia_Krasnoyarsk Krai_North":"Krasznojarszki határterület - Észak",
|
||||
"Russia_Krasnoyarsk Krai_South":"Krasznojarszki határterület - Dél",
|
||||
"Russia_Moscow Oblast_East":"Moszkvai terület - Kelet",
|
||||
"Russia_Moscow Oblast_West":"Moszkvai terület - Nyugat",
|
||||
"Russia_Perm Krai_North":"Permi határterület - Észak",
|
||||
"Russia_Perm Krai_South":"Permi határterület - Dél",
|
||||
"Russia_Republic of Karelia_North":"Karél Köztársaság - Észak",
|
||||
"Russia_Republic of Karelia_South":"Karél Köztársaság - Dél",
|
||||
"Russia_Sverdlovsk Oblast_North":"Szverdlovszki terület - Észak",
|
||||
"Russia_Sverdlovsk Oblast_Ekaterinburg":"Szverdlovszki terület - Jekatyerinburg",
|
||||
"Russia_Yugra_Khanty":"Hanti- és Manysiföld",
|
||||
"Russia_Yugra_Surgut":"Hanti- és Manysiföld - Szurgut",
|
||||
"Saudi Arabia_North":"Szaúd-Arábia – észak",
|
||||
"Saudi Arabia_South":"Szaúd-Arábia – dél",
|
||||
"Slovenia_East":"Szlovénia – kelet",
|
||||
"Slovenia_West":"Szlovénia – nyugat",
|
||||
"Saudi Arabia_North":"Szaúd-Arábia - Észak",
|
||||
"Saudi Arabia_South":"Szaúd-Arábia - Dél",
|
||||
"Slovenia_East":"Szlovénia - Kelet",
|
||||
"Slovenia_West":"Szlovénia - Nyugat",
|
||||
"Spain_Andalusia_Granada":"Andalúzia - Granada",
|
||||
"Spain_Andalusia_Sevilla":"Andalúzia - Sevilla",
|
||||
"Spain_Castile and Leon_East":"Kasztília és León – kelet",
|
||||
"Spain_Castile and Leon_West":"Kasztília és León – nyugat",
|
||||
"Spain_Galicia_North":"Galícia – észak",
|
||||
"Spain_Galicia_South":"Galícia – dél",
|
||||
"Sudan_East":"Szudán – kelet",
|
||||
"Sudan_West":"Szudán – nyugat",
|
||||
"Spain_Castile and Leon_East":"Kasztília és León - Kelet",
|
||||
"Spain_Castile and Leon_West":"Kasztília és León - Nyugat",
|
||||
"Spain_Galicia_North":"Galícia - Észak",
|
||||
"Spain_Galicia_South":"Galícia - Dél",
|
||||
"Sudan_East":"Szudán - Kelet",
|
||||
"Sudan_West":"Szudán - Nyugat",
|
||||
"Sweden_Stockholm":"Stockholm",
|
||||
"Switzerland_Espace Mittelland_Bern":"Espace Mittelland - Bern",
|
||||
"Switzerland_Espace Mittelland_East":"Espace Mittelland – kelet",
|
||||
"Taiwan_North":"Tajvan – észak",
|
||||
"Taiwan_South":"Tajvan – dél",
|
||||
"Switzerland_Espace Mittelland_East":"Espace Mittelland - Kelet",
|
||||
"Taiwan_North":"Tajvan - Észak",
|
||||
"Taiwan_South":"Tajvan - Dél",
|
||||
"Thailand_Central":"Thaiföld - Közép",
|
||||
"Turkey_Central Anatolia Region_Ankara":"Közép-Anatólia - Ankara",
|
||||
"Turkey_Central Anatolia Region_Kayseri":"Közép-Anatólia - Kayseri",
|
||||
"Turkey_Marmara Region_Bursa":"Márvány-tengeri régió - Bursa",
|
||||
"Turkey_Marmara Region_Istanbul":"Márvány-tengeri régió - Isztambul",
|
||||
"US_Arkansas_North":"Arkansas – észak",
|
||||
"US_Arkansas_South":"Arkansas – dél",
|
||||
"US_Arkansas_North":"Arkansas - Észak",
|
||||
"US_Arkansas_South":"Arkansas - Dél",
|
||||
"US_Florida_Gainesvile":"Gainesville",
|
||||
"US_Idaho_North":"Idaho – észak",
|
||||
"US_Idaho_South":"Idaho – dél",
|
||||
"US_Idaho_North":"Idaho - Észak",
|
||||
"US_Idaho_South":"Idaho - Dél",
|
||||
"US_Indiana_Evansville":"Evansville",
|
||||
"US_Indiana_Indianapolis":"Indianapolis",
|
||||
"US_Kansas_Wichita":"Wichita",
|
||||
@@ -1302,14 +1302,14 @@
|
||||
"US_Michigan_Grand Rapids":"Grand Rapids",
|
||||
"US_Michigan_Lansing":"Lansing",
|
||||
"US_Mississippi_Gulfport":"Gulfport",
|
||||
"US_Mississippi_North":"Mississippi – észak",
|
||||
"US_Mississippi_North":"Mississippi - Észak",
|
||||
"US_Missouri_Kansas":"Kansas City",
|
||||
"US_Missouri_Springfield":"Springfield",
|
||||
"US_Missouri_St Louis":"St. Louis",
|
||||
"US_Montana_East":"Montana – kelet",
|
||||
"US_Montana_West":"Montana – nyugat",
|
||||
"US_Nebraska_East":"Nebraska – kelet",
|
||||
"US_Nebraska_West":"Nebraska – nyugat",
|
||||
"US_Montana_East":"Montana - Kelet",
|
||||
"US_Montana_West":"Montana - Nyugat",
|
||||
"US_Nebraska_East":"Nebraska - Kelet",
|
||||
"US_Nebraska_West":"Nebraska - Nyugat",
|
||||
"US_New Mexico_Albuquerque":"Albuquerque",
|
||||
"US_New Mexico_Roswell":"Roswell",
|
||||
"US_Ohio_Cincinnati":"Cincinnati",
|
||||
@@ -1320,13 +1320,13 @@
|
||||
"US_South Carolina_Charleston":"Charleston",
|
||||
"US_Texas_Amarillo":"Amarillo",
|
||||
"US_Texas_Lubbock":"Lubbock",
|
||||
"US_Utah_North":"Utah – észak",
|
||||
"US_Utah_South":"Utah – dél",
|
||||
"US_Utah_North":"Utah - Észak",
|
||||
"US_Utah_South":"Utah - Dél",
|
||||
"US_Virginia_Alexandria":"Alexandria",
|
||||
"US_Wisconsin_Eau Claire":"Eau Claire",
|
||||
"US_Wisconsin_Madison":"Madison",
|
||||
"Venezuela_North":"Venezuela – észak",
|
||||
"Venezuela_South":"Venezuela – dél",
|
||||
"Venezuela_North":"Venezuela - Észak",
|
||||
"Venezuela_South":"Venezuela - Dél",
|
||||
"Argentina_Buenos Aires_Buenos Aires":"Buenos Aires",
|
||||
"Canada_Quebek_Lachute":"Lachute",
|
||||
"Canada_Saskatchewan_Regina":"Regina",
|
||||
|
||||
4622
data/countries.txt
4622
data/countries.txt
File diff suppressed because it is too large
Load Diff
@@ -74,16 +74,14 @@
|
||||
@grass_12: #252819;
|
||||
@grass_11: #252719;
|
||||
@flowers: #262918;
|
||||
@flowers_13: #252818;
|
||||
@flowers_12: #242718;
|
||||
@flowers_11: #242617;
|
||||
@flowers_10: #232617;
|
||||
@golf: #252816;
|
||||
@golf_13: #242716;
|
||||
@golf_12: #232616;
|
||||
@allotments: #2B2A1E;
|
||||
@allotments_13: #2A291D;
|
||||
@allotments_12: #29281D;
|
||||
@allotments_11: #29271D;
|
||||
@allotments_10: #27271C;
|
||||
@scrubs: #222713;
|
||||
@scrubs_13: #212613;
|
||||
@scrubs_12: #212513;
|
||||
|
||||
@@ -1 +1,10 @@
|
||||
<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.7396 2.252175c-2.317875 0-4.195275 1.879575-4.195275 4.19745v4.634775h8.9115v-4.634775c0-2.317875-1.879575-4.19745-4.19745-4.19745zm-1.36035 3.601875h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm0 1.582275h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm0 1.582275h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm-3.8964 2.8569c-.21846 0-.3955725.1771125-.3955725.3955725v1.017525h11.82525v-1.017525c0-.21846-.1771125-.3955725-.3955725-.3955725zm-.8373 2.20425c-.21846 0-.3955725.1771125-.3955725.3955725v1.27245h13.5v-1.27245c0-.21846-.1771125-.3955725-.3955725-.3955725z" fill="#777777"/></svg>
|
||||
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
|
||||
<title>tomb-m</title>
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<g id="tomb-m" fill-rule="nonzero">
|
||||
<g id="tomb" transform="translate(6,6)" fill="#777777">
|
||||
<path id="Shape" d="m5.6528-2.9971c-3.0905 0-5.5937 2.5061-5.5937 5.5966v6.1797h11.882v-6.1797c0-3.0905-2.5061-5.5966-5.5966-5.5966zm-1.8138 4.8025h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm-5.1952 3.8092c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.3567h15.767v-1.3567c0-0.29128-0.23615-0.52743-0.52743-0.52743zm-1.1164 2.939c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.6966h18v-1.6966c0-0.29128-0.23615-0.52743-0.52743-0.52743z" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -1 +0,0 @@
|
||||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m5.8264 1.50145c-1.54525 0-2.79685 1.25305-2.79685 2.7983v3.08985h5.941v-3.08985c0-1.54525-1.25305-2.7983-2.7983-2.7983zm-.9069 2.40125h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm0 1.05485h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm0 1.05485h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm-2.5976 1.9046c-.14564 0-.263715.118075-.263715.263715v.67835h7.8835v-.67835c0-.14564-.118075-.263715-.263715-.263715zm-.5582 1.4695c-.14564 0-.263715.118075-.263715.263715v.8483h9v-.8483c0-.14564-.118075-.263715-.263715-.263715z" fill="#777777"/></svg>
|
||||
|
Before Width: | Height: | Size: 969 B |
@@ -490,19 +490,19 @@ area|z14-[piste:type=snow_park],
|
||||
|
||||
area|z10[landuse=cemetery],
|
||||
area|z10[amenity=grave_yard],
|
||||
{fill-color: @flowers_10;}
|
||||
{fill-color: @allotments_10;}
|
||||
area|z11[landuse=cemetery],
|
||||
area|z11[amenity=grave_yard],
|
||||
{fill-color: @flowers_11;}
|
||||
{fill-color: @allotments_11;}
|
||||
area|z12[landuse=cemetery],
|
||||
area|z12[amenity=grave_yard],
|
||||
{fill-color: @flowers_12;}
|
||||
{fill-color: @allotments_12;}
|
||||
area|z13[landuse=cemetery],
|
||||
area|z13[amenity=grave_yard],
|
||||
{fill-color: @flowers_13;}
|
||||
{fill-color: @allotments_13;}
|
||||
area|z14-[landuse=cemetery],
|
||||
area|z14-[amenity=grave_yard],
|
||||
{fill-color: @flowers;}
|
||||
{fill-color: @allotments;}
|
||||
|
||||
/* 7.5 Pedestrian areas */
|
||||
|
||||
|
||||
@@ -609,9 +609,6 @@ area|z18-[piste:type=snow_park],
|
||||
|
||||
/* 7.4 Cemetery */
|
||||
|
||||
area|z14[landuse=cemetery],
|
||||
{icon-image: cemetery-s.svg; }
|
||||
|
||||
area|z15-[landuse=cemetery],
|
||||
node|z17-[landuse=cemetery],
|
||||
node|z17-[amenity=grave_yard],
|
||||
|
||||
@@ -47,8 +47,8 @@ leisure-sports_centre # area z13- (also has icon z
|
||||
|
||||
amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-)
|
||||
amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-)
|
||||
landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-)
|
||||
landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-)
|
||||
landuse-cemetery # area z10- (also has icon z15-, caption(optional) z15-)
|
||||
landuse-cemetery-christian # area z10- (also has icon z15-, caption(optional) z15-)
|
||||
=== 180
|
||||
|
||||
amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-)
|
||||
|
||||
@@ -608,8 +608,8 @@ historic-ship # icon z15- (also has captio
|
||||
historic-tank # icon z16- (also has caption(optional) z16-)
|
||||
historic-wreck # icon z16- (also has caption(optional) z16-)
|
||||
landuse-allotments # caption z15- (also has area z12-)
|
||||
landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery # icon z15- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-)
|
||||
man_made-water_tap # icon z16- (also has caption(optional) z18-)
|
||||
man_made-water_well # icon z16- (also has caption(optional) z18-)
|
||||
man_made-windmill # icon z16- (also has caption(optional) z16-)
|
||||
@@ -1731,8 +1731,8 @@ leisure-swimming_pool-private # icon z17- (also has captio
|
||||
# historic-ship # caption(optional) z15- (also has icon z15-)
|
||||
# historic-tank # caption(optional) z16- (also has icon z16-)
|
||||
# historic-wreck # caption(optional) z16- (also has icon z16-)
|
||||
# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-)
|
||||
# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-)
|
||||
# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z10-)
|
||||
# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-)
|
||||
# man_made-water_tap # caption(optional) z18- (also has icon z16-)
|
||||
# man_made-water_well # caption(optional) z18- (also has icon z16-)
|
||||
# man_made-windmill # caption(optional) z16- (also has icon z16-)
|
||||
|
||||
@@ -74,16 +74,14 @@
|
||||
@grass_12: #C9D48A;
|
||||
@grass_11: #CCD58E;
|
||||
@flowers: #BECC76;
|
||||
@flowers_13: #C0CE7B;
|
||||
@flowers_12: #C3CF7F;
|
||||
@flowers_11: #C7D184;
|
||||
@flowers_10: #C9D189;
|
||||
@golf: #B9C96F;
|
||||
@golf_13: #BBCB73;
|
||||
@golf_12: #BECC78;
|
||||
@allotments: #D5D395;
|
||||
@allotments_13: #D6D498;
|
||||
@allotments_12: #D8D59B;
|
||||
@allotments_11: #DAD79F;
|
||||
@allotments_10: #DBD7A2;
|
||||
@scrubs: #ACC261;
|
||||
@scrubs_13: #AFC467;
|
||||
@scrubs_12: #B3C66D;
|
||||
|
||||
@@ -1 +1,10 @@
|
||||
<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.7396 2.252175c-2.317875 0-4.195275 1.879575-4.195275 4.19745v4.634775h8.9115v-4.634775c0-2.317875-1.879575-4.19745-4.19745-4.19745zm-1.36035 3.601875h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm0 1.582275h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm0 1.582275h3.2415c.21846 0 .3955725.1771125.3955725.3955725s-.1770825.3955725-.3955725.3955725h-3.2415c-.21846 0-.3955725-.1771125-.3955725-.3955725s.1771125-.3955725.3955725-.3955725zm-3.8964 2.8569c-.21846 0-.3955725.1771125-.3955725.3955725v1.017525h11.82525v-1.017525c0-.21846-.1771125-.3955725-.3955725-.3955725zm-.8373 2.20425c-.21846 0-.3955725.1771125-.3955725.3955725v1.27245h13.5v-1.27245c0-.21846-.1771125-.3955725-.3955725-.3955725z" fill="#747e86"/></svg>
|
||||
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
|
||||
<title>tomb-m</title>
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<g id="tomb-m" fill-rule="nonzero">
|
||||
<g id="tomb" transform="translate(6,6)" fill="#fff">
|
||||
<path id="Shape" d="m5.6528-2.9971c-3.0905 0-5.5937 2.5061-5.5937 5.5966v6.1797h11.882v-6.1797c0-3.0905-2.5061-5.5966-5.5966-5.5966zm-1.8138 4.8025h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm-5.1952 3.8092c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.3567h15.767v-1.3567c0-0.29128-0.23615-0.52743-0.52743-0.52743zm-1.1164 2.939c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.6966h18v-1.6966c0-0.29128-0.23615-0.52743-0.52743-0.52743z" fill="#747E86"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -1 +0,0 @@
|
||||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m5.8264 1.50145c-1.54525 0-2.79685 1.25305-2.79685 2.7983v3.08985h5.941v-3.08985c0-1.54525-1.25305-2.7983-2.7983-2.7983zm-.9069 2.40125h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm0 1.05485h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm0 1.05485h2.161c.14564 0 .263715.118075.263715.263715s-.118055.263715-.263715.263715h-2.161c-.14564 0-.263715-.118075-.263715-.263715s.118075-.263715.263715-.263715zm-2.5976 1.9046c-.14564 0-.263715.118075-.263715.263715v.67835h7.8835v-.67835c0-.14564-.118075-.263715-.263715-.263715zm-.5582 1.4695c-.14564 0-.263715.118075-.263715.263715v.8483h9v-.8483c0-.14564-.118075-.263715-.263715-.263715z" fill="#747e86"/></svg>
|
||||
|
Before Width: | Height: | Size: 969 B |
@@ -47,8 +47,8 @@ leisure-sports_centre # area z13- (also has icon z
|
||||
|
||||
amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-)
|
||||
amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-)
|
||||
landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-)
|
||||
landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-)
|
||||
landuse-cemetery # area z10- (also has icon z15-, caption(optional) z15-)
|
||||
landuse-cemetery-christian # area z10- (also has icon z15-, caption(optional) z15-)
|
||||
=== 180
|
||||
|
||||
amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-)
|
||||
|
||||
@@ -608,8 +608,8 @@ historic-ship # icon z15- (also has captio
|
||||
historic-tank # icon z16- (also has caption(optional) z16-)
|
||||
historic-wreck # icon z16- (also has caption(optional) z16-)
|
||||
landuse-allotments # caption z15- (also has area z12-)
|
||||
landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery # icon z15- (also has caption(optional) z15-, area z10-)
|
||||
landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-)
|
||||
man_made-water_tap # icon z12- (also has caption(optional) z14-)
|
||||
man_made-water_well # icon z12- (also has caption(optional) z14-)
|
||||
man_made-windmill # icon z16- (also has caption(optional) z16-)
|
||||
@@ -1734,8 +1734,8 @@ leisure-swimming_pool-private # icon z17- (also has captio
|
||||
# historic-ship # caption(optional) z15- (also has icon z15-)
|
||||
# historic-tank # caption(optional) z16- (also has icon z16-)
|
||||
# historic-wreck # caption(optional) z16- (also has icon z16-)
|
||||
# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-)
|
||||
# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-)
|
||||
# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z10-)
|
||||
# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-)
|
||||
# man_made-water_tap # caption(optional) z14- (also has icon z12-)
|
||||
# man_made-water_well # caption(optional) z14- (also has icon z12-)
|
||||
# man_made-windmill # caption(optional) z16- (also has icon z16-)
|
||||
|
||||
@@ -502,12 +502,12 @@ int main(int argc, char * argv[])
|
||||
if (ImGui::GetIO().WantCaptureMouse)
|
||||
framework.MakeFrameActive();
|
||||
|
||||
if (touchActive)
|
||||
#if defined(OMIM_OS_MAC)
|
||||
x *= visualScale;
|
||||
x *= visualScale;
|
||||
y *= visualScale;
|
||||
#endif
|
||||
framework.TouchEvent(GetTouchEvent(framework, x, y, touchMods, df::TouchEvent::TOUCH_MOVE));
|
||||
if (touchActive)
|
||||
framework.TouchEvent(GetTouchEvent(framework, x, y, touchMods, df::TouchEvent::TOUCH_MOVE));
|
||||
};
|
||||
glfwSetCursorPosCallback(window, [](GLFWwindow *, double x, double y) { handlers.onMouseMove(x, y); });
|
||||
|
||||
|
||||
@@ -35,8 +35,7 @@ cd comaps
|
||||
|
||||
Install required packages (Ubuntu/Debian):
|
||||
```bash
|
||||
sudo apt install build-essential cmake qt6-base-dev qt6-svg-dev qt6-positioning-dev libicu-dev libfreetype-dev libharfbuzz-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev optipng python3-pip ninja-build
|
||||
pip install "protobuf<3.21" --break-system-packages
|
||||
sudo apt install build-essential cmake qt6-base-dev qt6-svg-dev qt6-positioning-dev libicu-dev libfreetype-dev libharfbuzz-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev optipng python3-protobuf ninja-build
|
||||
```
|
||||
|
||||
If you plan to publish the app privately in stores check [special options](#special-cases-options).
|
||||
|
||||
@@ -165,18 +165,16 @@ void TestAltitudesBuilding(std::vector<TPoint3DList> const & roads, bool hasAlti
|
||||
AltitudeGetter & altitudeGetter)
|
||||
{
|
||||
classificator::Load();
|
||||
Platform & platform = GetPlatform();
|
||||
std::string const testDirFullPath = base::JoinPath(platform.WritableDir(), kTestDir);
|
||||
|
||||
std::string const testDirFullPath = base::JoinPath(GetPlatform().WritableDir(), kTestDir);
|
||||
ScopedDirCleanup testScopedDir(testDirFullPath);
|
||||
|
||||
// Building mwm without altitude section.
|
||||
LocalCountryFile country(testDirFullPath, CountryFile(kTestMwm), 1);
|
||||
ScopedDir testScopedDir(kTestDir);
|
||||
ScopedFile testScopedMwm(base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION), ScopedFile::Mode::Create);
|
||||
|
||||
BuildMwmWithoutAltitudes(roads, country);
|
||||
|
||||
// Adding altitude section to mwm.
|
||||
auto const mwmPath = testScopedMwm.GetFullPath();
|
||||
auto const mwmPath = base::JoinPath(testDirFullPath, kTestMwm + DATA_FILE_EXTENSION);
|
||||
BuildRoadAltitudes(mwmPath, altitudeGetter);
|
||||
|
||||
// Reading from mwm and testing altitude information.
|
||||
|
||||
@@ -64,18 +64,15 @@ std::unique_ptr<CityRoads> LoadCityRoads(LocalCountryFile const & country)
|
||||
/// section and then read from it.
|
||||
void TestCityRoadsBuilding(vector<uint32_t> && cityRoadFeatureIds)
|
||||
{
|
||||
string const writableDir = GetPlatform().WritableDir();
|
||||
string const testDir = base::JoinPath(GetPlatform().WritableDir(), kTestDir);
|
||||
ScopedDirCleanup scopedDir(testDir);
|
||||
|
||||
// Building empty mwm.
|
||||
LocalCountryFile country(base::JoinPath(writableDir, kTestDir), CountryFile(kTestMwm), 0 /* version */);
|
||||
ScopedDir const scopedDir(kTestDir);
|
||||
|
||||
string const mwmRelativePath = base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION);
|
||||
ScopedFile const scopedMwm(mwmRelativePath, ScopedFile::Mode::Create);
|
||||
LocalCountryFile country(testDir, CountryFile(kTestMwm), 0 /* version */);
|
||||
BuildEmptyMwm(country);
|
||||
|
||||
// Adding city_roads section to mwm.
|
||||
string const mwmFullPath = base::JoinPath(writableDir, mwmRelativePath);
|
||||
string const mwmFullPath = base::JoinPath(testDir, kTestMwm + DATA_FILE_EXTENSION);
|
||||
vector<uint32_t> originalCityRoadFeatureIds = cityRoadFeatureIds;
|
||||
routing_builder::SerializeCityRoads(mwmFullPath, std::move(cityRoadFeatureIds));
|
||||
|
||||
|
||||
@@ -73,19 +73,18 @@ void TestMaxspeedsSection(Features const & roads, string const & maxspeedsCsvCon
|
||||
FeatureIdToOsmId const & featureIdToOsmId)
|
||||
{
|
||||
classificator::Load();
|
||||
|
||||
string const testDirFullPath = base::JoinPath(GetPlatform().WritableDir(), kTestDir);
|
||||
ScopedDir testScopedDir(kTestDir);
|
||||
ScopedDirCleanup testScopedDir(testDirFullPath);
|
||||
|
||||
// Writing |maxspeedsCsvContent| to a file in |kTestDir|.
|
||||
ScopedFile testScopedMaxspeedsCsv(base::JoinPath(kTestDir, kCsv), maxspeedsCsvContent);
|
||||
|
||||
// Writing |roads| to test mwm.
|
||||
LocalCountryFile country(testDirFullPath, CountryFile(kTestMwm), 1 /* version */);
|
||||
string const testMwm = kTestMwm + DATA_FILE_EXTENSION;
|
||||
ScopedFile testScopedMwm(base::JoinPath(kTestDir, testMwm), ScopedFile::Mode::Create);
|
||||
BuildGeometry(roads, country);
|
||||
|
||||
string const testMwmFullPath = base::JoinPath(testDirFullPath, testMwm);
|
||||
string const testMwmFullPath = base::JoinPath(testDirFullPath, kTestMwm + DATA_FILE_EXTENSION);
|
||||
|
||||
// Create routing graph for test mwm.
|
||||
auto const countryParentGetter = [](std::string const &) { return string(); };
|
||||
|
||||
@@ -134,33 +134,26 @@ void LoadRestrictions(string const & mwmFilePath, vector<Restriction> & restrict
|
||||
/// loads the restriction section and test loaded restrictions.
|
||||
/// \param |restrictionPath| comma separated text with restrictions in osm id terms.
|
||||
/// \param |osmIdsToFeatureIdContent| comma separated text with mapping from osm ids to feature ids.
|
||||
void TestRestrictionBuilding(string const & restrictionPath, string const & osmIdsToFeatureIdContent,
|
||||
void TestRestrictionBuilding(string const & restrictionContent, string const & osmIdsToFeatureIdContent,
|
||||
unique_ptr<IndexGraph> graph, vector<Restriction> & expectedNotUTurn,
|
||||
vector<RestrictionUTurnForTests> & expectedUTurn)
|
||||
{
|
||||
Platform & platform = GetPlatform();
|
||||
string const writableDir = platform.WritableDir();
|
||||
string const targetDir = base::JoinPath(GetPlatform().WritableDir(), kTestDir);
|
||||
ScopedDirCleanup scopedDir(targetDir);
|
||||
|
||||
string const targetDir = base::JoinPath(writableDir, kTestDir);
|
||||
// Building empty mwm.
|
||||
LocalCountryFile country(targetDir, CountryFile(kTestMwm), 0 /* version */);
|
||||
ScopedDir const scopedDir(kTestDir);
|
||||
string const mwmRelativePath = base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION);
|
||||
ScopedFile const scopedMwm(mwmRelativePath, ScopedFile::Mode::Create);
|
||||
BuildEmptyMwm(country);
|
||||
|
||||
// Creating a file with restrictions.
|
||||
string const restrictionRelativePath = base::JoinPath(kTestDir, kRestrictionFileName);
|
||||
ScopedFile const restrictionScopedFile(restrictionRelativePath, restrictionPath);
|
||||
ScopedFile const restrictionScopedFile(base::JoinPath(kTestDir, kRestrictionFileName), restrictionContent);
|
||||
|
||||
// Creating osm ids to feature ids mapping.
|
||||
string const mappingRelativePath = base::JoinPath(kTestDir, kOsmIdsToFeatureIdsName);
|
||||
ScopedFile const mappingFile(mappingRelativePath, ScopedFile::Mode::Create);
|
||||
string const & osmIdsToFeatureIdFullPath = mappingFile.GetFullPath();
|
||||
string const osmIdsToFeatureIdFullPath = base::JoinPath(targetDir, kOsmIdsToFeatureIdsName);
|
||||
ReEncodeOsmIdsToFeatureIdsMapping(osmIdsToFeatureIdContent, osmIdsToFeatureIdFullPath);
|
||||
|
||||
string const restrictionFullPath = base::JoinPath(writableDir, restrictionRelativePath);
|
||||
string const & mwmFullPath = scopedMwm.GetFullPath();
|
||||
string const restrictionFullPath = base::JoinPath(targetDir, kRestrictionFileName);
|
||||
string const mwmFullPath = base::JoinPath(targetDir, kTestMwm + DATA_FILE_EXTENSION);
|
||||
|
||||
// Prepare data to collector.
|
||||
auto restrictionCollector =
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -465,6 +465,7 @@
|
||||
|
||||
/* These translations are used for all type.highway.*.bridge. */
|
||||
"type.highway.pedestrian.bridge" = "Oinezkoen zubia";
|
||||
|
||||
"type.highway.pedestrian.square" = "Plaza";
|
||||
|
||||
/* These translations are used for all type.highway.*.tunnel. */
|
||||
@@ -1483,7 +1484,7 @@
|
||||
"type.amenity.ranger_station" = "Ranger Station";
|
||||
"type.amenity.bicycle_parking.covered" = "Txirrinduen aparkaleku estalia";
|
||||
"type.post_office.post_partner" = "Post Partner";
|
||||
"type.amenity.animal_shelter" = "Animalien babeslekua";
|
||||
"type.amenity.animal_shelter" = "Animal Shelter";
|
||||
"type.barrier.wicket_gate" = "Wicket gate";
|
||||
"type.office.security" = "Security Guards Office";
|
||||
"type.power.portal" = "Power Portal";
|
||||
|
||||
@@ -434,6 +434,7 @@
|
||||
"type.highway.pedestrian" = "Fuessgängerzone";
|
||||
"type.highway.pedestrian.area" = "Fuessgängerzone";
|
||||
"type.highway.pedestrian.bridge" = "Fuessgängerzonebrugg";
|
||||
|
||||
"type.highway.pedestrian.square" = "Platz";
|
||||
"type.highway.pedestrian.tunnel" = "Fuessgängertunnel";
|
||||
"type.highway.primary" = "Hauptstrass";
|
||||
@@ -1302,4 +1303,3 @@
|
||||
"type.office.security" = "Sicherheitsdienst";
|
||||
"type.power.portal" = "Abspannportal";
|
||||
"type.building.guardhouse" = "Pförtnerhüüsli";
|
||||
"type.shop.lighting" = "Lampelade";
|
||||
|
||||
@@ -313,7 +313,7 @@
|
||||
"copyright" = "Szerzői jogok";
|
||||
|
||||
/* Text in menu + Button in the main Help dialog */
|
||||
"report_a_bug" = "Hibajelentés";
|
||||
"report_a_bug" = "Hiba jelentése";
|
||||
|
||||
/* Button in the About screen */
|
||||
"report_incorrect_map_bug" = "Hibás térképadatok jelentése vagy javítása";
|
||||
@@ -482,7 +482,7 @@
|
||||
"search_not_found" = "Hoppá, nincs találat.";
|
||||
|
||||
/* The message when user did not find anything in the search. */
|
||||
"search_not_found_query" = "Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.";
|
||||
"search_not_found_query" = "Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.";
|
||||
"search_history_title" = "Keresési előzmények";
|
||||
"search_history_text" = "Legutóbbi keresések megtekintése.";
|
||||
"clear_search" = "Keresési előzmények törlése";
|
||||
@@ -518,7 +518,7 @@
|
||||
"autodownload" = "Automatikus térképletöltés";
|
||||
|
||||
/* Place Page opening hours text */
|
||||
"closed_now" = "Jelenleg zárva";
|
||||
"closed_now" = "Most zárva van";
|
||||
|
||||
/* Place Page opening hours text */
|
||||
"daily" = "Naponta";
|
||||
@@ -609,7 +609,7 @@
|
||||
|
||||
/* Downloaded 10 **of** 20 <- it is that "of" */
|
||||
"downloader_of" = "%1$d / %2$d";
|
||||
"download_over_mobile_header" = "Biztosan letölti mobiladat-kapcsolaton keresztül?";
|
||||
"download_over_mobile_header" = "Biztosan letölti mobilhálózati kapcsolaton keresztül?";
|
||||
"download_over_mobile_message" = "Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.";
|
||||
"error_enter_correct_house_number" = "Adjon meg egy érvényes házszámot";
|
||||
"editor_storey_number" = "Emeletek száma (legfeljebb: %d)";
|
||||
@@ -712,14 +712,14 @@
|
||||
|
||||
/* For the first routing */
|
||||
"decline" = "Elutasítás";
|
||||
"mobile_data_dialog" = "Mobiladat-forgalom használata a részletes információk megjelenítéséhez?";
|
||||
"mobile_data_dialog" = "Mobilinternet használata a részletes információk megjelenítéséhez?";
|
||||
"mobile_data_option_always" = "Mindig használja";
|
||||
"mobile_data_option_today" = "Csak ma";
|
||||
"mobile_data_option_not_today" = "Ma ne használja";
|
||||
"mobile_data" = "Mobiladat-forgalom";
|
||||
"mobile_data" = "Mobilinternet";
|
||||
|
||||
/* NOTE to translators: please synchronize your translation with the English one. */
|
||||
"mobile_data_description" = "A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez internetkapcsolatra van szükség.";
|
||||
"mobile_data_description" = "A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség.";
|
||||
"mobile_data_option_never" = "Soha ne használja";
|
||||
"mobile_data_option_ask" = "Mindig kérdezzen rá";
|
||||
"traffic_update_maps_text" = "A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.";
|
||||
@@ -807,7 +807,7 @@
|
||||
"power_managment_setting_never" = "Soha";
|
||||
"power_managment_setting_auto" = "Amikor az akkumulátor lemerül";
|
||||
"power_managment_setting_manual_max" = "Mindig";
|
||||
"enable_logging_warning_message" = "Engedélyezze ideiglenesen ezt a beállítást, hogy rögzíthesse és elküldhesse nekünk a problémájával kapcsolatos részletes diagnosztikai naplókat a „Névjegy és súgó” képernyő „Hibajelentés” funkciójával. A naplók tartalmazhatnak helyadatokat.";
|
||||
"enable_logging_warning_message" = "Ha ideiglenesen engedélyezi ezt a beállítást, akkor rögzítheti, és az „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra kattintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.";
|
||||
"driving_options_title" = "Útvonaltervezési beállítások";
|
||||
|
||||
/* Recommended length for CarPlay and Android Auto is around 25-27 characters */
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
"type.amenity.hospital" = "Kórház";
|
||||
"type.amenity.hunting_stand" = "Magasles";
|
||||
"type.amenity.ice_cream" = "Fagylaltárus";
|
||||
"type.amenity.internet_cafe" = "Internetkávézó";
|
||||
"type.amenity.internet_cafe" = "Internet kávézó";
|
||||
"type.amenity.kindergarten" = "Óvoda";
|
||||
"type.amenity.library" = "Könyvtár";
|
||||
"type.amenity.loading_dock" = "Rakodórámpa";
|
||||
@@ -1234,7 +1234,7 @@
|
||||
"type.shop.laundry" = "Mosoda";
|
||||
"type.shop.mall" = "Bevásárlóközpont";
|
||||
"type.shop.massage" = "Masszázsszalon";
|
||||
"type.shop.mobile_phone" = "Mobiltelefon-bolt";
|
||||
"type.shop.mobile_phone" = "Mobiltelefon bolt";
|
||||
"type.shop.money_lender" = "Pénzkölcsönző";
|
||||
"type.shop.motorcycle" = "Motorkerékpár-szaküzlet";
|
||||
"type.shop.motorcycle_repair" = "Motorkerékpár-szerviz";
|
||||
|
||||
@@ -465,6 +465,7 @@
|
||||
|
||||
/* These translations are used for all type.highway.*.bridge. */
|
||||
"type.highway.pedestrian.bridge" = "Ponte";
|
||||
|
||||
"type.highway.pedestrian.square" = "Praça ou largo";
|
||||
|
||||
/* These translations are used for all type.highway.*.tunnel. */
|
||||
@@ -1488,4 +1489,3 @@
|
||||
"type.office.security" = "Escritório dos Guardas de Segurança";
|
||||
"type.power.portal" = "Portal de Energia";
|
||||
"type.building.guardhouse" = "Cabine de Segurança";
|
||||
"type.shop.lighting" = "Loja de Iluminação";
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
/* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
|
||||
"category_rv" = "Pentru rulote";
|
||||
"share_bookmarks_email_body" = "Salut!\n\nAm atașat marcajele mele; te rog să le deschizi în CoMaps. Dacă nu îl ai instalat, îl poți descărca de aici: https://www.comaps.app/download/\n\nBucură-te de călătorii cu CoMaps!";
|
||||
"share_bookmarks_email_body" = "Bună!\n\nȚi-am atașat locurile mele preferate din aplicația CoMaps. Deschide-le dacă ai instalată CoMaps. Dacă nu, o poți descărca pentru iOS sau Android de aici: https://www.comaps.app/";
|
||||
|
||||
/* message title of loading file */
|
||||
"load_kmz_title" = "Se încarcă locurile preferate";
|
||||
|
||||
@@ -1488,4 +1488,3 @@
|
||||
"type.office.security" = "Biroul agenților de securitate";
|
||||
"type.power.portal" = "Stație de distribuție";
|
||||
"type.building.guardhouse" = "Cabină de pază";
|
||||
"type.shop.lighting" = "Magazin de corpuri de iluminat";
|
||||
|
||||
@@ -1488,4 +1488,3 @@
|
||||
"type.office.security" = "Канцеларија обезбеђења";
|
||||
"type.power.portal" = "Носач електричних водова";
|
||||
"type.building.guardhouse" = "Кућица обезбеђења";
|
||||
"type.shop.lighting" = "Продавница расвете";
|
||||
|
||||
@@ -1091,5 +1091,5 @@
|
||||
"pref_maplanguage_title" = "Map Language";
|
||||
"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
|
||||
"pref_maplanguage_local" = "Local Language";
|
||||
"hours_confirmed_time_ago" = "Bekräftat %@";
|
||||
"existence_confirmed_time_ago" = "Existens bekräftad %@";
|
||||
"hours_confirmed_time_ago" = "Confirmed %@";
|
||||
"existence_confirmed_time_ago" = "Existence confirmed %@";
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
#include "indexer/data_source.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
|
||||
#include "defines.hpp"
|
||||
|
||||
namespace descriptions
|
||||
@@ -20,17 +18,28 @@ std::string Loader::GetWikiDescription(FeatureID const & featureId, std::vector<
|
||||
if (!value.m_cont.IsExist(DESCRIPTIONS_FILE_TAG))
|
||||
return {};
|
||||
|
||||
EntryPtr entry;
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_mutex);
|
||||
entry = m_deserializers.try_emplace(featureId.m_mwmId, std::make_shared<Entry>()).first->second;
|
||||
}
|
||||
// No need to have separate mutexes for each MWM since there is no concurrent Wiki pages reading.
|
||||
// Pros: lock is called once and a simple logic with OnMwmDeregistered synchronization.
|
||||
/// @todo Consider removing mutex at all or make wiki loading async (PlacePage info).
|
||||
|
||||
ASSERT(entry, ());
|
||||
std::lock_guard lock(m_mutex);
|
||||
Deserializer & deserializer = m_deserializers[featureId.m_mwmId];
|
||||
|
||||
auto readerPtr = value.m_cont.GetReader(DESCRIPTIONS_FILE_TAG);
|
||||
|
||||
std::lock_guard<std::mutex> lock(entry->m_mutex);
|
||||
return entry->m_deserializer.Deserialize(*readerPtr.GetPtr(), featureId.m_index, langPriority);
|
||||
return deserializer.Deserialize(*readerPtr.GetPtr(), featureId.m_index, langPriority);
|
||||
}
|
||||
|
||||
void Loader::OnMwmDeregistered(platform::LocalCountryFile const & countryFile)
|
||||
{
|
||||
std::lock_guard lock(m_mutex);
|
||||
for (auto it = m_deserializers.begin(); it != m_deserializers.end(); ++it)
|
||||
{
|
||||
if (it->first.IsDeregistered(countryFile))
|
||||
{
|
||||
m_deserializers.erase(it);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace descriptions
|
||||
|
||||
@@ -5,9 +5,7 @@
|
||||
#include "indexer/feature_decl.hpp"
|
||||
#include "indexer/mwm_set.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -23,18 +21,11 @@ public:
|
||||
explicit Loader(DataSource const & dataSource) : m_dataSource(dataSource) {}
|
||||
|
||||
std::string GetWikiDescription(FeatureID const & featureId, std::vector<int8_t> const & langPriority);
|
||||
void OnMwmDeregistered(platform::LocalCountryFile const & countryFile);
|
||||
|
||||
private:
|
||||
struct Entry
|
||||
{
|
||||
std::mutex m_mutex;
|
||||
Deserializer m_deserializer;
|
||||
};
|
||||
|
||||
using EntryPtr = std::shared_ptr<Entry>;
|
||||
|
||||
DataSource const & m_dataSource;
|
||||
std::map<MwmSet::MwmId, EntryPtr> m_deserializers;
|
||||
std::map<MwmSet::MwmId, Deserializer> m_deserializers;
|
||||
std::mutex m_mutex;
|
||||
};
|
||||
} // namespace descriptions
|
||||
|
||||
@@ -231,14 +231,6 @@ void SymbolsTexture::Invalidate(ref_ptr<dp::GraphicsContext> context, std::strin
|
||||
Load(context, skinPathName, allocator);
|
||||
}
|
||||
|
||||
void SymbolsTexture::Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
|
||||
ref_ptr<HWTextureAllocator> allocator,
|
||||
std::vector<drape_ptr<HWTexture>> & internalTextures)
|
||||
{
|
||||
internalTextures.push_back(std::move(m_hwTexture));
|
||||
Invalidate(context, skinPathName, allocator);
|
||||
}
|
||||
|
||||
ref_ptr<Texture::ResourceInfo> SymbolsTexture::FindResource(Texture::Key const & key, bool & newResource)
|
||||
{
|
||||
newResource = false;
|
||||
|
||||
@@ -36,8 +36,6 @@ public:
|
||||
|
||||
void Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
|
||||
ref_ptr<HWTextureAllocator> allocator);
|
||||
void Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
|
||||
ref_ptr<HWTextureAllocator> allocator, std::vector<drape_ptr<HWTexture>> & internalTextures);
|
||||
|
||||
bool IsSymbolContained(std::string const & symbolName) const;
|
||||
|
||||
|
||||
@@ -73,6 +73,12 @@ public:
|
||||
|
||||
static bool IsPowerOfTwo(uint32_t width, uint32_t height);
|
||||
|
||||
void DeferredCleanup(std::vector<drape_ptr<HWTexture>> & toCleanup)
|
||||
{
|
||||
toCleanup.push_back(std::move(m_hwTexture));
|
||||
Destroy();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Destroy();
|
||||
bool AllocateTexture(ref_ptr<dp::GraphicsContext> context, ref_ptr<HWTextureAllocator> allocator);
|
||||
|
||||
@@ -87,6 +87,10 @@ drape_ptr<Texture> CreateArrowTexture(ref_ptr<dp::GraphicsContext> context,
|
||||
useDefaultResourceFolder ? StaticTexture::kDefaultResource : std::string(),
|
||||
dp::TextureFormat::RGBA8, textureAllocator, true /* allowOptional */);
|
||||
}
|
||||
|
||||
// There is no "arrow-texture.png".
|
||||
// BackendRenderer::m_arrow3dPreloadedData mesh is used by default.
|
||||
/// @todo Texture arrow is still present in case if somebody wants to use it?
|
||||
return make_unique_dp<StaticTexture>(context, "arrow-texture.png", StaticTexture::kDefaultResource,
|
||||
dp::TextureFormat::RGBA8, textureAllocator, true /* allowOptional */);
|
||||
}
|
||||
@@ -315,39 +319,7 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
|
||||
m_smaaSearchTexture = make_unique_dp<StaticTexture>(context, "smaa-search.png", StaticTexture::kDefaultResource,
|
||||
dp::TextureFormat::Red, make_ref(m_textureAllocator));
|
||||
|
||||
// Initialize patterns (reserved ./data/patterns.txt lines count).
|
||||
std::set<PenPatternT> patterns;
|
||||
|
||||
double const visualScale = params.m_visualScale;
|
||||
uint32_t rowsCount = 0;
|
||||
impl::ParsePatternsList(params.m_patterns, [&](buffer_vector<double, 8> const & pattern)
|
||||
{
|
||||
PenPatternT toAdd;
|
||||
for (double d : pattern)
|
||||
toAdd.push_back(PatternFloat2Pixel(d * visualScale));
|
||||
|
||||
if (!patterns.insert(toAdd).second)
|
||||
return;
|
||||
|
||||
if (IsTrianglePattern(toAdd))
|
||||
{
|
||||
rowsCount = rowsCount + toAdd[2] + toAdd[3];
|
||||
}
|
||||
else
|
||||
{
|
||||
ASSERT_EQUAL(toAdd.size(), 2, ());
|
||||
++rowsCount;
|
||||
}
|
||||
});
|
||||
|
||||
m_stipplePenTexture = make_unique_dp<StipplePenTexture>(StipplePenTextureSize(rowsCount, m_maxTextureSize),
|
||||
make_ref(m_textureAllocator));
|
||||
|
||||
LOG(LDEBUG, ("Patterns texture size =", m_stipplePenTexture->GetWidth(), m_stipplePenTexture->GetHeight()));
|
||||
|
||||
ref_ptr<StipplePenTexture> stipplePenTex = make_ref(m_stipplePenTexture);
|
||||
for (auto const & p : patterns)
|
||||
stipplePenTex->ReservePattern(p);
|
||||
InitStipplePen(params);
|
||||
|
||||
// Initialize colors (reserved ./data/colors.txt lines count).
|
||||
std::vector<dp::Color> colors;
|
||||
@@ -380,25 +352,73 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
|
||||
m_nothingToUpload.clear();
|
||||
}
|
||||
|
||||
void TextureManager::InitStipplePen(Params const & params)
|
||||
{
|
||||
// Initialize patterns (reserved ./data/patterns.txt lines count).
|
||||
std::set<PenPatternT> patterns;
|
||||
uint32_t rowsCount = 0;
|
||||
|
||||
impl::ParsePatternsList(params.m_patterns, [&](buffer_vector<double, 8> const & pattern)
|
||||
{
|
||||
PenPatternT toAdd;
|
||||
for (double d : pattern)
|
||||
toAdd.push_back(PatternFloat2Pixel(d * params.m_visualScale));
|
||||
|
||||
if (!patterns.insert(toAdd).second)
|
||||
return;
|
||||
|
||||
if (IsTrianglePattern(toAdd))
|
||||
{
|
||||
rowsCount = rowsCount + toAdd[2] + toAdd[3];
|
||||
}
|
||||
else
|
||||
{
|
||||
ASSERT_EQUAL(toAdd.size(), 2, ());
|
||||
++rowsCount;
|
||||
}
|
||||
});
|
||||
|
||||
m_stipplePenTexture = make_unique_dp<StipplePenTexture>(StipplePenTextureSize(rowsCount, m_maxTextureSize),
|
||||
make_ref(m_textureAllocator));
|
||||
|
||||
LOG(LDEBUG, ("Patterns texture size =", m_stipplePenTexture->GetWidth(), m_stipplePenTexture->GetHeight()));
|
||||
|
||||
ref_ptr<StipplePenTexture> stipplePenTex = make_ref(m_stipplePenTexture);
|
||||
for (auto const & p : patterns)
|
||||
stipplePenTex->ReservePattern(p);
|
||||
}
|
||||
|
||||
void TextureManager::OnSwitchMapStyle(ref_ptr<dp::GraphicsContext> context)
|
||||
{
|
||||
CHECK(m_isInitialized, ());
|
||||
|
||||
bool const isVulkan = context->GetApiVersion() == dp::ApiVersion::Vulkan;
|
||||
|
||||
// Here we need invalidate only textures which can be changed in map style switch.
|
||||
// Now we update only symbol textures, if we need update other textures they must be added here.
|
||||
// For Vulkan we use m_texturesToCleanup to defer textures destroying.
|
||||
for (auto const & m_symbolTexture : m_symbolTextures)
|
||||
for (auto const & texture : m_symbolTextures)
|
||||
{
|
||||
ref_ptr<SymbolsTexture> symbolsTexture = make_ref(m_symbolTexture);
|
||||
ASSERT(symbolsTexture != nullptr, ());
|
||||
ref_ptr<SymbolsTexture> symbolsTexture = make_ref(texture);
|
||||
if (isVulkan)
|
||||
symbolsTexture->DeferredCleanup(m_texturesToCleanup);
|
||||
|
||||
if (context->GetApiVersion() != dp::ApiVersion::Vulkan)
|
||||
symbolsTexture->Invalidate(context, m_resPostfix, make_ref(m_textureAllocator));
|
||||
else
|
||||
symbolsTexture->Invalidate(context, m_resPostfix, make_ref(m_textureAllocator), m_texturesToCleanup);
|
||||
symbolsTexture->Invalidate(context, m_resPostfix, make_ref(m_textureAllocator));
|
||||
}
|
||||
}
|
||||
|
||||
void TextureManager::OnVisualScaleChanged(ref_ptr<dp::GraphicsContext> context, Params const & params)
|
||||
{
|
||||
m_resPostfix = params.m_resPostfix;
|
||||
|
||||
OnSwitchMapStyle(context);
|
||||
|
||||
if (context->GetApiVersion() == dp::ApiVersion::Vulkan)
|
||||
m_stipplePenTexture->DeferredCleanup(m_texturesToCleanup);
|
||||
|
||||
InitStipplePen(params);
|
||||
}
|
||||
|
||||
void TextureManager::InvalidateArrowTexture(ref_ptr<dp::GraphicsContext> context,
|
||||
std::string const & texturePath /* = {} */,
|
||||
bool useDefaultResourceFolder /* = false */)
|
||||
@@ -416,10 +436,13 @@ void TextureManager::ApplyInvalidatedStaticTextures()
|
||||
}
|
||||
}
|
||||
|
||||
void TextureManager::GetTexturesToCleanup(std::vector<drape_ptr<HWTexture>> & textures)
|
||||
std::vector<drape_ptr<HWTexture>> TextureManager::GetTexturesToCleanup()
|
||||
{
|
||||
CHECK(m_isInitialized, ());
|
||||
std::swap(textures, m_texturesToCleanup);
|
||||
|
||||
auto res = std::move(m_texturesToCleanup);
|
||||
m_texturesToCleanup.clear();
|
||||
return res;
|
||||
}
|
||||
|
||||
bool TextureManager::GetSymbolRegionSafe(std::string const & symbolName, SymbolRegion & region)
|
||||
|
||||
@@ -77,7 +77,9 @@ public:
|
||||
|
||||
void Init(ref_ptr<dp::GraphicsContext> context, Params const & params);
|
||||
void OnSwitchMapStyle(ref_ptr<dp::GraphicsContext> context);
|
||||
void GetTexturesToCleanup(std::vector<drape_ptr<HWTexture>> & textures);
|
||||
void OnVisualScaleChanged(ref_ptr<dp::GraphicsContext> context, Params const & params);
|
||||
|
||||
std::vector<drape_ptr<HWTexture>> GetTexturesToCleanup();
|
||||
|
||||
bool GetSymbolRegionSafe(std::string const & symbolName, SymbolRegion & region);
|
||||
void GetSymbolRegion(std::string const & symbolName, SymbolRegion & region);
|
||||
@@ -121,6 +123,8 @@ public:
|
||||
ref_ptr<HWTextureAllocator> GetTextureAllocator() const;
|
||||
|
||||
private:
|
||||
void InitStipplePen(Params const & params);
|
||||
|
||||
struct GlyphGroup
|
||||
{
|
||||
std::set<GlyphFontAndId> m_glyphKeys;
|
||||
|
||||
@@ -445,9 +445,11 @@ void ApplyPointFeature::ProcessPointRules(SymbolRuleProto const * symbolRule, Ca
|
||||
params.m_depth = PriorityToDepth(symbolRule->priority(), drule::symbol, 0);
|
||||
params.m_symbolName = symbolRule->name();
|
||||
ASSERT_GREATER_OR_EQUAL(symbolRule->min_distance(), 0, ());
|
||||
|
||||
// Where 0.1 comes from: https://github.com/organicmaps/organicmaps/pull/649
|
||||
auto const & vp = df::VisualParams::Instance();
|
||||
params.m_extendingSize =
|
||||
static_cast<uint32_t>(vp.GetVisualScale() * symbolRule->min_distance() * vp.GetPoiExtendScale());
|
||||
params.m_extendingSize = static_cast<uint32_t>(vp.GetVisualScale() * symbolRule->min_distance() * 0.1);
|
||||
|
||||
params.m_posZ = m_posZ;
|
||||
params.m_hasArea = HasArea();
|
||||
params.m_prioritized = createdByEditor;
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
#include "drape/support_manager.hpp"
|
||||
#include "drape/texture_manager.hpp"
|
||||
|
||||
#include "indexer/scales.hpp"
|
||||
|
||||
#include "platform/platform.hpp"
|
||||
|
||||
#include "base/file_name_utils.hpp"
|
||||
@@ -355,18 +353,37 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
|
||||
m_trafficGenerator->InvalidateTexturesCache();
|
||||
m_transitBuilder->RebuildSchemes(m_context, m_texMng);
|
||||
|
||||
// For Vulkan we initialize deferred cleaning up.
|
||||
if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
|
||||
{
|
||||
std::vector<drape_ptr<dp::HWTexture>> textures;
|
||||
m_texMng->GetTexturesToCleanup(textures);
|
||||
if (!textures.empty())
|
||||
{
|
||||
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
|
||||
make_unique_dp<CleanupTexturesMessage>(std::move(textures)), MessagePriority::Normal);
|
||||
}
|
||||
}
|
||||
CleanupTextures();
|
||||
break;
|
||||
}
|
||||
|
||||
case Message::Type::VisualScaleChanged:
|
||||
{
|
||||
ref_ptr<VisualScaleChangedMessage> msg = message;
|
||||
msg->FilterDependentMessages();
|
||||
|
||||
CHECK(m_context != nullptr, ());
|
||||
|
||||
dp::TextureManager::Params params;
|
||||
params.m_resPostfix = VisualParams::Instance().GetResourcePostfix();
|
||||
params.m_visualScale = df::VisualParams::Instance().GetVisualScale();
|
||||
#ifdef BUILD_DESIGNER
|
||||
params.m_patterns = "patterns_design.txt";
|
||||
#else
|
||||
params.m_patterns = "patterns.txt";
|
||||
#endif // BUILD_DESIGNER
|
||||
|
||||
m_texMng->OnVisualScaleChanged(m_context, params);
|
||||
|
||||
RecacheMapShapes();
|
||||
RecacheGui(m_lastWidgetsInfo, false /* needResetOldGui */);
|
||||
#ifdef RENDER_DEBUG_INFO_LABELS
|
||||
RecacheDebugLabels();
|
||||
#endif
|
||||
m_trafficGenerator->InvalidateTexturesCache();
|
||||
m_transitBuilder->RebuildSchemes(m_context, m_texMng);
|
||||
|
||||
CleanupTextures();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -611,21 +628,8 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
|
||||
m_arrow3dPreloadedData = Arrow3d::PreloadMesh(m_arrow3dCustomDecl, m_texMng);
|
||||
}
|
||||
|
||||
// Recache map shapes.
|
||||
RecacheMapShapes();
|
||||
|
||||
// For Vulkan we initialize deferred cleaning up.
|
||||
if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
|
||||
{
|
||||
std::vector<drape_ptr<dp::HWTexture>> textures;
|
||||
m_texMng->GetTexturesToCleanup(textures);
|
||||
if (!textures.empty())
|
||||
{
|
||||
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
|
||||
make_unique_dp<CleanupTexturesMessage>(std::move(textures)), MessagePriority::Normal);
|
||||
}
|
||||
}
|
||||
|
||||
CleanupTextures();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -772,6 +776,18 @@ void BackendRenderer::RecacheMapShapes()
|
||||
m_commutator->PostMessage(ThreadsCommutator::RenderThread, std::move(msg), MessagePriority::Normal);
|
||||
}
|
||||
|
||||
void BackendRenderer::CleanupTextures()
|
||||
{
|
||||
// For Vulkan we initialize deferred cleaning up.
|
||||
if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
|
||||
{
|
||||
auto textures = m_texMng->GetTexturesToCleanup();
|
||||
if (!textures.empty())
|
||||
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
|
||||
make_unique_dp<CleanupTexturesMessage>(std::move(textures)), MessagePriority::Normal);
|
||||
}
|
||||
}
|
||||
|
||||
void BackendRenderer::FlushGeometry(TileKey const & key, dp::RenderState const & state,
|
||||
drape_ptr<dp::RenderBucket> && buffer)
|
||||
{
|
||||
|
||||
@@ -83,6 +83,7 @@ private:
|
||||
void RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui);
|
||||
void RecacheChoosePositionMark();
|
||||
void RecacheMapShapes();
|
||||
void CleanupTextures();
|
||||
|
||||
#ifdef RENDER_DEBUG_INFO_LABELS
|
||||
void RecacheDebugLabels();
|
||||
|
||||
@@ -896,10 +896,8 @@ void DrapeEngine::UpdateVisualScale(double vs, bool needStopRendering)
|
||||
if (needStopRendering)
|
||||
SetRenderingEnabled();
|
||||
|
||||
RecacheGui(false);
|
||||
RecacheMapShapes();
|
||||
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
|
||||
make_unique_dp<RecoverContextDependentResourcesMessage>(), MessagePriority::Normal);
|
||||
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<UpdateVisualScaleMessage>(),
|
||||
MessagePriority::High);
|
||||
}
|
||||
|
||||
void DrapeEngine::UpdateMyPositionRoutingOffset(bool useDefault, int offsetY)
|
||||
|
||||
@@ -639,51 +639,11 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
|
||||
break;
|
||||
}
|
||||
|
||||
case Message::Type::RecoverContextDependentResources:
|
||||
{
|
||||
UpdateContextDependentResources();
|
||||
break;
|
||||
}
|
||||
case Message::Type::RecoverContextDependentResources: UpdateContextDependentResources(); break;
|
||||
|
||||
case Message::Type::UpdateMapStyle:
|
||||
{
|
||||
#ifdef BUILD_DESIGNER
|
||||
classificator::Load();
|
||||
#endif // BUILD_DESIGNER
|
||||
case Message::Type::UpdateMapStyle: UpdateAll<SwitchMapStyleMessage>(); break;
|
||||
|
||||
// Clear all graphics.
|
||||
for (RenderLayer & layer : m_layers)
|
||||
{
|
||||
layer.m_renderGroups.clear();
|
||||
layer.m_isDirty = false;
|
||||
}
|
||||
|
||||
// Must be recreated on map style changing.
|
||||
CHECK(m_context != nullptr, ());
|
||||
m_transitBackground = make_unique_dp<ScreenQuadRenderer>(m_context);
|
||||
|
||||
// Invalidate read manager.
|
||||
{
|
||||
BaseBlockingMessage::Blocker blocker;
|
||||
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
|
||||
make_unique_dp<InvalidateReadManagerRectMessage>(blocker), MessagePriority::Normal);
|
||||
blocker.Wait();
|
||||
}
|
||||
|
||||
// Delete all messages which can contain render states (and textures references inside).
|
||||
auto f = [this]() { InstantMessageFilter([](ref_ptr<Message> msg) { return msg->ContainsRenderState(); }); };
|
||||
|
||||
// Notify backend renderer and wait for completion.
|
||||
{
|
||||
BaseBlockingMessage::Blocker blocker;
|
||||
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
|
||||
make_unique_dp<SwitchMapStyleMessage>(blocker, std::move(f)), MessagePriority::Normal);
|
||||
blocker.Wait();
|
||||
}
|
||||
|
||||
UpdateContextDependentResources();
|
||||
break;
|
||||
}
|
||||
case Message::Type::VisualScaleChanged: UpdateAll<VisualScaleChangedMessage>(); break;
|
||||
|
||||
case Message::Type::AllowAutoZoom:
|
||||
{
|
||||
@@ -809,7 +769,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
|
||||
zoom = scales::GetAddNewPlaceScale();
|
||||
AddUserEvent(make_unique_dp<SetCenterEvent>(
|
||||
pt ? *pt : m_userEventStream.GetCurrentScreen().GlobalRect().Center(), zoom, true /* isAnim */,
|
||||
false /* trackVisibleViewport */, nullptr /* parallelAnimCreator */));
|
||||
true /* trackVisibleViewport */, nullptr /* parallelAnimCreator */));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1022,6 +982,46 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
|
||||
}
|
||||
}
|
||||
|
||||
template <class MessageT>
|
||||
void FrontendRenderer::UpdateAll()
|
||||
{
|
||||
#ifdef BUILD_DESIGNER
|
||||
classificator::Load();
|
||||
#endif // BUILD_DESIGNER
|
||||
|
||||
// Clear all graphics.
|
||||
for (RenderLayer & layer : m_layers)
|
||||
{
|
||||
layer.m_renderGroups.clear();
|
||||
layer.m_isDirty = false;
|
||||
}
|
||||
|
||||
// Must be recreated on map style changing.
|
||||
CHECK(m_context != nullptr, ());
|
||||
m_transitBackground = make_unique_dp<ScreenQuadRenderer>(m_context);
|
||||
|
||||
// Invalidate read manager.
|
||||
{
|
||||
BaseBlockingMessage::Blocker blocker;
|
||||
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
|
||||
make_unique_dp<InvalidateReadManagerRectMessage>(blocker), MessagePriority::Normal);
|
||||
blocker.Wait();
|
||||
}
|
||||
|
||||
// Delete all messages which can contain render states (and textures references inside).
|
||||
auto f = [this]() { InstantMessageFilter([](ref_ptr<Message> msg) { return msg->ContainsRenderState(); }); };
|
||||
|
||||
// Notify backend renderer and wait for completion.
|
||||
{
|
||||
BaseBlockingMessage::Blocker blocker;
|
||||
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<MessageT>(blocker, std::move(f)),
|
||||
MessagePriority::Normal);
|
||||
blocker.Wait();
|
||||
}
|
||||
|
||||
UpdateContextDependentResources();
|
||||
}
|
||||
|
||||
std::unique_ptr<threads::IRoutine> FrontendRenderer::CreateRoutine()
|
||||
{
|
||||
return std::make_unique<Routine>(*this);
|
||||
|
||||
@@ -246,6 +246,9 @@ private:
|
||||
void ReleaseResources();
|
||||
void UpdateContextDependentResources();
|
||||
|
||||
template <class MessageT>
|
||||
void UpdateAll();
|
||||
|
||||
void BeginUpdateOverlayTree(ScreenBase const & modelView);
|
||||
void UpdateOverlayTree(ScreenBase const & modelView, drape_ptr<RenderGroup> & renderGroup);
|
||||
void EndUpdateOverlayTree();
|
||||
|
||||
@@ -103,6 +103,7 @@ std::string DebugPrint(Message::Type msgType)
|
||||
case Message::Type::EnableIsolines: return "EnableIsolines";
|
||||
case Message::Type::OnEnterBackground: return "OnEnterBackground";
|
||||
case Message::Type::Arrow3dRecache: return "Arrow3dRecache";
|
||||
case Message::Type::VisualScaleChanged: return "VisualScaleChanged";
|
||||
}
|
||||
ASSERT(false, ("Unknown message type."));
|
||||
return "Unknown type";
|
||||
|
||||
@@ -103,7 +103,8 @@ public:
|
||||
NotifyGraphicsReady,
|
||||
EnableIsolines,
|
||||
OnEnterBackground,
|
||||
Arrow3dRecache
|
||||
Arrow3dRecache,
|
||||
VisualScaleChanged,
|
||||
};
|
||||
|
||||
virtual ~Message() = default;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "drape_frontend/circles_pack_shape.hpp"
|
||||
#include "drape_frontend/color_constants.hpp"
|
||||
#include "drape_frontend/custom_features_context.hpp"
|
||||
#include "drape_frontend/drape_api.hpp"
|
||||
#include "drape_frontend/drape_api_builder.hpp"
|
||||
@@ -14,8 +13,7 @@
|
||||
#include "drape_frontend/overlay_batcher.hpp"
|
||||
#include "drape_frontend/postprocess_renderer.hpp"
|
||||
#include "drape_frontend/render_node.hpp"
|
||||
#include "drape_frontend/render_state_extension.hpp"
|
||||
#include "drape_frontend/route_builder.hpp"
|
||||
#include "drape_frontend/route_shape.hpp"
|
||||
#include "drape_frontend/selection_shape.hpp"
|
||||
#include "drape_frontend/tile_utils.hpp"
|
||||
#include "drape_frontend/traffic_generator.hpp"
|
||||
@@ -26,13 +24,10 @@
|
||||
|
||||
#include "drape/pointers.hpp"
|
||||
#include "drape/render_bucket.hpp"
|
||||
#include "drape/viewport.hpp"
|
||||
|
||||
#include "platform/location.hpp"
|
||||
|
||||
#include "geometry/polyline2d.hpp"
|
||||
#include "geometry/rect2d.hpp"
|
||||
#include "geometry/screenbase.hpp"
|
||||
#include "geometry/triangle2d.hpp"
|
||||
|
||||
#include <condition_variable>
|
||||
@@ -40,7 +35,6 @@
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
#include <optional>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace df
|
||||
@@ -730,6 +724,12 @@ public:
|
||||
Type GetType() const override { return Type::UpdateMapStyle; }
|
||||
};
|
||||
|
||||
class UpdateVisualScaleMessage : public Message
|
||||
{
|
||||
public:
|
||||
Type GetType() const override { return Type::VisualScaleChanged; }
|
||||
};
|
||||
|
||||
class FollowRouteMessage : public Message
|
||||
{
|
||||
public:
|
||||
@@ -776,6 +776,14 @@ private:
|
||||
FilterMessagesHandler m_filterMessagesHandler;
|
||||
};
|
||||
|
||||
class VisualScaleChangedMessage : public SwitchMapStyleMessage
|
||||
{
|
||||
public:
|
||||
using SwitchMapStyleMessage::SwitchMapStyleMessage;
|
||||
|
||||
Type GetType() const override { return Type::VisualScaleChanged; }
|
||||
};
|
||||
|
||||
class InvalidateMessage : public Message
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -4,14 +4,8 @@
|
||||
|
||||
#include "indexer/scales.hpp"
|
||||
|
||||
#include "platform/settings.hpp"
|
||||
|
||||
#include "geometry/angles.hpp"
|
||||
#include "geometry/distance_on_sphere.hpp"
|
||||
#include "geometry/point2d.hpp"
|
||||
#include "geometry/transformations.hpp"
|
||||
|
||||
#include "base/logging.hpp"
|
||||
|
||||
namespace df
|
||||
{
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
#include "geometry/screenbase.hpp"
|
||||
|
||||
#include "base/matrix.hpp"
|
||||
|
||||
namespace df
|
||||
{
|
||||
extern double const kDefault3dScale;
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
#include "screen_operations.hpp"
|
||||
|
||||
#include "drape_frontend/animation/interpolators.hpp"
|
||||
#include "drape_frontend/animation/linear_animation.hpp"
|
||||
#include "drape_frontend/animation/scale_animation.hpp"
|
||||
#include "drape_frontend/animation_constants.hpp"
|
||||
#include "drape_frontend/visual_params.hpp"
|
||||
|
||||
#include "indexer/scales.hpp"
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
#include "drape_frontend/visual_params.hpp"
|
||||
|
||||
#include "indexer/scales.hpp"
|
||||
|
||||
#include "coding/point_coding.hpp" // kMwmPointAccuracy
|
||||
|
||||
#include "geometry/mercator.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
@@ -12,21 +16,11 @@
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
#include <utility>
|
||||
|
||||
namespace df
|
||||
{
|
||||
using VisualScale = std::pair<std::string, double>;
|
||||
|
||||
#ifdef DEBUG
|
||||
static bool g_isInited = false;
|
||||
#define RISE_INITED g_isInited = true
|
||||
#define ASSERT_INITED ASSERT(g_isInited, ())
|
||||
#else
|
||||
#define RISE_INITED
|
||||
#define ASSERT_INITED
|
||||
#endif
|
||||
|
||||
VisualParams & VisualParams::Instance()
|
||||
{
|
||||
static VisualParams vizParams;
|
||||
@@ -35,7 +29,8 @@ VisualParams & VisualParams::Instance()
|
||||
|
||||
void VisualParams::Init(double vs, uint32_t tileSize)
|
||||
{
|
||||
ASSERT_LESS_OR_EQUAL(vs, kMaxVisualScale, ());
|
||||
CHECK(vs >= 1.0 && vs <= kMaxVisualScale, (vs));
|
||||
CHECK(tileSize >= 32, (tileSize));
|
||||
|
||||
VisualParams & vizParams = Instance();
|
||||
vizParams.m_tileSize = tileSize;
|
||||
@@ -47,35 +42,34 @@ void VisualParams::Init(double vs, uint32_t tileSize)
|
||||
else
|
||||
vizParams.m_glyphVisualParams = {0.5f, 0.06f, 0.2f, 0.01f, 0.49f, 0.04f};
|
||||
|
||||
RISE_INITED;
|
||||
vizParams.m_isInited = true;
|
||||
|
||||
LOG(LINFO, ("Visual scale =", vs, "; Tile size =", tileSize, "; Resources =", GetResourcePostfix(vs)));
|
||||
}
|
||||
|
||||
double VisualParams::GetFontScale() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
return m_fontScale;
|
||||
}
|
||||
|
||||
void VisualParams::SetFontScale(double fontScale)
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
m_fontScale = math::Clamp(fontScale, 0.5, 2.0);
|
||||
}
|
||||
|
||||
void VisualParams::SetVisualScale(double visualScale)
|
||||
void VisualParams::SetVisualScale(double vs)
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT_LESS_OR_EQUAL(visualScale, kMaxVisualScale, ());
|
||||
m_visualScale = visualScale;
|
||||
ASSERT(m_isInited, ());
|
||||
CHECK(vs >= 1.0 && vs <= kMaxVisualScale, (vs));
|
||||
m_visualScale = vs;
|
||||
|
||||
LOG(LINFO, ("Visual scale =", visualScale));
|
||||
LOG(LINFO, ("Visual scale =", vs));
|
||||
}
|
||||
|
||||
std::string const & VisualParams::GetResourcePostfix(double visualScale)
|
||||
{
|
||||
ASSERT_INITED;
|
||||
static VisualScale postfixes[] = {
|
||||
/// @todo Not used in mobile because of minimal visual scale (@see visual_scale.hpp)
|
||||
{"mdpi", kMdpiScale},
|
||||
@@ -103,52 +97,46 @@ std::string const & VisualParams::GetResourcePostfix(double visualScale)
|
||||
|
||||
std::string const & VisualParams::GetResourcePostfix() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
return VisualParams::GetResourcePostfix(m_visualScale);
|
||||
}
|
||||
|
||||
double VisualParams::GetVisualScale() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
return m_visualScale;
|
||||
}
|
||||
|
||||
double VisualParams::GetPoiExtendScale() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
return m_poiExtendScale;
|
||||
}
|
||||
|
||||
uint32_t VisualParams::GetTileSize() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
CHECK(m_isInited, ());
|
||||
return m_tileSize;
|
||||
}
|
||||
|
||||
uint32_t VisualParams::GetTouchRectRadius() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
float const kRadiusInPixels = 20.0f;
|
||||
return static_cast<uint32_t>(kRadiusInPixels * GetVisualScale());
|
||||
}
|
||||
|
||||
double VisualParams::GetDragThreshold() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
double const kDragThresholdInPixels = 10.0;
|
||||
return kDragThresholdInPixels * GetVisualScale();
|
||||
}
|
||||
|
||||
double VisualParams::GetScaleThreshold() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
double const kScaleThresholdInPixels = 2.0;
|
||||
return kScaleThresholdInPixels * GetVisualScale();
|
||||
}
|
||||
|
||||
VisualParams::GlyphVisualParams const & VisualParams::GetGlyphVisualParams() const
|
||||
{
|
||||
ASSERT_INITED;
|
||||
ASSERT(m_isInited, ());
|
||||
return m_glyphVisualParams;
|
||||
}
|
||||
|
||||
@@ -178,8 +166,7 @@ int GetTileScaleBase(ScreenBase const & s)
|
||||
|
||||
int GetTileScaleBase(m2::RectD const & r)
|
||||
{
|
||||
double const sz = std::max(r.SizeX(), r.SizeY());
|
||||
ASSERT_GREATER(sz, 0., ("Rect should not be a point:", r));
|
||||
double const sz = std::max(std::max(r.SizeX(), r.SizeY()), kMwmPointAccuracy);
|
||||
return std::max(1, math::iround(std::log2(mercator::Bounds::kRangeX / sz)));
|
||||
}
|
||||
|
||||
@@ -190,7 +177,7 @@ double GetTileScaleBase(double drawScale)
|
||||
|
||||
int GetTileScaleIncrement(uint32_t tileSize, double visualScale)
|
||||
{
|
||||
return static_cast<int>(std::log2(tileSize / 256.0 / visualScale));
|
||||
return math::iround(std::log2(tileSize / 256.0 / visualScale));
|
||||
}
|
||||
|
||||
int GetTileScaleIncrement()
|
||||
@@ -257,10 +244,18 @@ uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight)
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
double GetDrawTileScale(double baseScale)
|
||||
{
|
||||
return baseScale + GetTileScaleIncrement();
|
||||
}
|
||||
|
||||
int GetDrawTileScale(int baseScale, uint32_t tileSize, double visualScale)
|
||||
{
|
||||
return std::max(1, baseScale + GetTileScaleIncrement(tileSize, visualScale));
|
||||
return baseScale + GetTileScaleIncrement(tileSize, visualScale);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
int GetDrawTileScale(ScreenBase const & s, uint32_t tileSize, double visualScale)
|
||||
{
|
||||
@@ -272,17 +267,6 @@ int GetDrawTileScale(m2::RectD const & r, uint32_t tileSize, double visualScale)
|
||||
return GetDrawTileScale(GetTileScaleBase(r), tileSize, visualScale);
|
||||
}
|
||||
|
||||
int GetDrawTileScale(int baseScale)
|
||||
{
|
||||
VisualParams const & p = VisualParams::Instance();
|
||||
return GetDrawTileScale(baseScale, p.GetTileSize(), p.GetVisualScale());
|
||||
}
|
||||
|
||||
double GetDrawTileScale(double baseScale)
|
||||
{
|
||||
return std::max(1.0, baseScale + GetTileScaleIncrement());
|
||||
}
|
||||
|
||||
int GetDrawTileScale(ScreenBase const & s)
|
||||
{
|
||||
VisualParams const & p = VisualParams::Instance();
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
#pragma once
|
||||
#include "indexer/scales.hpp"
|
||||
|
||||
#include "geometry/rect2d.hpp"
|
||||
#include "geometry/screenbase.hpp"
|
||||
|
||||
#include "base/macros.hpp"
|
||||
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace df
|
||||
{
|
||||
@@ -36,8 +31,6 @@ public:
|
||||
std::string const & GetResourcePostfix() const;
|
||||
|
||||
double GetVisualScale() const;
|
||||
/// This is a scale factor to decrease extending of bbox for POI icons. It could be removed with new style
|
||||
double GetPoiExtendScale() const;
|
||||
uint32_t GetTileSize() const;
|
||||
|
||||
/// How many pixels around touch point are used to get bookmark or POI in consideration of visual scale.
|
||||
@@ -62,7 +55,7 @@ public:
|
||||
void SetFontScale(double fontScale);
|
||||
|
||||
// This method can be called ONLY if rendering is disabled.
|
||||
void SetVisualScale(double visualScale);
|
||||
void SetVisualScale(double vs);
|
||||
|
||||
private:
|
||||
VisualParams() = default;
|
||||
@@ -71,8 +64,8 @@ private:
|
||||
|
||||
uint32_t m_tileSize = 0;
|
||||
double m_visualScale = 0.0;
|
||||
double m_poiExtendScale = 0.1; // Found empirically.
|
||||
std::atomic<double> m_fontScale = 1.0;
|
||||
double m_fontScale = 1.0;
|
||||
bool m_isInited = false;
|
||||
|
||||
DISALLOW_COPY_AND_MOVE(VisualParams);
|
||||
};
|
||||
@@ -89,11 +82,8 @@ double GetTileScaleBase(double drawScale);
|
||||
int GetTileScaleIncrement(uint32_t tileSize, double visualScale);
|
||||
int GetTileScaleIncrement();
|
||||
|
||||
int GetDrawTileScale(int baseScale, uint32_t tileSize, double visualScale);
|
||||
int GetDrawTileScale(ScreenBase const & s, uint32_t tileSize, double visualScale);
|
||||
int GetDrawTileScale(m2::RectD const & r, uint32_t tileSize, double visualScale);
|
||||
int GetDrawTileScale(int baseScale);
|
||||
double GetDrawTileScale(double baseScale);
|
||||
int GetDrawTileScale(ScreenBase const & s);
|
||||
int GetDrawTileScale(m2::RectD const & r);
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@ set(SRC
|
||||
altitude_loader.hpp
|
||||
brands_holder.cpp
|
||||
brands_holder.hpp
|
||||
caching_rank_table_loader.cpp
|
||||
caching_rank_table_loader.hpp
|
||||
categories_holder.cpp
|
||||
categories_holder.hpp
|
||||
categories_holder_loader.cpp
|
||||
@@ -153,7 +151,6 @@ file(COPY ${OTHER_FILES} DESTINATION ${CMAKE_BINARY_DIR})
|
||||
omim_add_library(${PROJECT_NAME} ${SRC})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
search # search::DummyRankTable in CachingRankTableLoader
|
||||
platform
|
||||
geometry
|
||||
protobuf
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
#include "indexer/caching_rank_table_loader.hpp"
|
||||
|
||||
#include "search/dummy_rank_table.hpp"
|
||||
|
||||
#include "indexer/data_source.hpp"
|
||||
|
||||
CachingRankTableLoader::CachingRankTableLoader(DataSource const & dataSource, std::string const & sectionName)
|
||||
: m_dataSource(dataSource)
|
||||
, m_sectionName(sectionName)
|
||||
{}
|
||||
|
||||
uint8_t CachingRankTableLoader::Get(FeatureID const & featureId) const
|
||||
{
|
||||
auto const handle = m_dataSource.GetMwmHandleById(featureId.m_mwmId);
|
||||
|
||||
if (!handle.IsAlive())
|
||||
return search::RankTable::kNoRank;
|
||||
|
||||
auto it = m_deserializers.find(featureId.m_mwmId);
|
||||
|
||||
if (it == m_deserializers.end())
|
||||
{
|
||||
auto rankTable = search::RankTable::Load(handle.GetValue()->m_cont, m_sectionName);
|
||||
|
||||
if (!rankTable)
|
||||
rankTable = std::make_unique<search::DummyRankTable>();
|
||||
|
||||
auto const result = m_deserializers.emplace(featureId.m_mwmId, std::move(rankTable));
|
||||
it = result.first;
|
||||
}
|
||||
|
||||
return it->second->Get(featureId.m_index);
|
||||
}
|
||||
|
||||
void CachingRankTableLoader::OnMwmDeregistered(platform::LocalCountryFile const & localFile)
|
||||
{
|
||||
for (auto it = m_deserializers.begin(); it != m_deserializers.end(); ++it)
|
||||
{
|
||||
if (it->first.IsDeregistered(localFile))
|
||||
{
|
||||
m_deserializers.erase(it);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "indexer/feature_decl.hpp"
|
||||
#include "indexer/mwm_set.hpp"
|
||||
#include "indexer/rank_table.hpp"
|
||||
|
||||
#include "base/macros.hpp"
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
class DataSource;
|
||||
struct FeatureID;
|
||||
|
||||
// *NOTE* This class IS NOT thread-safe.
|
||||
class CachingRankTableLoader
|
||||
{
|
||||
public:
|
||||
CachingRankTableLoader(DataSource const & dataSource, std::string const & sectionName);
|
||||
|
||||
/// @return 0 if there is no rank for feature.
|
||||
uint8_t Get(FeatureID const & featureId) const;
|
||||
void OnMwmDeregistered(platform::LocalCountryFile const & localFile);
|
||||
|
||||
private:
|
||||
DataSource const & m_dataSource;
|
||||
std::string const m_sectionName;
|
||||
mutable std::map<MwmSet::MwmId, std::unique_ptr<search::RankTable>> m_deserializers;
|
||||
|
||||
DISALLOW_COPY(CachingRankTableLoader);
|
||||
};
|
||||
@@ -284,7 +284,6 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
|
||||
, m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1, false /* rough */), kMaxTrafficCacheSizeBytes,
|
||||
m_routingManager.RoutingSession())
|
||||
, m_lastReportedCountry(kInvalidCountryId)
|
||||
, m_popularityLoader(m_featuresFetcher.GetDataSource(), POPULARITY_RANKS_FILE_TAG)
|
||||
, m_descriptionsLoader(std::make_unique<descriptions::Loader>(m_featuresFetcher.GetDataSource()))
|
||||
{
|
||||
// Editor should be initialized from the main thread to set its ThreadChecker.
|
||||
@@ -453,7 +452,7 @@ void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
|
||||
m_transitManager.OnMwmDeregistered(localFile);
|
||||
m_isolinesManager.OnMwmDeregistered(localFile);
|
||||
m_trafficManager.OnMwmDeregistered(localFile);
|
||||
m_popularityLoader.OnMwmDeregistered(localFile);
|
||||
m_descriptionsLoader->OnMwmDeregistered(localFile);
|
||||
|
||||
m_storage.DeleteCustomCountryVersion(localFile);
|
||||
};
|
||||
@@ -3077,10 +3076,6 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
|
||||
|
||||
auto const result = osm::Editor::Instance().SaveEditedFeature(emo);
|
||||
|
||||
// Automatically select newly created and edited objects.
|
||||
if (m_currentPlacePageInfo)
|
||||
DeactivateMapSelection();
|
||||
|
||||
place_page::BuildInfo info;
|
||||
info.m_mercator = emo.GetMercator();
|
||||
info.m_featureId = emo.GetID();
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
#include "editor/new_feature_categories.hpp"
|
||||
#include "editor/osm_editor.hpp"
|
||||
|
||||
#include "indexer/caching_rank_table_loader.hpp"
|
||||
#include "indexer/data_source.hpp"
|
||||
#include "indexer/data_source_helpers.hpp"
|
||||
#include "indexer/map_object.hpp"
|
||||
@@ -485,8 +484,6 @@ private:
|
||||
|
||||
TrackRecordingUpdateHandler m_trackRecordingUpdateHandler;
|
||||
|
||||
CachingRankTableLoader m_popularityLoader;
|
||||
|
||||
std::unique_ptr<descriptions::Loader> m_descriptionsLoader;
|
||||
|
||||
public:
|
||||
|
||||
@@ -57,5 +57,16 @@ std::string DebugPrint(ScopedDir const & dir)
|
||||
os << "ScopedDir [" << dir.GetFullPath() << "]";
|
||||
return os.str();
|
||||
}
|
||||
|
||||
ScopedDirCleanup::ScopedDirCleanup(std::string const & path) : m_fullPath(path)
|
||||
{
|
||||
UNUSED_VALUE(Platform::MkDir(m_fullPath));
|
||||
}
|
||||
|
||||
ScopedDirCleanup::~ScopedDirCleanup()
|
||||
{
|
||||
UNUSED_VALUE(Platform::RmDirRecursively(m_fullPath));
|
||||
}
|
||||
|
||||
} // namespace tests_support
|
||||
} // namespace platform
|
||||
|
||||
@@ -38,6 +38,15 @@ private:
|
||||
DISALLOW_COPY_AND_MOVE(ScopedDir);
|
||||
};
|
||||
|
||||
class ScopedDirCleanup
|
||||
{
|
||||
std::string const m_fullPath;
|
||||
|
||||
public:
|
||||
explicit ScopedDirCleanup(std::string const & path);
|
||||
~ScopedDirCleanup();
|
||||
};
|
||||
|
||||
std::string DebugPrint(ScopedDir const & dir);
|
||||
} // namespace tests_support
|
||||
} // namespace platform
|
||||
|
||||
@@ -339,7 +339,8 @@ void MapWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt)
|
||||
auto types = feature::TypesHolder(ft);
|
||||
types.SortBySpec();
|
||||
for (auto const & type : types.ToObjectNames())
|
||||
concat += type + " ";
|
||||
concat = concat + type + " ";
|
||||
concat = concat + "| " + DebugPrint(ft.GetGeomType());
|
||||
addStringFn(concat);
|
||||
|
||||
// Name
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "base/assert.hpp"
|
||||
#include "base/logging.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <limits>
|
||||
|
||||
@@ -200,7 +199,7 @@ void UpdateDialog::OnItemClick(QTreeWidgetItem * item, int column)
|
||||
case NodeStatus::Partly: st.DownloadNode(countryId); break;
|
||||
|
||||
case NodeStatus::InQueue:
|
||||
case NodeStatus::Downloading: st.DeleteNode(countryId); break;
|
||||
case NodeStatus::Downloading: st.CancelDownloadNode(countryId); break;
|
||||
|
||||
case NodeStatus::Applying:
|
||||
// Do nothing.
|
||||
|
||||
@@ -43,8 +43,6 @@
|
||||
394E1E0B22BBB5EB00E4BC75 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 394E1E0922BBB5EB00E4BC75 /* utils.hpp */; };
|
||||
39F376C0207D32450058E8E0 /* cities_boundaries_serdes_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */; };
|
||||
39F376C3207D32510058E8E0 /* scale_index_reading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */; };
|
||||
3D12E3D72111B4BE0015A9A9 /* caching_rank_table_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D12E3D52111B4BD0015A9A9 /* caching_rank_table_loader.cpp */; };
|
||||
3D12E3D82111B4BE0015A9A9 /* caching_rank_table_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D12E3D62111B4BD0015A9A9 /* caching_rank_table_loader.hpp */; };
|
||||
3D489BC61D3D220F0052AA38 /* editable_map_object_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */; };
|
||||
3D489BC71D3D22150052AA38 /* features_vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */; };
|
||||
3D489BC81D3D22190052AA38 /* string_slice_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */; };
|
||||
@@ -265,8 +263,6 @@
|
||||
394E1E0922BBB5EB00E4BC75 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = "<group>"; };
|
||||
39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_serdes_tests.cpp; sourceTree = "<group>"; };
|
||||
39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale_index_reading_tests.cpp; sourceTree = "<group>"; };
|
||||
3D12E3D52111B4BD0015A9A9 /* caching_rank_table_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = caching_rank_table_loader.cpp; sourceTree = "<group>"; };
|
||||
3D12E3D62111B4BD0015A9A9 /* caching_rank_table_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = caching_rank_table_loader.hpp; sourceTree = "<group>"; };
|
||||
3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wheelchair_tests.cpp; sourceTree = "<group>"; };
|
||||
3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_names_test.cpp; sourceTree = "<group>"; };
|
||||
3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = centers_table_test.cpp; sourceTree = "<group>"; };
|
||||
@@ -602,8 +598,6 @@
|
||||
34664CEF1D49FEC1003D7096 /* altitude_loader.hpp */,
|
||||
4088CE1F21AE993F00E2702A /* brands_holder.cpp */,
|
||||
4088CE1E21AE993F00E2702A /* brands_holder.hpp */,
|
||||
3D12E3D52111B4BD0015A9A9 /* caching_rank_table_loader.cpp */,
|
||||
3D12E3D62111B4BD0015A9A9 /* caching_rank_table_loader.hpp */,
|
||||
56C74C121C749E4700B71B9F /* categories_holder_loader.cpp */,
|
||||
56C74C131C749E4700B71B9F /* categories_holder.cpp */,
|
||||
56C74C141C749E4700B71B9F /* categories_holder.hpp */,
|
||||
@@ -778,7 +772,6 @@
|
||||
347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */,
|
||||
675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */,
|
||||
456E1B181F90E5B7009C32E1 /* cities_boundaries_serdes.hpp in Headers */,
|
||||
3D12E3D82111B4BE0015A9A9 /* caching_rank_table_loader.hpp in Headers */,
|
||||
670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */,
|
||||
675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */,
|
||||
56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */,
|
||||
@@ -990,7 +983,6 @@
|
||||
6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */,
|
||||
675341301A3F540F00A0A8C3 /* data_source.cpp in Sources */,
|
||||
34664CF61D49FEC1003D7096 /* centers_table.cpp in Sources */,
|
||||
3D12E3D72111B4BE0015A9A9 /* caching_rank_table_loader.cpp in Sources */,
|
||||
6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
|
||||
34583BC71C88552100F94664 /* cuisines.cpp in Sources */,
|
||||
675341121A3F540F00A0A8C3 /* feature_algo.cpp in Sources */,
|
||||
|
||||
@@ -50,8 +50,6 @@
|
||||
671ED38F20D403B300D4317E /* search_api_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED38A20D403B300D4317E /* search_api_tests.cpp */; };
|
||||
674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29EE1B26FD5F001A525C /* testingmain.cpp */; };
|
||||
674A2A2F1B26FF7B001A525C /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675345BB1A4054AD00A0A8C3 /* libmap.a */; };
|
||||
674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A2A351B27011A001A525C /* working_time_tests.cpp */; };
|
||||
674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */; };
|
||||
674C38621BFF3095000D603B /* user_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674C385F1BFF3095000D603B /* user_mark.cpp */; };
|
||||
675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345D91A4054E800A0A8C3 /* bookmark_manager.cpp */; };
|
||||
675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */; };
|
||||
@@ -202,8 +200,6 @@
|
||||
674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = "<group>"; };
|
||||
674A29DF1B26FD1C001A525C /* map_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = map_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
|
||||
674A2A351B27011A001A525C /* working_time_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = working_time_tests.cpp; sourceTree = "<group>"; };
|
||||
674A2A371B2715FB001A525C /* osm_opening_hours.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_opening_hours.hpp; sourceTree = "<group>"; };
|
||||
674C385F1BFF3095000D603B /* user_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark.cpp; sourceTree = "<group>"; };
|
||||
675345BB1A4054AD00A0A8C3 /* libmap.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmap.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
675345D91A4054E800A0A8C3 /* bookmark_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark_manager.cpp; sourceTree = "<group>"; };
|
||||
@@ -357,7 +353,6 @@
|
||||
671ED38A20D403B300D4317E /* search_api_tests.cpp */,
|
||||
674A29EE1B26FD5F001A525C /* testingmain.cpp */,
|
||||
BB421D6A1E8C0026005BFA4D /* transliteration_test.cpp */,
|
||||
674A2A351B27011A001A525C /* working_time_tests.cpp */,
|
||||
ED49D74B2CEF3CE3004AF27E /* elevation_info_tests.cpp */,
|
||||
ED85D1CF2D5F508700D8075D /* track_statistics_tests.cpp */,
|
||||
);
|
||||
@@ -432,7 +427,6 @@
|
||||
45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */,
|
||||
675346051A4054E800A0A8C3 /* mwm_url.cpp */,
|
||||
675346061A4054E800A0A8C3 /* mwm_url.hpp */,
|
||||
674A2A371B2715FB001A525C /* osm_opening_hours.hpp */,
|
||||
34583BCD1C88556800F94664 /* place_page_info.cpp */,
|
||||
34583BCE1C88556800F94664 /* place_page_info.hpp */,
|
||||
3DF528D5237DC82E000ED0D5 /* position_provider.hpp */,
|
||||
@@ -519,7 +513,6 @@
|
||||
6753469C1A4054E800A0A8C3 /* track.hpp in Headers */,
|
||||
675346651A4054E800A0A8C3 /* framework.hpp in Headers */,
|
||||
BBA014B120754997007402E4 /* user_mark_id_storage.hpp in Headers */,
|
||||
674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */,
|
||||
ED85D1CC2D5F4B5B00D8075D /* track_statistics.hpp in Headers */,
|
||||
3DEE1ADF21EE03B400054A91 /* power_manager.hpp in Headers */,
|
||||
F6D2CE7F1EDEB7F500636DFD /* routing_manager.hpp in Headers */,
|
||||
@@ -671,7 +664,6 @@
|
||||
FAA8387426BB3C0F002E54C6 /* countries_names_tests.cpp in Sources */,
|
||||
679624B01D1017DB00AE4E3C /* gps_track_storage_test.cpp in Sources */,
|
||||
674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */,
|
||||
674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */,
|
||||
679624B11D1017DB00AE4E3C /* gps_track_test.cpp in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
||||
Reference in New Issue
Block a user