From 667af697678e70844d80555944e7cc3b5478c334 Mon Sep 17 00:00:00 2001 From: Zahnstocher Date: Tue, 2 Dec 2014 21:48:41 +0100 Subject: [PATCH 01/30] Fix null pointer --- OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 0271fd28e1..fd6f05b5b0 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -77,7 +77,7 @@ public class VoiceRouter { public interface VoiceMessageListener { void onVoiceMessage(); } - private ConcurrentHashMap voiceMessageListeners; + private ConcurrentHashMap voiceMessageListeners; public VoiceRouter(RoutingHelper router, final OsmandSettings settings, CommandPlayer player) { this.router = router; @@ -85,7 +85,7 @@ public class VoiceRouter { this.settings = settings; empty = new Struct(""); - voiceMessageListeners = new ConcurrentHashMap(); + voiceMessageListeners = new ConcurrentHashMap(); } public void setPlayer(CommandPlayer player) { @@ -842,7 +842,7 @@ public class VoiceRouter { } public void addVoiceMessageListener(VoiceMessageListener voiceMessageListener) { - voiceMessageListeners.put(voiceMessageListener, null); + voiceMessageListeners.put(voiceMessageListener, 0); } public void removeVoiceMessageListener(VoiceMessageListener voiceMessageListener) { From 6bebe6a912f9a26d0b58fdc9662343cf600c6981 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Tue, 2 Dec 2014 22:38:08 +0100 Subject: [PATCH 02/30] Translated using Weblate (Slovak) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-sk/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 62876b4844..723e07545f 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1998,4 +1998,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Súradnice Mapy Nenašla sa najbližšia cesta + Odmietnuť + Všetko je aktuálne + Použiť vykresľovanie OpenGL + Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať) From a32a83e64f72e9e3ad37a9118f32f9aafad8efaa Mon Sep 17 00:00:00 2001 From: aceman444 Date: Tue, 2 Dec 2014 22:45:33 +0100 Subject: [PATCH 03/30] update typos in strings.xml --- OsmAnd/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 1e8f2a868d..b73b5bb5eb 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,12 +11,12 @@ --> Dismiss Everything up to date - Use opengl rendering - Use hardware accelerated opengl rendering (may not work on some device) + Use OpenGL rendering + Use hardware accelerated OpenGL rendering (may not work on some devices) Nearest road was not found Home Use secure connection with server - Use https + Use HTTPS Advanced Maps Search for From 6d857019a7847ea612fa7d31afe02fcaec7afe12 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Tue, 2 Dec 2014 23:54:51 +0100 Subject: [PATCH 04/30] Translated using Weblate (Italian) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-it/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index f76837b919..65edf39667 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2036,4 +2036,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Non è stata trovata una strada nelle vicinanze Utilizzare il rendering opengl Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi) + Tutto è aggiornato + Abbandona From e1b31cc84c2f198d093863103e18ea858956e948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Wed, 3 Dec 2014 00:07:54 +0100 Subject: [PATCH 05/30] Translated using Weblate (Korean) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-ko/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 6dfb86e823..1b97a6ec32 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2092,4 +2092,6 @@ 가장 가까운 도로를 찾을 수 없습니다 Opengl 렌더링 사용 하드웨어로 가속된 opengl 렌더링 사용 (일부 장치에는 작동 하지 않을 수 있습니다) + 해제 + 최신 자료 From dc9c2e1a4626c442ababa6ef53bc4c0d037137ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Wed, 3 Dec 2014 01:01:23 +0100 Subject: [PATCH 06/30] Translated using Weblate (Polish) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-pl/strings.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index c355ad4a9e..d51794925e 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1,4 +1,4 @@ - + "Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki " Przezroczysty styl @@ -1955,4 +1955,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant POKAŻ MAPĘ POKAŻ WSZYSTKIE Współrzędne - + Odwołać + Wszystko jest aktualne + Użyj renderowania OpenGL + Użyj renderowania z akceleracją OpenGL (może nie działać na niektórych urządzeniach) + Najbliższa droga nie została znaleziona + From 84d62f96df167ac252af1e328409777edaaa8728 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Wed, 3 Dec 2014 01:40:26 +0100 Subject: [PATCH 07/30] Translated using Weblate (Sardinian) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-sc/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index f3436c02b6..c09f1e4e0d 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1791,4 +1791,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Totu agiornadu Impreare sa renderizatzione opengl Impreare sa renderizatzione opengl tràmite hardware (diat pòdere non funtzionare in carchi dispositivu) + Abbandona From 2ad74e295244014709391aebbc520c6987de67e4 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Tue, 2 Dec 2014 23:55:30 +0100 Subject: [PATCH 08/30] Translated using Weblate (Italian) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 65edf39667..1f6e19a234 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2036,6 +2036,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Non è stata trovata una strada nelle vicinanze Utilizzare il rendering opengl Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi) - Tutto è aggiornato + Tutto aggiornato Abbandona From fc6ed1f58ca66dc76ff25039d08f55b4ea7e4a75 Mon Sep 17 00:00:00 2001 From: Andrius Date: Tue, 2 Dec 2014 20:49:57 +0100 Subject: [PATCH 09/30] Translated using Weblate (Lithuanian) Currently translated at 99.9% (1568 of 1569 strings) --- OsmAnd/res/values-lt/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 559733bad1..c7d696f7af 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1853,4 +1853,5 @@ Nerastas trumpiausias kelias Naudoti OpenGL vaizdavimą Naudoti aparatinį OpenGL vaizdavimą (gali neveikti kai kurioje įrangoje) + Viskas atnaujinta From e56bee979f74024e5767e7adeaa7fc8ff37f5925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Wed, 3 Dec 2014 00:42:01 +0100 Subject: [PATCH 10/30] Translated using Weblate (Korean) Currently translated at 15.5% (91 of 586 strings) --- OsmAnd/res/values-ko/phrases.xml | 83 ++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml index 9e057124b7..6b7e5c94df 100644 --- a/OsmAnd/res/values-ko/phrases.xml +++ b/OsmAnd/res/values-ko/phrases.xml @@ -10,4 +10,87 @@ 델리 농장 가게 Greengrocery + 해산물 가게 + 과자 + 아이스크림 응접실 + 슈퍼마켓 + 홍차 가게 + 낙농장 상점 + 자동 판매기 + + 서점 + 자전거 가게 + 애니메이션 상점 + 골동품 가게 + 아트 숍 + 아기 상품 + 가방 가게 + 욕실 가구 + 침대 룸 가구 + 패션 부티크 + 카펫 가게 + 약국 + 의류 매장 + 어린이 의류 + 신발 가게 + 컴퓨터 가게 + 복사 가게 + 커튼 가게 + 휘장 상점 + 침구 가게 + 다이빙 장비 + 주택 개선 가게 + 에로틱 가게 + 낚시 도구 + 꽃 가게 + 그림 프레임 가게 + 가구점 + 정원 센터 + LPG 주유소 + 일반 상점 + 선물 가게 + Glaziery + 하드웨어 스토어 + 청력 도움 + 허브 상점 + 고음질 스토어 + 가정용품 공급 상점 + 사냥 장비 + 실내 장식 가게 + 보석 상점 + 키오스크 + 주방용품 + 휴대 전화 가게 + 오토바이 가게 + 악기 + 통신사 + 검안 + 유기농 식품 + 아웃도어 가게 + 페인트 샵 + 애완 동물 가게 + 전파상 + 두 번째 가게 + 배 잡화상 + 스포츠 용품 + 문구용품 가게 + 식기 상점 + 티켓 판매소 + 담배 상점 + 장난감 가게 + 무역소 + 진공 청소기 가게 + 잡화점 + 비디오 가게 + 창문 블라인드 가게 + 백화점 + 전자 제품 매장 + 자동차 판매소 + 자동차 부품 + 쿼드 가게 + 화장품 + 마켓 플레이스 + 건조 용품 가게 + + 경찰 From bdea1e57d53cf9048c2b440a1176a2c69c43665f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Wed, 3 Dec 2014 01:06:16 +0100 Subject: [PATCH 11/30] Translated using Weblate (Polish) Currently translated at 8.5% (50 of 586 strings) --- OsmAnd/res/values-pl/phrases.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 063ff4ed82..b758af1ceb 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -39,4 +39,16 @@ Sklep z pościelą Sprzęt do nurkowania Punkt ksero i drukowania + Sklep dla majsterkowiczów + Sklep erotyczny + Sklep wędkarski + Kwiaciarnia + Sklep z ramami do obrazów + Sklep meblowy + Centrum ogrodnicze + Magazyn gazu płynnego + Magazyn + Sklep pamiątkarski + Szklarz + Sklep z narzędziami From be57f4485a25fba1ead568bd608a69d171fa5973 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Wed, 3 Dec 2014 01:41:56 +0100 Subject: [PATCH 12/30] Translated using Weblate (Sardinian) Currently translated at 52.3% (307 of 586 strings) --- OsmAnd/res/values-sc/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml index 6b139a21a0..cdbf4d0fdd 100644 --- a/OsmAnd/res/values-sc/phrases.xml +++ b/OsmAnd/res/values-sc/phrases.xml @@ -323,4 +323,6 @@ Campusantu Campusantu Funiculare + Base militare navale + Caserma From ee2d68a8f75ed7cc7b4c7d2dad69e6cf28cd3834 Mon Sep 17 00:00:00 2001 From: xmd5a2 Date: Wed, 3 Dec 2014 09:34:30 +0300 Subject: [PATCH 13/30] Update phrases --- OsmAnd/res/values/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 7c4a73ea0e..47da7a8bb1 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -254,6 +254,8 @@ Suburb Neighbourhood Locality + Allotments + Farm Pharmacy Hospital From e04691e0ae0a5ee39ef4181aed74f9807cf1123a Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 3 Dec 2014 07:45:35 +0100 Subject: [PATCH 14/30] Translated using Weblate (Danish) Currently translated at 100.0% (588 of 588 strings) --- OsmAnd/res/values-da/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index af5a6d2fef..ac49115c68 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -636,4 +636,7 @@ Astronomisk observatorium Varm kilde Gejser + Kolonihaver + Gård + From 13653549e2a212d58daf7d993bd64c7ac4d6f75c Mon Sep 17 00:00:00 2001 From: Ivan Gonzalez Martin Date: Wed, 3 Dec 2014 09:18:25 +0100 Subject: [PATCH 15/30] Translated using Weblate (Spanish) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-es/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 37c78bb5b8..ba309e2e62 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -1888,4 +1888,5 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant Usar renderizado opengl acelerado por hardware (podría no funcionar en algunos dispositivos) No se ha encontrado la carretera más cercana Todo actualizado + Descartar From b5c4edddbef88abb9322834d3b8c9755ac7a7bd6 Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 3 Dec 2014 11:58:02 +0200 Subject: [PATCH 16/30] Fixed merge bug --- OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java index 0dccdf5719..83c761cb17 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java @@ -81,7 +81,7 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader osmandMapTileView = surf.getMapView(); osmandMapTileView.getView().setVisibility(View.VISIBLE); osmandMapTileView.removeAllLayers(); - MapVectorLayer mapVectorLayer = new MapVectorLayer(null); + MapVectorLayer mapVectorLayer = new MapVectorLayer(null, true); MapTextLayer mapTextLayer = new MapTextLayer(); mapTextLayer.setAlwaysVisible(true); // 5.95 all labels From 015057540a6fd930ddd505452d421831b7bc6002 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Wed, 3 Dec 2014 08:53:54 +0100 Subject: [PATCH 17/30] Translated using Weblate (Russian) Currently translated at 94.0% (553 of 588 strings) --- OsmAnd/res/values-ru/phrases.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 9653243fde..f0ec033371 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -389,7 +389,7 @@ Турагенство Место с хорошим видом Место для лагеря - + Место для ночлега Место для пикника Родник Кладбище @@ -620,4 +620,7 @@ Горячий источник Гейзер Спортивная дорожка + Ферма + + Садоводческое товарищество From 9cf5a9f38055ee160fa56e6bdf049c063fe8b148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 3 Dec 2014 11:21:30 +0100 Subject: [PATCH 18/30] Translated using Weblate (Czech) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-cs/strings.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 4ec1105bd0..8da1610287 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1,4 +1,4 @@ - + Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy. "Změny ve verzi 0.7.2 : \n\t- Native rendering pro všechna zařízení @@ -1779,4 +1779,9 @@ s často kladenými otázkami. Hledat ZOBRAZIT VŠE Souřadnice - + Zavřít + Vše je aktuální + Použít OpenGL + Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních) + Nebyla nalezena nejbližší silnice + From a34142152d0006c7efce071d21f9687834b4f25c Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 3 Dec 2014 14:43:33 +0200 Subject: [PATCH 19/30] Fixed bug with Destination multiplies many times on one point --- .../net/osmand/plus/activities/MapActivityActions.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 759ace7432..87988648ff 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -348,12 +348,8 @@ public class MapActivityActions implements DialogProvider { standardId == R.string.context_menu_item_destination_point) { boolean dest = standardId == R.string.context_menu_item_destination_point; String selected = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName(); - String target = null; - if(dest && selected != null){ - target = selected.replaceAll(getString(R.string.context_menu_item_destination_point), ""); - } - targets.navigateToPoint(new LatLon(latitude, longitude), true, - dest ? -1 : targets.getIntermediatePoints().size(), dest? target : selected); + targets.navigateToPoint(new LatLon(latitude, longitude), true, + dest ? -1 : targets.getIntermediatePoints().size(), dest? "" : selected); if(targets.getIntermediatePoints().size() > 0) { openIntermediatePointsDialog(); } From af55ae35728ffeda1cd1a69137f21309d9a08ba7 Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 3 Dec 2014 14:52:29 +0200 Subject: [PATCH 20/30] Removed rendering mode from configure map settings --- OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index 3c77b04d38..41adfbfd1c 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -325,8 +325,10 @@ public class ConfigureMapMenu { private void createCustomRenderingProperties(final ContextMenuAdapter adapter , final MapActivity activity, List customRules ){ final OsmandMapTileView view = activity.getMapView(); - final OsmandApplication app = view.getApplication(); for (final RenderingRuleProperty p : customRules) { + if (p.getAttrName().equals("appMode")){ + continue; + } String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(), p.getName()); // test old descr as title From c3679b52182d67610d95835821b1216bf2383cd0 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 3 Dec 2014 15:12:31 +0100 Subject: [PATCH 21/30] Remove unused method --- .../plus/activities/MapActivityLayers.java | 68 ------------------- 1 file changed, 68 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index 527e496273..7617753f3d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -155,74 +155,6 @@ public class MapActivityLayers { app.getAppCustomization().createLayers(mapView, activity); } - public void createLayers(GLSurfaceView glSurfaceView){ - //TODO implement adding layers - OsmandApplication app = (OsmandApplication) getApplication(); - RoutingHelper routingHelper = app.getRoutingHelper(); - // first create to make accessible - mapTextLayer = new MapTextLayer(); - // 5.95 all labels -// mapView.addLayer(mapTextLayer, 5.95f); - // mapView.addLayer(underlayLayer, -0.5f); - mapTileLayer = new MapTileLayer(true); -// mapView.addLayer(mapTileLayer, 0.0f); -// mapView.setMainLayer(mapTileLayer); - - // 0.5 layer - mapVectorLayer = new MapVectorLayer(mapTileLayer, true); -// mapView.addLayer(mapVectorLayer, 0.5f); - - downloadedRegionsLayer = new DownloadedRegionsLayer(); -// mapView.addLayer(downloadedRegionsLayer, 0.5f); - - // 0.9 gpx layer - gpxLayer = new GPXLayer(); -// mapView.addLayer(gpxLayer, 0.9f); - - // 1. route layer - routeLayer = new RouteLayer(routingHelper); -// mapView.addLayer(routeLayer, 1); - - // 2. osm bugs layer - // 3. poi layer - poiMapLayer = new POIMapLayer(activity); - // 4. favorites layer - favoritesLayer = new FavoritesLayer(); - // 5. transport layer - transportStopsLayer = new TransportStopsLayer(); - // 5.5 transport info layer - transportInfoLayer = new TransportInfoLayer(TransportRouteHelper.getInstance()); -// mapView.addLayer(transportInfoLayer, 5.5f); - // 5.95 all text labels - // 6. point location layer - locationLayer = new PointLocationLayer(activity.getMapViewTrackingUtilities()); -// mapView.addLayer(locationLayer, 6); - // 7. point navigation layer - navigationLayer = new PointNavigationLayer(activity); -// mapView.addLayer(navigationLayer, 7); - // 8. context menu layer - contextMenuLayer = new ContextMenuLayer(activity); -// mapView.addLayer(contextMenuLayer, 8); - // 9. map info layer - mapInfoLayer = new MapInfoLayer(activity, routeLayer); -// mapView.addLayer(mapInfoLayer, 9); - // 11. route info layer - mapControlsLayer = new MapControlsLayer(activity); -// mapView.addLayer(mapControlsLayer, 11); - - app.getSettings().MAP_TRANSPARENCY.addListener(new StateChangedListener() { - @Override - public void stateChanged(Integer change) { - mapTileLayer.setAlpha(change); - mapVectorLayer.setAlpha(change); -// mapView.refreshMap(); - } - }); - -// OsmandPlugin.createLayers(mapView, activity); -// app.getAppCustomization().createLayers(mapView, activity); - } - public void updateLayers(OsmandMapTileView mapView){ OsmandSettings settings = getApplication().getSettings(); From a8e0166001a1bd15c0b2dc0a24133d29db27089e Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 3 Dec 2014 15:46:39 +0100 Subject: [PATCH 22/30] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 4afc766b17..e5b2d51ae8 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1842,4 +1842,5 @@ 一切都為最新的 使用 OpenGL 繪製 使用硬體加速 OpenGL 繪製（可能在某些裝置無法工作） + 排除 From 810c4eb0ab888266d5140270089225d7e27173e9 Mon Sep 17 00:00:00 2001 From: elPresidento Date: Wed, 3 Dec 2014 14:19:57 +0100 Subject: [PATCH 23/30] Translated using Weblate (Czech) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-cs/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 8da1610287..fad3a61be8 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1771,7 +1771,7 @@ s často kladenými otázkami. %1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie. Nikdy Pokročilé - Domov + Domovská obrazovka ZOBRAZIT MAPU Použít zabezpečené spojení se serverem Použít HTTPS From 28678b9900cb5eeb11ff4d06c7e9fcd9c85a8409 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Wed, 3 Dec 2014 15:02:44 +0100 Subject: [PATCH 24/30] Translated using Weblate (Sardinian) Currently translated at 64.6% (380 of 588 strings) --- OsmAnd/res/values-sc/phrases.xml | 76 ++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml index cdbf4d0fdd..4cdb53eaff 100644 --- a/OsmAnd/res/values-sc/phrases.xml +++ b/OsmAnd/res/values-sc/phrases.xml @@ -325,4 +325,80 @@ Funiculare Base militare navale Caserma + Istatzione de carrigamentu + Rampa pro veìculos + Àera cumpressa + Nolu bitziclètas + Funtanedda + Ìsula ecològica + Muntonàrgiu + Logu de regorta de s\'arga + Corbuledda pro s\'arga + + Pontinu + Videobardiamentu + Osservatòriu + Galleria verticale + Istrutura pro servìtzios sotziales + Fatoria + + Tècnicu audiometrista + Tzentru de chirca e isvilupu + Tzìrculu artìsticu + Tzìrculu astròfilos + Tzìrculu informàticu + Tzìrculu giogos da mesa + Tzìrculu mototziclìsticu + Tzìrculu isportivu + Tzìrculu pro giogos + Tzìrculu automobilìsticu + Tzìrculu iscachìsticu + Tzìrculu cinèfilos + Tzìrculu de ammiradores + Tzìrculu de pisca + Tzìrculu de veteranos + Tzìrculu de Linux + Tzìrculu teatrale + Tzìrculu de istòria + Tzìrculu musicale + Tzìrculu fotogràficu + Tzìrculu de cassa + Tzìrculu turìsticu + Libreria + Tzentru artìsticu + Tzìnema + Casinò + Tzentru sotziale istitutzionale + Tzentru sotziale + Teatru + Circu + Discoteca + Nightclub + Marina (portu minore) + Piscina + Parcu + + Tzilleri + Ristorante + Tzilleri + Pub + Abba potàbile + Mastru de ferru + Birrifìtziu + Relogiàrju + Draperi + Elettricista + Giardineri + Bidraju + Artisanu + Caentamentu, bentuladura e conditzionamentu + Isulamentu tèrmicu de sos edifìtzios + Butegheri de prendas + Òticu + Pintore + Fotògrafu + Laboratòriu fotogràficu + Istucadore + Idràulicu + Brocarju From 29c1467f1a8351a5483cecf7e6ead874bdcea990 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 3 Dec 2014 20:13:16 +0100 Subject: [PATCH 25/30] Externalize url --- .../plus/activities/DashboardActivity.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java index 6bf415c43a..dfb570e6f9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java @@ -3,13 +3,11 @@ package net.osmand.plus.activities; import java.io.File; import java.lang.ref.WeakReference; -import java.text.MessageFormat; import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Random; -import android.support.v4.app.FragmentManager; import net.osmand.access.AccessibleAlertBuilder; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; @@ -17,28 +15,28 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.base.BasicProgressAsyncTask; -import net.osmand.plus.dashboard.*; +import net.osmand.plus.dashboard.DashErrorFragment; +import net.osmand.plus.dashboard.DashFavoritesFragment; +import net.osmand.plus.dashboard.DashMapFragment; +import net.osmand.plus.dashboard.DashPluginsFragment; +import net.osmand.plus.dashboard.DashSearchFragment; +import net.osmand.plus.dashboard.DashUpdatesFragment; import net.osmand.plus.download.BaseDownloadActivity; import net.osmand.plus.download.DownloadActivity; import net.osmand.plus.download.IndexItem; import net.osmand.plus.render.MapRenderRepositories; -import net.osmand.plus.sherpafy.SherpafyLoadingFragment; import net.osmand.plus.sherpafy.TourViewActivity; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.ColorDrawable; -import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.text.SpannableString; @@ -58,6 +56,7 @@ import com.actionbarsherlock.view.MenuItem; /** */ public class DashboardActivity extends BaseDownloadActivity { + private static final String LATEST_CHANGES_URL = "changes-1.9.html"; public static final boolean TIPS_AND_TRICKS = false; public static final int APP_EXIT_CODE = 4; public static final String APP_EXIT_KEY = "APP_EXIT_KEY"; @@ -261,15 +260,15 @@ public class DashboardActivity extends BaseDownloadActivity { pref.edit().putInt(TIPS_SHOW, ++i).commit(); } if (i == 1 || i == 5 || appVersionChanged) { - if(TIPS_AND_TRICKS) { - TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this); - Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false); - dlg.show(); + if (TIPS_AND_TRICKS) { + TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this); + Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false); + dlg.show(); } else { - if(appVersionChanged) { + if (appVersionChanged) { final Intent helpIntent = new Intent(activity, HelpActivity.class); helpIntent.putExtra(HelpActivity.TITLE, Version.getAppVersion(getMyApplication())); - helpIntent.putExtra(HelpActivity.URL, "changes-1.9.html"); + helpIntent.putExtra(HelpActivity.URL, LATEST_CHANGES_URL); activity.startActivity(helpIntent); } } From b0de6aef540a34a0825032642c87971abf881968 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 3 Dec 2014 16:52:09 +0100 Subject: [PATCH 26/30] Translated using Weblate (Catalan) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index f8aa1d78cd..7b2668cd0f 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1894,7 +1894,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Mai Avançat Utilitzeu una connexió segura amb el servidor - Utilitzeu https + Utilitzeu HTTPS Inici Cerca per MOSTRA EL MAPA From 76e7297e8eb6b86d5a368d25a1e6085fe8d2097c Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 3 Dec 2014 16:44:17 +0100 Subject: [PATCH 27/30] Translated using Weblate (Danish) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index cc1ca78ffb..394ae1d9e8 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1843,7 +1843,7 @@ Aldrig Avanceret Brug sikker forbindelse med server - Brug https + Brug HTTPS Start Søg efter VIS KORT From 08f830e0b105ea7a6a4c5a2b4d0641768ac07f5e Mon Sep 17 00:00:00 2001 From: stephan 75 Date: Wed, 3 Dec 2014 18:24:50 +0100 Subject: [PATCH 28/30] Translated using Weblate (German) Currently translated at 99.8% (1567 of 1569 strings) --- OsmAnd/res/values-de/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 6f7cf174ed..cc102ff759 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2022,4 +2022,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an ALLES ANZEIGEN Koordinaten Suche nach + Alle Dateien sind auf dem neuesten Stand. + OpenGL-Rendering aktivieren + Nutze Hardware-beschleunigtes OpenGL-Rendering (ggf. nicht auf allen Geräten verfügbar) From 40afc542d26d9a7acdb6d49e162fafc8a69e168e Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Wed, 3 Dec 2014 17:37:34 +0100 Subject: [PATCH 29/30] Translated using Weblate (Russian) Currently translated at 99.8% (1567 of 1569 strings) --- OsmAnd/res/values-ru/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 49916aa384..eae9cc95d8 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1821,4 +1821,8 @@ Дом Поиск Всё обновлено - + Использовать OpenGL для рендеринга + Использовать аппаратное ускорение OpenGL для рендеринга (может не работать на некоторых устройствах) + ПОКАЗАТЬ КАРТУ + ПОКАЗАТЬ ВСЁ + From 65db981ea6e9fc6046d4c15af90945e397b017c5 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Wed, 3 Dec 2014 19:29:33 +0100 Subject: [PATCH 30/30] Translated using Weblate (Sardinian) Currently translated at 100.0% (1569 of 1569 strings) --- OsmAnd/res/values-sc/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index c09f1e4e0d..f4a6704091 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1780,7 +1780,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres %1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu. Avantzadas Imprea una cunnessione segura cun su server - Imprea https + Imprea HTTPS Domo Chirca pro AMMUSTRA SA MAPA @@ -1789,7 +1789,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Mapas No est istada agatada peruna istrada a curtzu Totu agiornadu - Impreare sa renderizatzione opengl - Impreare sa renderizatzione opengl tràmite hardware (diat pòdere non funtzionare in carchi dispositivu) + Imprea sa renderizatzione OpengL + Imprea sa renderizatzione OpengL tràmite hardware (diat pòdere non funtzionare in carchi dispositivu) Abbandona