From b9c3cdf3ac50ded561a7fa2f617a34579ae8123c Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 25 Sep 2015 17:10:52 +0200 Subject: [PATCH 01/13] Translated using Weblate (Argentinean Spanish) Currently translated at 99.9% (1312 of 1313 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 112 ++++++++++++++++----------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index ac2f734a0c..951b415135 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -892,15 +892,15 @@ Atracción turística Cortafuegos forestal - Red de nodos ciclista internacional - Red de nodos ciclista nacional - Red de nodos ciclista regional - Red de nodos ciclista local + Red de ruta ciclista internacional + Red de ruta ciclista nacional + Red de ruta ciclista regional + Red de ruta ciclista local - Red internacional de senderismo - Red nacional de senderismo - Red regional de senderismo - Red local de senderismo + Red de ruta internacional de senderismo + Red de ruta nacional de senderismo + Red de ruta regional de senderismo + Red de ruta local de senderismo Horario de atención Horario de recolección @@ -939,7 +939,7 @@ Sin acceso Acceso a destino Acceso permisivo - Acceso de clientes + Acceso a clientes Acceso agrícola Acceso para entregas @@ -951,7 +951,7 @@ Fax Facebook Celular - Refugio para perros + Refugio canino Refugio para gatos Refugio para perros y gatos Refugio para aves @@ -1044,7 +1044,7 @@ Laguna de molino Twitter Skype - Youtube + YouTube Instagram VKontakte Google+ @@ -1137,24 +1137,24 @@ Fecha de inicio Silla de rueda - Ensilado (contenido) - Agua (contenido) - Petróleo (contenido) - Combustible (contenido) - Estiércol (contenido) - Vino (contenido) - Agua residual (contenido) - Gas (contenido) - Biomasa (contenido) - Agua residual (contenido) - Cultivo (contenido) - Forraje (contenido) - Cerveza (contenido) - Sal (contenido) - Cereal (contenido) + Contenido: ensilaje + Contenido: agua + Contenido: petróleo + Contenido: combustible + Contenido: estiércol + Contenido: vino + Contenido: aguas negras + Contenido: gas + Contenido: biomasa + Contenido: aguas residuales + Contenido: cultivo + Contenido: forraje + Contenido: cerveza + Contenido: sal + Contenido: granos Silo bunker - Mezcla (contenido) + Contenido: mezcla Suelo abandonado urbanizable Suelo urbanizable Venta mayorista @@ -1273,48 +1273,48 @@ Terminal de información Marcador de ruta Mapa de senderismo - Información sobre la naturaleza - Información sobre la vida silvestre - Información histórica + Información: naturaleza + Información: vida salvaje + Información: historia Señal Audio-guía Mapa ciclista Modelo táctil Mapa táctil - Tablero con aviso - Información sobre plantas - Información geológica - Información sobre el transporte público - Información tecnológica - Información astronómica + Tablón con anuncio + Información: plantas + Información: geología + Información: transporte público + Información: tecnología + Información: astronomía Área de oficinas Chimenea Sin chimenea - Con refugio - Sin refugio + Cubierto + Sin cobertura No fumar - Permitido fumar en el exterior + Permitido fumar afuera Permitido fumar - Permitido fumar en habitación separada y sin separación efectiva - Permitido fumar en una sala aislada físicamente + Permitido fumar en habitación separada + Permitido fumar en habitación aislada Solo fumadores - Peaje sin tarifa - Peaje tarifado + Sin Peaje + Peaje Con pavimento táctil Sin pavimento táctil Sonoro Sin sonido - Sonoro sólo cuando se permite caminar + Sonoro cuando se permite caminar Área comercial Puente de piedras Tablero de información - Peaje tarifado para vehículos pesados + Peaje para camiones Marcador del camino Estación de rescate @@ -1345,7 +1345,7 @@ Área de ocio común Brezal Fruto caído - Dificultad del paso de montaña + Escala RTSA Bomba @@ -1381,7 +1381,7 @@ Lugares reservados para mujeres Sin lugar dedicado para mujeres Lugares reservados para mujeres - Lugares reservados para alumnos + Lugares reservados para estudiantes Lugares reservados para profesores Lugares reservados para padres Sin lugares reservados para padres @@ -1404,4 +1404,22 @@ Sólo acceso de salida en verano Acesso de entrada y salida en verano +Silla de ruedas: no permitido + Silla de ruedas: limitado + Estrellas: 1 (Turista) + Estrellas: 1S (Turista Superior) + Estrellas: 2 (Estándar) + Estrellas: 2S (Estándar Superior) + Estrellas: 3 (Confortable) + Estrellas: 3S (Confortable Superior) + Estrellas: 4 (Primera Clase) + Estrellas: 4S (Primera Clase Superior) + Estrellas: 5 (Lujurioso) + Estrellas: 5S (Lujurioso Superior) + Estrellas: 6 + Estrellas: 7 + Habitaciones + + Telo + From 75627bfeea73c9e1b4490753949a80c878686983 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 25 Sep 2015 17:31:57 +0200 Subject: [PATCH 02/13] Translated using Weblate (Danish) Currently translated at 100.0% (1313 of 1313 strings) --- OsmAnd/res/values-da/phrases.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index a849c714fd..99f9a95ab9 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1427,16 +1427,16 @@ Kørestol: ikke tilladt Kørestol: begrænset - Stjerner: 1 (turist) - Stjerner: 1S (super turist) + Stjerner: 1 (Turist) + Stjerner: 1S (Superior Turist) Stjerner: 2 (Standard) Stjerner: 2S (Superior Standard) - Stjerner: 3 (komfort) - Stjerner: 3S (super komfort) - Stjerner: 4 (Førsteklasses) - Stjerner: 4S (super førsteklasse) - Stjerner: 5 (luksus) - Stjerner: 5S (Superior luksus) + Stjerner: 3 (Komfort) + Stjerner: 3S (Superior Komfort) + Stjerner: 4 (Førsteklasse) + Stjerner: 4S (Superior Førsteklasse) + Stjerner: 5 (Luksus) + Stjerner: 5S (Superior Luksus) Stjerner: 6 Stjerner: 7 Værelser From 87e7837d2137693fde2bbf7ed1726de6bc2b6366 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 25 Sep 2015 17:20:12 +0200 Subject: [PATCH 03/13] Translated using Weblate (Spanish) Currently translated at 99.9% (1312 of 1313 strings) --- OsmAnd/res/values-es/phrases.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 77123c71c9..e8dec1161a 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1409,6 +1409,21 @@ Silla de ruedas: no permitido Silla de ruedas: limitado - 1 estrella (Turista) + Estrellas: 1 (Turista) Estrellas: 1S (Turista Superior) - + Estrellas: 2 (Estándar) + Estrellas: 2S (Estándar Superior) + Estrellas: 3 (Confortable) + Estrellas: 3S (Confortable Superior) + Estrellas: 4 (Primera Clase) + Estrellas: 4S (Primera Clase Superior) + Estrellas: 5 (Lujurioso) + Estrellas: 5S (Lujurioso Superior) + Estrellas: 6 + Estrellas: 7 + Habitaciones + + Jardín rosaleda + Albergue transitorio + + From 38830460c24a214502698f0ba0c63d7e3c0b6082 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 18:09:09 +0200 Subject: [PATCH 04/13] test hdop-dependent turnaround detection threshold for GPX up/down analysis --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index 6bf748db93..dc3ebcf0ad 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -226,7 +226,8 @@ public class GPXUtilities { double totalSpeedSum = 0; points = 0; - double channelThres = 10; + double channelThresMin = 5; // Minimum oscillation amplitude considered as noise for Up/Down analysis + double channelThres = channelThresMin; // Actual oscillation amplitude considered as noise, try depedency on current hdop double channelBase; double channelTop; double channelBottom; @@ -277,12 +278,19 @@ public class GPXUtilities { channelBase = point.ele; channelTop = channelBase; channelBottom = channelBase; + channelThres = channelThresMin; } // Channel maintenance if (point.ele > channelTop) { channelTop = point.ele; + if (!Double.isNaN(point.hdop)) { + channelThres = Math.max(channelThres, point.hdop); + } } else if (point.ele < channelBottom) { channelBottom = point.ele; + if (!Double.isNaN(point.hdop)) { + channelThres = Math.max(channelThres, point.hdop); + } } // Turnaround (breakout) detection if ((point.ele <= (channelTop - channelThres)) && (climb == true)) { @@ -292,6 +300,7 @@ public class GPXUtilities { channelBase = channelTop; channelBottom = point.ele; climb = false; + channelThres = channelThresMin; } else if ((point.ele >= (channelBottom + channelThres)) && (climb == false)) { if ((channelBase - channelBottom) >= channelThres) { diffElevationDown += channelBase - channelBottom; @@ -299,6 +308,7 @@ public class GPXUtilities { channelBase = channelBottom; channelTop = point.ele; climb = true; + channelThres = channelThresMin; } // End detection without breakout if (j == (numberOfPoints -1)) { From 9fbb3fda4b9562c6e2884b22a6550955df462aef Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 18:18:22 +0200 Subject: [PATCH 05/13] fix ru_phrases.xml --- OsmAnd/res/values-ru/phrases.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index f453344a68..5b459e026b 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -1,4 +1,4 @@ - + Булочная Винно-водочный магазин @@ -1251,8 +1251,8 @@ Число звёзд: 4S (улучшенный первый класс) Число звёзд: 5 (категория люкс) Число звёзд: 5S (категория люкс+) - Число звёзд: 6 - Число звёзд: 7 + Число звёзд: 6 + Число звёзд: 7 Количество номеров Love-отель From 1ae8b904d604eb8f3c20460722e575839f76b036 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 18:41:57 +0200 Subject: [PATCH 06/13] one more init value --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index dc3ebcf0ad..156fbd3b6b 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -239,6 +239,7 @@ public class GPXUtilities { channelBase = 99999; channelTop = channelBase; channelBottom = channelBase; + channelThres = channelThresMin; metricEnd += s.metricEnd; points += numberOfPoints; From c53a4241bba650ce0944eedc059fab319959d40f Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 19:11:35 +0200 Subject: [PATCH 07/13] add comment for later reference --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index 156fbd3b6b..86098d21ff 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -273,6 +273,7 @@ public class GPXUtilities { } // Trend channel approach for elevation gain/loss, Hardy 2015-09-22 + // Self-adjusting turnarund threshold added for testing 2015-09-25: Current rule is now: "All up/down trends of amplitude Date: Fri, 25 Sep 2015 20:44:47 +0300 Subject: [PATCH 08/13] Downdload map design in progress. --- .../layout/expandable_list_item_category.xml | 40 +++--- OsmAnd/res/values-bg/strings.xml | 2 +- OsmAnd/res/values-ca/strings.xml | 2 +- OsmAnd/res/values-cs/strings.xml | 2 +- OsmAnd/res/values-da/strings.xml | 2 +- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values-es-rAR/strings.xml | 2 +- OsmAnd/res/values-es/strings.xml | 2 +- OsmAnd/res/values-fi/strings.xml | 2 +- OsmAnd/res/values-fr/strings.xml | 2 +- OsmAnd/res/values-hu/strings.xml | 2 +- OsmAnd/res/values-it/strings.xml | 2 +- OsmAnd/res/values-ja/strings.xml | 2 +- OsmAnd/res/values-kn/strings.xml | 2 +- OsmAnd/res/values-ko/strings.xml | 2 +- OsmAnd/res/values-lt/strings.xml | 2 +- OsmAnd/res/values-lv/strings.xml | 2 +- OsmAnd/res/values-mr/strings.xml | 2 +- OsmAnd/res/values-pl/strings.xml | 2 +- OsmAnd/res/values-pt-rBR/strings.xml | 2 +- OsmAnd/res/values-ru/strings.xml | 2 +- OsmAnd/res/values-sk/strings.xml | 2 +- OsmAnd/res/values-sl/strings.xml | 2 +- OsmAnd/res/values-sv/strings.xml | 2 +- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 3 +- .../plus/download/DownloadActivityType.java | 24 ++-- .../plus/download/DownloadIndexesThread.java | 87 +++++++---- .../net/osmand/plus/download/IndexItem.java | 21 ++- .../plus/download/UpdatesIndexFragment.java | 29 ++-- .../newimplementation/CategoryStaticData.java | 132 +++++++++++++++++ .../IndexItemCategoryWithSubcat.java | 135 +++++++----------- .../MapsInCategoryFragment.java | 1 + .../NewLocalIndexesFragment.java | 2 +- .../SubcategoriesFragment.java | 30 +++- 35 files changed, 364 insertions(+), 188 deletions(-) create mode 100644 OsmAnd/src/net/osmand/plus/download/newimplementation/CategoryStaticData.java diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml index 2d6a7fdf69..2abf56e843 100644 --- a/OsmAnd/res/layout/expandable_list_item_category.xml +++ b/OsmAnd/res/layout/expandable_list_item_category.xml @@ -1,11 +1,11 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/list_header_height" + android:orientation="horizontal" + android:paddingLeft="@dimen/list_header_padding"> + android:visibility="gone" + tools:visiblity="visible"/> - + tools:text="@string/lorem_ipsum"/> + - + android:id="@+id/options" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center_vertical" + android:background="?attr/dashboard_button" + android:focusable="false" + android:src="@drawable/ic_overflow_menu_white" + android:visibility="gone" + tools:visiblity="visible"/> + \ No newline at end of file diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index 716b30a919..0dded3f643 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -2048,7 +2048,7 @@ OsmAnd е с отворен код и активно да се развива. Маркер за сесия: %1$s Чака за разрешение… Изберете размер на снимката за вградената камера - Уикипедия + Уикипедия Уикипедия Покажи подробни данни Услугата за местоположение не е разрешена. Искате ли да я включите? diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 2bdbc0a26b..188fb55c0f 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2008,7 +2008,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Acoloreix segons l\'OSMC Suprimeix l\'edició d\'OSM Llegiu l\'article complet (en línia) - Viquipèdia + Viquipèdia Viquipèdia Mostra els detalls Viquipèdia diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 8de1749b51..af3bd0b5ea 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1953,7 +1953,7 @@ s často kladenými otázkami. Odhlásit Importovat do OsmAnd Přečíst celý článek (online) - Wikipedie + Wikipedie Wikipedie Zobrazit detaily Smazat OSM změnu diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index e2f742c82c..d31d69d574 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2016,7 +2016,7 @@ Farvelægning ifølge OSMC Slet OSM redigering Læs hele artiklen (online) - Wikipedia + Wikipedia Wikipedia Vis detaljer Wikipedia diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 300cb82a18..fc07a9138f 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2169,7 +2169,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Überfahren von Grenzen vermeiden Höhenbeschränkung Vollständigen Artikel lesen (online) - Wikipedia + Wikipedia Wikipedia Details anzeigen Überqueren einer Staatsgrenze vermeiden diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 91d7c55711..2c0769973d 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -1939,7 +1939,7 @@ Colorear según OSMC Quitar edición OSM Leer artículo completo (en línea) - Wikipedia + Wikipedia Wikipedia Ver detalles Wikipedia diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 140b148607..ee9ff395d7 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -2078,7 +2078,7 @@ Borrar edición de OSM Importar a OsmAnd Leer el artículo completo (en línea) - Wikipedia + Wikipedia Wikipedia Mostrar detalles Va a borrar %1$d notas. ¿Está seguro? diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index dab37db6de..56e732d705 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -890,6 +890,6 @@ Sijaintipalvelu poistettu käytöstä. Haluatko ottaa sen käyttöön? Tuo OsmAndiin Lue koko artikkeli (online) - Wikipedia + Wikipedia Näytä tiedot diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 242710203e..844f5b896d 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2041,7 +2041,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Supprimer la modification OSM Afficher les détails Lire l\'article complet (en ligne) - Wikipédia + Wikipédia Wikipédia Wikipedia Importer dans OsmAnd diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index a067308893..c598ad3e44 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1960,7 +1960,7 @@ OSM szerkesztés törlése Részletek megjelenítése Teljes cikk elolvasása (interneten) - Wikipédia + Wikipédia Wikipédia Wikipédia Importálás az OsmAnd programba diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 1abfb4d82e..ace23edc42 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2067,7 +2067,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android.) Importa in OsmAnd Leggi l\'articolo intero (online) - Wikipedia + Wikipedia Wikipedia Mostra i dettagli Stai per cancellare %1$d nota/e. Sei sicuro? diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 99d0ac8705..058a93e04e 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -2095,7 +2095,7 @@ POIの更新は利用できません デフォルト (半透明シアン) OsmAndにインポート 記事全文を読む (オンライン) - Wikipedia + Wikipedia Wikipedia パーソナルトラッカーIDを表示 %1$d個のメモを削除します。よろしいですか？ diff --git a/OsmAnd/res/values-kn/strings.xml b/OsmAnd/res/values-kn/strings.xml index 9d706d53b4..0c1fd31450 100644 --- a/OsmAnd/res/values-kn/strings.xml +++ b/OsmAnd/res/values-kn/strings.xml @@ -7,7 +7,7 @@ ಮಲೇಷ್ಯಾ ನೀವು ಅಧಿಕ ವಿಕಿಪೀಡಿಯ ದತ್ತಾಂಶವನ್ನು (%1$s MB) ಡೌನ್ ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ? ಪೂರ್ಣ ಲೇಖನ ಓದಿ(ಮಿಂಬಲೆಯೊಳಗೆ) - ವಿಕಿಪೀಡಿಯ + ವಿಕಿಪೀಡಿಯ ವಿಕಿಪೀಡಿಯ ವಿವರಣೆ ತೋರಿಸಿ ಒಎಸ್ಎಂ ಸಂಪಾದನೆಯನ್ನು ಅಳಿಸು diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 6bb1deab0e..12cad25f38 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2261,7 +2261,7 @@ 앱이 죽을 때 GPX 로깅은 일시 중지 합니다. (OsmAnd 절전 모드 표시는 안드로이드 알림 표시줄에서 사라집니다.) OsmAnd로 가져오기 전체 기사 읽기 (온라인) - 위키백과 + 위키백과 위키백과 세부 정보 보기 OSM 편집을 삭제 diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index cc846b5bf5..c02b534ee8 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -2033,7 +2033,7 @@ Neįjungta vietos nustatymo paslauga. Įjungti? Importavimas į OsmAnd Skaityti visą straipsnį (internete) - Vikipedija + Vikipedija Vikipedija Rodyti detales Ištrinti OSM taisymus diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 0bcaa4d80e..20fcaf7bcf 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -2071,7 +2071,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A GPX loggings tiks nopauzēts, ja aplikāciju nobeidzēs (caur nesenajiem appiem). (OsmAnd fona servisa indikācija pazudīs no Android piezīmju joslas) Importēt OsmAndā Lasīt visu rakstu (onlainā) - Vikipēdija + Vikipēdija Vikipēdija Rādīt detaļas Dzēst OSM labojumu diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml index f43bf6d933..4f33a941ec 100644 --- a/OsmAnd/res/values-mr/strings.xml +++ b/OsmAnd/res/values-mr/strings.xml @@ -504,7 +504,7 @@ थाइ तेलगु पूर्ण लेख वाचा (ऑनलाइन) - विकिपेडिया + विकिपेडिया विकिपेडिया नकाशे डाउनलोड करा सद्ध्याचा मार्ग diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index ed17bdef0a..3d87c512a1 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -2135,7 +2135,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Po zakończeniu pracy aplikacji wstrzymuje rejestrowanie trasy. (Ikona pracy w tle znika z paska powiadomień) Import do OsmAnd Czytaj cały artykuł (online) - Wikipedia + Wikipedia Wikipedia Pokaż szczegóły Usunąć %1$d notatek? diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 78df7e16ed..8728b311b9 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -1709,7 +1709,7 @@ Apagar Edição do OSM Mostrar detalhes Leia o artigo completo (on-line) - Wikipédia + Wikipédia Wikipédia Wikipédia Importar para OsmAnd diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index df4a6570f7..a413645861 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1986,7 +1986,7 @@ Поделиться моим местоположением Выход Европа - Нидерланды - Википедия + Википедия Википедия Показать детали Википедия diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index c981199046..e967b120f0 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2172,7 +2172,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Zafarbenie podľa OSMC Odstrániť OSM zmenu Prečítať celý článok (online) - Wikipedia + Wikipedia Wikipedia Zobraziť detaily Wikipedia diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 328f471688..8b7d5c2bc4 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1867,7 +1867,7 @@ Barvanje poti po OSMC Izbriši urejanje OSM Pokaži celoten prispevek - Wikipedija + Wikipedija Wikipedija Pokaži podrobnosti Wikipedija diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 5f209eee63..1a0f99d70f 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1884,7 +1884,7 @@ Ta bort OSM-redigering Färgläggning efter OSMC Läs hela artikeln (online) - Wikipedia + Wikipedia Wikipedia Visa detaljer Du håller på att ta bort %1$d anteckningar. Är du säker? diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 6ac9c7200c..428fba28f2 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1996,7 +1996,7 @@ 依據 OSMC 來著色 刪除 OSM 的編輯 閱讀全部文章 (線上) - 維基百科 + 維基百科 維基百科 顯示詳細資訊 維基百科 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 42d3cb4435..c462188367 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -81,7 +81,7 @@ Will pause GPX logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.) Import to OsmAnd Read full article (online) - Wikipedia + Wikipedia Wikipedia Show details Delete OSM Edit @@ -2271,4 +2271,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Are you sure? Any unsaved changes will be lost. Continue? %1$s downloads left + Roads diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java index 48a37946ba..f066c81f62 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java @@ -1,15 +1,6 @@ package net.osmand.plus.download; -import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT; - -import java.io.File; -import java.io.IOException; -import java.net.URLEncoder; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import android.content.Context; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; @@ -22,7 +13,16 @@ import net.osmand.util.Algorithms; import org.xmlpull.v1.XmlPullParser; -import android.content.Context; +import java.io.File; +import java.io.IOException; +import java.net.URLEncoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT; public class DownloadActivityType { private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy"); @@ -222,7 +222,7 @@ public class DownloadActivityType { if (this == DownloadActivityType.SRTM_COUNTRY_FILE) { return ctx.getString(R.string.download_srtm_maps); } else if (this == DownloadActivityType.WIKIPEDIA_FILE) { - return ctx.getString(R.string.download_wikipedia_item); + return ctx.getString(R.string.shared_string_wikipedia); } else if (this == DownloadActivityType.ROADS_FILE) { return ctx.getString(R.string.download_roads_only_item); } diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java index 12e910c117..bf24764d7d 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java @@ -398,10 +398,6 @@ public class DownloadIndexesThread { } public void runReloadIndexFiles() { - runReloadIndexFiles(false); - } - - public void runReloadIndexFiles(final boolean withSubcats) { checkRunning(); final BasicProgressAsyncTask inst = new BasicProgressAsyncTask(ctx) { @@ -447,7 +443,8 @@ public class DownloadIndexesThread { currentRunningTask.remove(this); if (uiActivity != null) { uiActivity.updateProgress(false); - runCategorization(uiActivity.getDownloadType(), withSubcats); + runCategorization(uiActivity.getDownloadType()); + runCategorization(); // for new implementation } } @@ -481,12 +478,8 @@ public class DownloadIndexesThread { } } - - ; - }; execute(inst); - } public void runDownloadFiles() { @@ -510,14 +503,9 @@ public class DownloadIndexesThread { } public void runCategorization(final DownloadActivityType type) { - runCategorization(type, false); - } - - public void runCategorization(final DownloadActivityType type, final boolean withSubcats) { final BasicProgressAsyncTask> inst = new BasicProgressAsyncTask>(ctx) { private List cats; - private List catsWithSubcats; @Override protected void onPreExecute() { @@ -532,12 +520,7 @@ public class DownloadIndexesThread { @Override protected List doInBackground(Void... params) { final List filtered = getFilteredByType(); - if (withSubcats) { - catsWithSubcats = - IndexItemCategoryWithSubcat.categorizeIndexItems(app, filtered); - } else { - cats = IndexItemCategory.categorizeIndexItems(app, filtered); - } + cats = IndexItemCategory.categorizeIndexItems(app, filtered); updateLoadedFiles(); return filtered; } @@ -563,11 +546,7 @@ public class DownloadIndexesThread { prepareFilesToUpdate(); currentRunningTask.remove(this); if (uiActivity != null) { - if (withSubcats) { - uiActivity.onCategorizationFinished(filtered, catsWithSubcats); - } else { - uiActivity.categorizationFinished(filtered, cats); - } + uiActivity.categorizationFinished(filtered, cats); uiActivity.updateProgress(false); } } @@ -584,6 +563,62 @@ public class DownloadIndexesThread { execute(inst); } + public void runCategorization() { + final BasicProgressAsyncTask> inst + = new BasicProgressAsyncTask>(ctx) { + private List catsWithSubcats; + + @Override + protected void onPreExecute() { + super.onPreExecute(); + currentRunningTask.add(this); + this.message = ctx.getString(R.string.downloading_list_indexes); + if (uiActivity != null) { + uiActivity.updateProgress(false); + } + } + + @Override + protected List doInBackground(Void... params) { + final List filtered = getFilteredByType(); + catsWithSubcats = + IndexItemCategoryWithSubcat.categorizeIndexItems(app, filtered); + updateLoadedFiles(); + return filtered; + } + + public List getFilteredByType() { + final List filtered = new ArrayList(); + List cachedIndexFiles = getCachedIndexFiles(); + if (cachedIndexFiles != null) { + for (IndexItem file : cachedIndexFiles) { + filtered.add(file); + } + } + return filtered; + } + + @Override + protected void onPostExecute(List filtered) { + prepareFilesToUpdate(); + currentRunningTask.remove(this); + if (uiActivity != null) { + uiActivity.onCategorizationFinished(filtered, catsWithSubcats); + uiActivity.updateProgress(false); + } + } + + @Override + protected void updateProgress(boolean updateOnlyProgress) { + if (uiActivity != null) { + uiActivity.updateProgress(updateOnlyProgress); + } + + } + }; + execute(inst); + } + private void prepareFilesToUpdate() { List filtered = getCachedIndexFiles(); if (filtered != null) { @@ -734,6 +769,4 @@ public class DownloadIndexesThread { } return i; } - - } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/download/IndexItem.java b/OsmAnd/src/net/osmand/plus/download/IndexItem.java index ef2acfb2ed..f46e2d6f1d 100644 --- a/OsmAnd/src/net/osmand/plus/download/IndexItem.java +++ b/OsmAnd/src/net/osmand/plus/download/IndexItem.java @@ -30,6 +30,7 @@ public class IndexItem implements Comparable, HasName { DownloadActivityType type; boolean extra; + private String initializedName; public IndexItem(String fileName, String description, long timestamp, String size, long contentSize, long containerSize, DownloadActivityType tp) { @@ -145,6 +146,24 @@ public class IndexItem implements Comparable, HasName { @Override public String getName() { - return getBasename(); + return initializedName; + } + + public void setName(String initializedName) { + this.initializedName = initializedName; + } + + @Override + public String toString() { + return "IndexItem{" + + "description='" + description + '\'' + + ", fileName='" + fileName + '\'' + + ", size='" + size + '\'' + + ", timestamp=" + timestamp + + ", contentSize=" + contentSize + + ", containerSize=" + containerSize + + ", type=" + type.getTag() + + ", extra=" + extra + + '}'; } } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java index 01105fe593..ed80abada6 100644 --- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java @@ -1,18 +1,5 @@ package net.osmand.plus.download; -import java.text.MessageFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import net.osmand.access.AccessibleToast; -import net.osmand.map.OsmandRegions; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.plus.activities.OsmAndListFragment; import android.app.Activity; import android.content.Context; import android.os.Bundle; @@ -30,6 +17,20 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import net.osmand.access.AccessibleToast; +import net.osmand.map.OsmandRegions; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; +import net.osmand.plus.activities.OsmAndListFragment; + +import java.text.MessageFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** * Created by Denis * on 09.09.2014. @@ -340,7 +341,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment { if (resId == R.string.download_regular_maps){ return activity.getString(R.string.shared_string_map); } else if (resId == R.string.download_wikipedia_maps){ - return activity.getString(R.string.download_wikipedia_item); + return activity.getString(R.string.shared_string_wikipedia); } else if (resId == R.string.voices) { return item.getTargetFileName().contains("tts") ? activity.getString(R.string.ttsvoice) : activity .getString(R.string.voice); diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/CategoryStaticData.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/CategoryStaticData.java new file mode 100644 index 0000000000..07b39ccebb --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/CategoryStaticData.java @@ -0,0 +1,132 @@ +package net.osmand.plus.download.newimplementation; + +import android.os.Parcel; +import android.os.Parcelable; + +import net.osmand.plus.R; + +public class CategoryStaticData implements Parcelable { + public static final CategoryStaticData WORLD_WIDE_AND_TOPIC = + new CategoryStaticData(R.string.index_name_other, 0); + public static final CategoryStaticData NAME_VOICE = + new CategoryStaticData(R.string.index_name_voice, 1); + public static final CategoryStaticData TTS_VOICE = + new CategoryStaticData(R.string.index_name_tts_voice, 2); + public static final CategoryStaticData WIKI = + new CategoryStaticData(R.string.index_name_wiki, 10); + public static final CategoryStaticData OPENMAPS = + new CategoryStaticData(R.string.index_name_openmaps, 90); + public static final CategoryStaticData NORTH_AMERICA = + new CategoryStaticData(R.string.index_name_north_america, 30); + public static final CategoryStaticData US = + new CategoryStaticData(R.string.index_name_us, 31, NORTH_AMERICA); + public static final CategoryStaticData CANADA = + new CategoryStaticData(R.string.index_name_canada, 32, NORTH_AMERICA); + public static final CategoryStaticData CENTRAL_AMERICA = + new CategoryStaticData(R.string.index_name_central_america, 40); + public static final CategoryStaticData SOUTH_AMERICA = + new CategoryStaticData(R.string.index_name_south_america, 45); + public static final CategoryStaticData RUSSIA = + new CategoryStaticData(R.string.index_name_russia, 25); + public static final CategoryStaticData EUROPE = + new CategoryStaticData(R.string.index_name_europe, 15); + public static final CategoryStaticData GERMANY = + new CategoryStaticData(R.string.index_name_germany, 16, EUROPE); + public static final CategoryStaticData FRANCE = + new CategoryStaticData(R.string.index_name_france, 17, EUROPE); + public static final CategoryStaticData ITALY = + new CategoryStaticData(R.string.index_name_italy, 18, EUROPE); + public static final CategoryStaticData GB = + new CategoryStaticData(R.string.index_name_gb, 19, EUROPE); + public static final CategoryStaticData NETHERLANDS = + new CategoryStaticData(R.string.index_name_netherlands, 20, EUROPE); + public static final CategoryStaticData AFRICA = + new CategoryStaticData(R.string.index_name_africa, 80); + public static final CategoryStaticData ASIA = + new CategoryStaticData(R.string.index_name_asia, 50); + public static final CategoryStaticData OCEANIA = + new CategoryStaticData(R.string.index_name_oceania, 70); + public static final CategoryStaticData TOURS = + new CategoryStaticData(R.string.index_tours, 0); + + private final int nameId; + private final int order; + private final CategoryStaticData parent; + private String name; + + CategoryStaticData(int nameId, int order) { + this.nameId = nameId; + this.order = order; + parent = null; + } + + CategoryStaticData(int nameId, int order, CategoryStaticData parent) { + this.nameId = nameId; + this.order = order; + this.parent = parent; + } + + public int getNameId() { + return nameId; + } + + public int getOrder() { + return order; + } + + public CategoryStaticData getParent() { + return parent; + } + + public boolean hasParent() { + return parent != null; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "CategoryStaticData{" + + "nameId=" + nameId + + ", order=" + order + + ", parent=" + parent + + ", name='" + name + '\'' + + '}'; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(this.nameId); + dest.writeInt(this.order); + dest.writeParcelable(this.parent, flags); + dest.writeString(this.name); + } + + protected CategoryStaticData(Parcel in) { + this.nameId = in.readInt(); + this.order = in.readInt(); + this.parent = in.readParcelable(CategoryStaticData.class.getClassLoader()); + this.name = in.readString(); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public CategoryStaticData createFromParcel(Parcel source) { + return new CategoryStaticData(source); + } + + public CategoryStaticData[] newArray(int size) { + return new CategoryStaticData[size]; + } + }; +} diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java index 9b0f300693..22e5f6b3f6 100644 --- a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java +++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java @@ -6,13 +6,17 @@ import android.support.annotation.NonNull; import net.osmand.Collator; import net.osmand.OsmAndCollator; +import net.osmand.PlatformUtil; import net.osmand.map.OsmandRegions; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.Version; +import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.IndexItem; import net.osmand.plus.helpers.HasName; +import org.apache.commons.logging.Log; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -20,19 +24,22 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.TreeSet; public class IndexItemCategoryWithSubcat implements Comparable, - Parcelable, HasName { -// private static final Log LOG = PlatformUtil.getLog(IndexItemCategoryWithSubcat.class); + HasName, Parcelable { + private static final Log LOG = PlatformUtil.getLog(IndexItemCategoryWithSubcat.class); public final List items; public final List subcats; public final CategoryStaticData categoryStaticData; + public final TreeSet types; public IndexItemCategoryWithSubcat(CategoryStaticData categoryStaticData) { this.categoryStaticData = categoryStaticData; items = new ArrayList<>(); subcats = new ArrayList<>(); + types = new TreeSet<>(); } @Override @@ -109,9 +116,10 @@ public class IndexItemCategoryWithSubcat implements Comparable parent, View view, int position, long id) { - final HasName item = mAdapter.getItem(position); + final HasName item = mAdapter.getItem(position - 1); if (item instanceof IndexItemCategoryWithSubcat) { ((MapsInCategoryFragment) getParentFragment()) .onCategorySelected((IndexItemCategoryWithSubcat) item); @@ -105,9 +106,30 @@ public class SubcategoriesFragment extends Fragment { } else { viewHolder = (ViewHolder) convertView.getTag(); } - viewHolder.nameTextView.setText(getItem(position).getName()); - // TODO replace with real values - viewHolder.descrTextView.setText("Map, Roads, Contour lines, Wikipedia"); + HasName item = getItem(position); + if (item instanceof IndexItemCategoryWithSubcat) { + IndexItemCategoryWithSubcat category = (IndexItemCategoryWithSubcat) item; + viewHolder.nameTextView.setText(category.getName()); + if (category.types.size() > 0) { + StringBuilder stringBuilder = new StringBuilder(); + Resources resources = getContext().getResources(); + for (Integer mapType : category.types) { + stringBuilder.append(resources.getString(mapType)); + stringBuilder.append(", "); + } + LOG.debug("stringBuilder=" + stringBuilder); + stringBuilder.delete(stringBuilder.capacity() - 3, stringBuilder.capacity()); + viewHolder.descrTextView.setText(stringBuilder.toString()); + } else { + // TODO replace with string constant + viewHolder.descrTextView.setText("Others"); + } + LOG.debug("category.types=" + category.types); + } else { + viewHolder.nameTextView.setText(item.getName()); + // TODO replace with real values + viewHolder.descrTextView.setText("Temp values"); + } viewHolder.leftImageView.setImageDrawable(iconsCache.getContentIcon(R.drawable.ic_map)); return convertView; } From ff5f6fa28efb4e63af453df4989d6412c7356417 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 20:20:35 +0200 Subject: [PATCH 09/13] test 2*hdop --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index 86098d21ff..f2dcc49760 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -273,7 +273,7 @@ public class GPXUtilities { } // Trend channel approach for elevation gain/loss, Hardy 2015-09-22 - // Self-adjusting turnarund threshold added for testing 2015-09-25: Current rule is now: "All up/down trends of amplitude channelTop) { channelTop = point.ele; if (!Double.isNaN(point.hdop)) { - channelThres = Math.max(channelThres, point.hdop); + channelThres = Math.max(channelThres, 2.0*point.hdop); //Try empirical 2*hdop, may better serve very flat tracks, or high dop tracks } } else if (point.ele < channelBottom) { channelBottom = point.ele; if (!Double.isNaN(point.hdop)) { - channelThres = Math.max(channelThres, point.hdop); + channelThres = Math.max(channelThres, 2.0*point.hdop); } } // Turnaround (breakout) detection From 9b9e486253da46641f2228e489d88eae57ecf579 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 25 Sep 2015 20:52:02 +0200 Subject: [PATCH 10/13] Translated using Weblate (Belarusian) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-be/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index a2b8400d2b..a0e5038b3c 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2099,4 +2099,6 @@ Спыніць эмуляцыю свайго становішча Эмуляваць, выкарыстоўваючы запісаны GPX або разьлічаны маршрут %1$s сьцягваньняў засталося +Вікіпэдыя + Дарогі From bc3a551e621ea452159ac6af2b58594c218eda29 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Fri, 25 Sep 2015 20:53:23 +0200 Subject: [PATCH 11/13] Translated using Weblate (French) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-fr/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 844f5b896d..ddbf4a0ebd 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2155,4 +2155,10 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Éviter les trains-navettes Fichier GPS avec notes aménité - + Arrêter de simuler votre position + Simuler la position à partir d\'un fichier GPX ou d\'une route + Etes-vous certain ? + Les modifications non enregistrées seront perdues. Souhaitez-vous poursuivre ? + %1$s téléchargement(s) restant(s) + Routes + From 9440edd1583ff83068b4bcd33fa52b2302b62d15 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 25 Sep 2015 21:00:04 +0200 Subject: [PATCH 12/13] Translated using Weblate (Danish) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-da/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index d31d69d574..4c059c0de3 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2137,4 +2137,5 @@ Stop simulering af position Simuler ved brug af optaget GPX eller beregnet rute %1$s filhentninger tilbage +Veje From 4d3200b6f31db945b21a7f01fe07a203850b87d9 Mon Sep 17 00:00:00 2001 From: Matej U Date: Fri, 25 Sep 2015 22:26:28 +0200 Subject: [PATCH 13/13] Translated using Weblate (Slovenian) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-sl/strings.xml | 45 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 8b7d5c2bc4..af8234c47d 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -79,7 +79,7 @@ elektronski naslov "Spremembe v 0.8.4: \n\t* Odpravljene so nekatere napake delovanja\n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja -\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti " +\n\t* Med navigacijo omogoči delovanje storitev v ozadju " "Spremembe v 0.8.3: \n\t* Vmesne točke \n\t* Izboljšano vodenje po poti\n\t* Možnost izogibanja avtocestam pri pripravi poti\n\t* Dodana nova vrsta kolesarske poti na zemljevid (Cycleway) @@ -347,8 +347,8 @@ Smer gledanja Prosojni bočni pult Prosojna tema - Omogoči\n način spanja - Ustavi\n način spanja + Omogoči\n ozadnji način delovanja + Zaustavi\n ozadnji način delovanja Interval prebujanja GPS: na %s neprekinjeno delovanje Za odklepanje zaslona pritisnite ikono ključavnice @@ -408,7 +408,7 @@ \n\t* Izboljšano usmerjanje: hitrejše in natančnejše; do 250 km \n\t* Možnost prikaza le cest \n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja -\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti " +\n\t* Med navigacijo omogoči delovanje storitev v ozadju " Zapri paket sprememb Program ZXing Barcode Scanner ni nameščen. Ali želite program poiskati? Izberite barvno shemo cest: @@ -444,7 +444,7 @@ Vstavek omogoča prikaz nastavitev za razvoj in razhroščevanje programa. Med možnostmi so simuliranje vodenja poti, hitrost izrisovanja zemljevida na zaslonu, glasovni opomniki in podobno. Nastavitve so namenjene razvijalcem programske opreme. Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri uporabi programa OsmAnd. Podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovno objavljanje mesta. - Prikaži nastavitve za sledenje in navigacijo v načinu pripravljenosti (izklopljen zaslon) in občasno uporabo GPS. + Prikaži nastavitve za sledenje in navigacijo v ozadnjem načinu (izklopljen zaslon) in občasno uporabo GPS. Zapri Delovni čas Za objavljanje trenutnega mesta uporabi: @@ -684,8 +684,8 @@ Privzeti profil Splošne nastavitve Upravljalnik datotek zemljevidov - Način pripravljenosti - Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen + Način delovanja v ozadju + Osmand se zažene v ozadju, ko je zaslon izklopljen Dnevni/Nočni način Glede na sončni vzhod in zahod @@ -886,7 +886,7 @@ Izberite ponudnika določevanja mesta med izvajanjem v ozadju Ponudnik mesta Izvaja OsmAnd v ozadju in omogoča spremljanje položaja, ko je zaslon izklopljen - Izvajaj v ozadju + Zaženi OsmAnd v ozadju Storitev navigacije v ozadju zahteva, da je zagnan vsaj en program, ki zahteva te podatke. Filter @@ -1215,9 +1215,9 @@ Ali naj se med fotografiranjem predvaja zvok - Najavi omejitve hitrosti - Najavi hitrostne kamere - Najavi prometna opozorila + Omejitve hitrosti + Hitrostne kamere + Pometna opozorila "Spremembe v 1.5: \n\t* Glasovna opozorila o omejitvah hitrosti in kamere\n\t* Več možnosti glasovnih pozivov (najavljanje imen ulic)\n\t* Ikone za mape visoke gostote\n\t* Veliko sprememb v uporabniškem vmesniku\n\t* Popravek hroščev pri prikazu razdalj, analizatorju GPX, upravljanju točk, orodju za načrtovanje, nalaganje na OSM, pri uporabi protokola HTTPS in drugo " V nastavitvah je treba določiti uporabniško ime in geslo za OSM @@ -1233,10 +1233,10 @@ Geslo OSM (neobvezno) - Najavljanje vmesnih točk GPX + Vmesne točke GPX Najavi … Nastavitve za najavljanje imen ulic, prometnih opozoril (ležeče ovire in podobno), opozoril merilnikov hitrosti, omejitve hitrosti in drugo - Najavi imena ulic (TTS) + Imena ulic (TTS) Podatki razhroščevanja FPS Izbira določil vožnje: ZDA, Evropa, Velika Britanija, Azija in druga Režim vožnje @@ -1541,9 +1541,9 @@ Prejetih datotek ni mogoče najti. Preverite internetno povezavo. Obdrži Prekini - Način delovanja sprejemnika GPS + Omogoči način delovanja GPS v ozadju Interval prebujanja GPS - Nastavitve delovanja sprejemnika GPS + Ali želite prekiniti ozadnji način GPS? Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene angleške ali krajevne oznake) Jezik oznak na zemljevidu Krajevna imena @@ -1610,7 +1610,7 @@ Pešačenje Prometna opozorila - Najavi bližnje priljubljene točke + Bližnje priljubljene točke ur Trajanje Razdalja @@ -1624,7 +1624,7 @@ Dnevnik potovanj Izleti Vmesne točke - Najavi bližnje točke POI + Bližnje točke POI Poišči na zemljevidu Izriši poti po lestvici SAC Ustavi navigacijo @@ -1718,7 +1718,7 @@ Uporabi varno povezavo s strežnikom Ni najdenih možnosti obvoza Glasovna navodila - Najavi prehode za pešce + Prehodi za pešce Območje Koordinata v smeri proti severu Koordinata v smeri proti vzhodu @@ -1981,4 +1981,13 @@ Uspešno shranjeno ob: %1$s Točka POI bo izbrisana po pošiljanju sprememb Pokaži GPX +Zaustavi simuliranje položaja + Simuliraj s shranjeno potjo GPX oziroma izračunano potjo + Naslov še ni znan + Pokaži ob zagonu + Seštevek vrstic + Ali ste prepričani? + Vse neshranjene spremembe bodo izgubljene. Ali želite nadaljevati? + %1$s prejemov v vrsti + Poti