diff --git a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java index 637c4163db..8acf7b4106 100644 --- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java +++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java @@ -873,7 +873,7 @@ public class GPXUtilities { WptPt point = segment.points.get(k); if (k > 0) { double currentSegment = 0; - if (!(segment.generalSegment && joinSegments && point.firstPoint)) { + if (!(segment.generalSegment && !joinSegments && point.firstPoint)) { currentSegment = metric.metric(prev, point); secondaryMetricEnd += secondaryMetric.metric(prev, point); } diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java index d70d83cf3a..28384d0bcb 100644 --- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java +++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java @@ -676,7 +676,72 @@ public class RouteDataObject { } return false; } - + + public boolean isExitPoint() { + if (pointTypes != null) { + int ptSz = pointTypes.length; + for (int i = 0; i < ptSz; i++) { + int[] point = pointTypes[i]; + if (point != null) { + int pSz = point.length; + for (int j = 0; j < pSz; j++) { + if (region.routeEncodingRules.get(point[j]).getValue().equals("motorway_junction")) { + return true; + } + } + } + } + } + return false; + } + +// public boolean isMotorWayLink() { +// int sz = types.length; +// for (int i = 0; i < sz; i++) { +// RouteTypeRule r = region.quickGetEncodingRule(types[i]); +// if (r.getTag().equals("highway") && r.getValue().equals("motorway_link")) { +// return true; +// } +// } +// return false; +// } + + public String getExitName() { + if (pointNames != null && pointNameTypes != null) { + int pnSz = pointNames.length; + for (int i = 0; i < pnSz; i++) { + String[] point = pointNames[i]; + if (point != null) { + int pSz = point.length; + for (int j = 0; j < pSz; j++) { + if (pointNameTypes[i][j] == region.nameTypeRule) { + return point[j]; + } + } + } + } + } + return null; + } + + public String getExitRef() { + if (pointNames != null && pointNameTypes != null) { + int pnSz = pointNames.length; + for (int i = 0; i < pnSz; i++) { + String[] point = pointNames[i]; + if (point != null) { + int pSz = point.length; + for (int j = 0; j < pSz; j++) { + if (pointNameTypes[i][j] == region.refTypeRule) { + return point[j]; + } + } + } + } + } + return null; + } + public int getOneway() { int sz = types.length; for (int i = 0; i < sz; i++) { diff --git a/OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java b/OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java new file mode 100644 index 0000000000..3f51d0f9d0 --- /dev/null +++ b/OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java @@ -0,0 +1,25 @@ +package net.osmand.router; + + +public class ExitInfo { + + private String ref; + + private String exitStreetName; + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public String getExitStreetName() { + return exitStreetName; + } + + public void setExitStreetName(String exitStreetName) { + this.exitStreetName = exitStreetName; + } +} diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java index 53976a1b74..3356a60e56 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java @@ -1087,14 +1087,15 @@ public class RouteResultPreparation { t = attachKeepLeftInfoAndLanes(leftSide, prev, rr); } if (t != null) { - t.setTurnAngle((float) -mpi); + t.setTurnAngle((float) - mpi); } } return t; } - private int[] getTurnLanesInfo(RouteSegmentResult prevSegm, int mainTurnType) { String turnLanes = getTurnLanesString(prevSegm); - int[] lanesArray ; + private int[] getTurnLanesInfo(RouteSegmentResult prevSegm, int mainTurnType) { + String turnLanes = getTurnLanesString(prevSegm); + int[] lanesArray; if (turnLanes == null) { if(prevSegm.getTurnType() != null && prevSegm.getTurnType().getLanes() != null && prevSegm.getDistance() < 100) { diff --git a/OsmAnd-java/src/test/resources/search/double_parking.json b/OsmAnd-java/src/test/resources/search/double_parking.json index 0c23cebe3d..46abccb8d1 100644 --- a/OsmAnd-java/src/test/resources/search/double_parking.json +++ b/OsmAnd-java/src/test/resources/search/double_parking.json @@ -17,6 +17,7 @@ "Parking fee: no (Charging station / Transportation)", "Parking fee: yes (Charging station / Transportation)", "Parking lot (Fire hydrant / Emergency infrastructure)", + "Parking space (Personal transport)", "Parking tickets (Vending machine / Store)", "Parking tickets (Vending machine / Store)", "Parking time limit (Parking / Personal transport)", diff --git a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml index f15caca36d..5107615441 100644 --- a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml +++ b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml @@ -50,7 +50,7 @@ android:id="@+id/text_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/content_padding_standard" + android:layout_marginBottom="@dimen/content_padding_half" android:animateLayoutChanges="true" android:orientation="vertical" android:paddingLeft="@dimen/my_location_text_sides_margin" @@ -58,7 +58,7 @@ + android:layout_height="wrap_content"> + + + + + + Hastighed Maksimal tid til lagring af punkter i bufferen Buffer udløbstid + Ændr enhed for afstand. + Foreslået + OsmAnd Tracker-status + Tilbage til OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml index 810a052288..56e21e2192 100644 --- a/OsmAnd-telegram/res/values-de/strings.xml +++ b/OsmAnd-telegram/res/values-de/strings.xml @@ -35,7 +35,7 @@ Schließen Verbundenes Konto Konto - "in %1$s " + in %1$s Wählen Sie die OsmAnd-Version, die OsmAnd Tracker verwendet, um Positionen anzuzeigen. OsmAnd verbinden Blendet Kontakte aus, die sich eine bestimmte Zeit lang nicht bewegt haben. @@ -199,7 +199,7 @@ Telegram (die Messaging-App) wird verwendet, um sich mit Menschen zu verbinden und mit ihnen zu kommunizieren. OK Standortaufzeichnung aktiviert - OsmAnd-Tracker + OsmAnd Tracker Akzeptieren Telegram-Datenschutzerklärung OsmAnd Datenschutzerklärung @@ -260,4 +260,7 @@ Maß für Entfernungen ändern. Maximale Zeit zum Speichern von Punkten im Puffer Verfallszeit des Puffers + Empfohlen + OsmAnd Tracker-Status + Zurück zu OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-et/strings.xml b/OsmAnd-telegram/res/values-et/strings.xml index e169dc8d7d..7afe3899e3 100644 --- a/OsmAnd-telegram/res/values-et/strings.xml +++ b/OsmAnd-telegram/res/values-et/strings.xml @@ -260,4 +260,7 @@ Minu asukoht Nüüd reaalajas nähtav Ajajoon + Soovitatud + OsmAnd Tracker olek + Tagasi OsmAnd-i \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml index cb6bdae6e1..0007342c24 100644 --- a/OsmAnd-telegram/res/values-he/strings.xml +++ b/OsmAnd-telegram/res/values-he/strings.xml @@ -259,4 +259,7 @@ יחידת מהירות הזמן המרבי לשמירת נקודות בזיכרון זמן פקיעת הזיכרון + מוצע + מצב עוקב OsmAnd + חזרה ל־OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-hu/strings.xml b/OsmAnd-telegram/res/values-hu/strings.xml index a8c8f52c47..f5a8c9a291 100644 --- a/OsmAnd-telegram/res/values-hu/strings.xml +++ b/OsmAnd-telegram/res/values-hu/strings.xml @@ -2,7 +2,7 @@ Telegram A Telegram (üzenetküldő alkalmazás) a másokkal való összekapcsolódásra és kommunikációra használható. - A Telegram nyílt platformot használó kliensprogramok egyike az OsmAnd tracker. Partnerei bármelyik másik Telegram kliensprogramot is használhatják. + A Telegram nyílt platformot használó kliensprogramok egyike az OsmAnd Tracker. Partnerei bármelyik másik Telegram kliensprogramot is használhatják. A „Tovább”-ra kattintva elfogadja a Telegram és az OsmAnd adatvédelmi irányelveinek feltételeit. Elfogadás Telegram adatvédelmi irányelvei @@ -257,6 +257,8 @@ Hosszmértékegységek Sebesség mértékegységének meghatározása Sebesség mértékegysége - Az az idő, amely után a pufferelt helyzetjelentések törlődnek + Az a leghosszabb idő, ameddig a pontok a pufferben tárolódnak Puffer lejárati ideje + Javasolt + Az OsmAnd Tracker állapota \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml index f1e772b129..349645f23f 100644 --- a/OsmAnd-telegram/res/values-nb/strings.xml +++ b/OsmAnd-telegram/res/values-nb/strings.xml @@ -2,7 +2,7 @@ Endre batterioptimiseringsinnstillinger for mer stabil posisjonsdeling. Bakgrunnsarbeid - Skru av batterioptimisering for OsmAnd Tracker slik at det ikke plutselig skrur seg av når det er i bakgrunnen. + Skru av batterioptimisering for OsmAnd-sporeren slik at det ikke plutselig skrur seg av når det er i bakgrunnen. Deling i bakgrunnen Gå til innstillinger Senere @@ -20,8 +20,8 @@ Legg til enhet Del posisjon som Kontakter og grupper som deler sin posisjon med deg. - Er du sikker på at du vil logge ut av OsmAnd Tracker slik at du ikke kan sende din posisjon, eller se andres\? - Logg ut av OsmAnd Tracker\? + Er du sikker på at du vil logge ut av OsmAnd-sporeren slik at du ikke kan sende din posisjon, eller se andres\? + Logg ut av OsmAnd-sporeren\? Navn Etter distanse Etter navn @@ -39,13 +39,13 @@ Gruppe Koble til Internett for å logge ut av Telegram ordentlig. Lukk - For å tilbakekalle posisjonsdelingstilgang. Åpne Telegram, gå til Innstillinger - Personvern og sikkerhet - Økter, og sluttfør OsmAnd Tracker-økta. + For å tilbakekalle posisjonsdelingstilgang. Åpne Telegram, gå til Innstillinger - Personvern og sikkerhet - Økter, og sluttfør OsmAnd-sporerøkta. Hvordan koble fra OsmAnd-sporeren fra Telegram Hvordan koble fra OsmAnd-sporeren fra Telegram Tilkoblet konto Konto i %1$s - Velg OsmAnd-versjonen OsmAnd Tracker bruker for å vise posisjoner på kartet. + Velg OsmAnd-versjonen OsmAnd-sporeren bruker for å vise posisjoner på kartet. OsmAnd connect Skjul kontaktene som ikke har oppdatert sin plassering etter et gitt tidsintervall. Posisjonshistorikk @@ -84,7 +84,7 @@ Søk: Gruppe eller kontakt Del posisjon Vis på kartet - OsmAnd Online GPS Tracker + OsmAnd nettbasert GPS-sporer Telefonnummer Telefonnummer i internasjonalt format Passord @@ -103,11 +103,11 @@ Skru på «Posisjon» i systeminnstillingene Velg en av posisjonstilbyderne for å dele din posisjon. Bakgrunnsmodus - OsmAnd Tracker kjører som nisse med skjermen av. + OsmAnd-sporeren kjører som nisse med skjermen av. Distanse Del posisjon Deler posisjon - OsmAnd Tracker-tjeneste + OsmAnd-sporertjeneste OsmAnd-logo Du må installere gratis- eller betalt versjon av OsmAnd først Installer OsmAnd @@ -125,7 +125,9 @@ t min sek - OsmAnd-sporer lar deg dele din posisjon og se andres i OsmAnd.

Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto. + + OsmAnd-sporeren lar deg dele din posisjon og se andres i OsmAnd.
+
Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto. Min posisjon Sist oppdaterte posisjon: Sendt og oppdatert @@ -249,4 +251,15 @@ Velg tid å vise Start–sluttdato Lagrede meldinger + Velg tidssone å vise i dine plasseringsmeldinger. + Tidssone + Enheter og formater + Endre hva lengde måles i. + Lengdeenhet + Definer en fartsenhet + Fartsenhet + Maksimal tid å lagre punkter i mellomlageret + Utløpstid for mellomlager + Foreslått + OsmAnd-sporerstatus \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml index d2f90c5033..520712150f 100644 --- a/OsmAnd-telegram/res/values-pl/strings.xml +++ b/OsmAnd-telegram/res/values-pl/strings.xml @@ -259,4 +259,5 @@ Jednostka prędkości Maksymalny czas przechowywania punktów w buforze Czas ważności bufora + Wybierz strefę czasową, która ma być wyświetlana w wiadomościach o Twojej lokalizacji. \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-pt-rBR/strings.xml b/OsmAnd-telegram/res/values-pt-rBR/strings.xml index f97f6cd3a6..600135eb6d 100644 --- a/OsmAnd-telegram/res/values-pt-rBR/strings.xml +++ b/OsmAnd-telegram/res/values-pt-rBR/strings.xml @@ -260,4 +260,7 @@ Unidade de velocidade Tempo máximo para armazenar pontos no buffer Tempo de expiração do buffer + Sugerido + Status do OsmAnd Tracker + Voltar para OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml index 491edbbe6f..c1c2124e85 100644 --- a/OsmAnd-telegram/res/values-ru/strings.xml +++ b/OsmAnd-telegram/res/values-ru/strings.xml @@ -260,4 +260,7 @@ Единица измерения скорости Максимальное время хранения точек в буфере Срок действия буфера + Предложено + Статус OsmAnd Tracker + Вернуться к OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-sc/strings.xml b/OsmAnd-telegram/res/values-sc/strings.xml index 4f582c72a2..5198a5c437 100644 --- a/OsmAnd-telegram/res/values-sc/strings.xml +++ b/OsmAnd-telegram/res/values-sc/strings.xml @@ -257,6 +257,9 @@ Unidades de longària Issèbera s\'unidade de letresa. Unidade de lestresa - Tempus màssimu de archiviatzione de sos puntos in sa memòria tampone (buffer). + Tempus màssimu de archiviatzione de sos puntos in sa memòria tampone (buffer) Tempus de iscadidura de sa memòria tampone + Cunsigiadu + Istadu de s\'arrastadore de OsmAnd + Torra a OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-tr/strings.xml b/OsmAnd-telegram/res/values-tr/strings.xml index 5999cad8ed..7e7bb20b0f 100644 --- a/OsmAnd-telegram/res/values-tr/strings.xml +++ b/OsmAnd-telegram/res/values-tr/strings.xml @@ -260,4 +260,7 @@ Hız birimi Noktaların arabellekte saklanacağı maksimum süre Arabellek zaman aşım süresi + Önerilen + OsmAnd Tracker durumu + OsmAnd\'a geri dön \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-uk/strings.xml b/OsmAnd-telegram/res/values-uk/strings.xml index f6f9a1ba5b..e292141212 100644 --- a/OsmAnd-telegram/res/values-uk/strings.xml +++ b/OsmAnd-telegram/res/values-uk/strings.xml @@ -260,4 +260,7 @@ Одиниця вимірювання швидкості Найбільший час зберігання точок у буфері Термін дії буфера + Запропоновано + Статус відстежувача OsmAnd + Повернутися до OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-zh-rTW/strings.xml b/OsmAnd-telegram/res/values-zh-rTW/strings.xml index b9d4df732e..8e1bbecc2d 100644 --- a/OsmAnd-telegram/res/values-zh-rTW/strings.xml +++ b/OsmAnd-telegram/res/values-zh-rTW/strings.xml @@ -261,4 +261,7 @@ 速度單位 在緩衝中儲存點的最長時間 緩衝過期時間 + 建議 + OsmAnd Tracker 狀態 + 回到 OsmAnd \ No newline at end of file diff --git a/OsmAnd-telegram/res/values/attrs.xml b/OsmAnd-telegram/res/values/attrs.xml index 4e46dce217..d20833396a 100644 --- a/OsmAnd-telegram/res/values/attrs.xml +++ b/OsmAnd-telegram/res/values/attrs.xml @@ -12,6 +12,7 @@ + diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml index ef780129db..f0f4a9b551 100644 --- a/OsmAnd-telegram/res/values/colors.xml +++ b/OsmAnd-telegram/res/values/colors.xml @@ -45,4 +45,6 @@ #F54522 + #727272 + diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml index e2240cf521..7f4942dc3e 100644 --- a/OsmAnd-telegram/res/values/dimens.xml +++ b/OsmAnd-telegram/res/values/dimens.xml @@ -1,5 +1,7 @@ + 8dp + 14dp 2dp 4dp 8dp @@ -51,7 +53,7 @@ 12dp - 168dp + 148dp 32dp 60dp diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml index 6c9e05bd40..57f8918f20 100644 --- a/OsmAnd-telegram/res/values/strings.xml +++ b/OsmAnd-telegram/res/values/strings.xml @@ -1,5 +1,6 @@ + Back to OsmAnd Suggested OsmAnd Tracker status Maximum time to store points in the buffer diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml index fb041f8ef0..37799e0160 100644 --- a/OsmAnd-telegram/res/values/styles.xml +++ b/OsmAnd-telegram/res/values/styles.xml @@ -29,6 +29,7 @@ true @drawable/bg_bottom_bar_shadow_with_line_day @drawable/chat_card_bg_light + @color/bg_list_item_dark