From 45e6fa549b09ccdb94c8a6a7d9c7723a6b34ad8c Mon Sep 17 00:00:00 2001
From: Sergiy Kozyr <s.trump@gmail.com>
Date: Thu, 8 Aug 2024 22:15:26 +0300
Subject: [PATCH 1/8] Changed navigation UI to show speed and speed limit with
'/' separator.
Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
---
.../main/cpp/app/organicmaps/Framework.cpp | 5 +++--
.../app/organicmaps/routing/RoutingInfo.java | 6 +++++-
.../app/organicmaps/widget/menu/NavMenu.java | 21 ++++++++++++++++++-
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
index 4eaf04efa2..fe3b5435cf 100644
--- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
@@ -1253,7 +1253,7 @@ Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass)
jni::GetConstructorID(env, klass,
"(Lapp/organicmaps/util/Distance;Lapp/organicmaps/util/Distance;"
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
- "[Lapp/organicmaps/routing/SingleLaneInfo;ZZ)V");
+ "[Lapp/organicmaps/routing/SingleLaneInfo;DZZ)V");
vector<routing::FollowingInfo::SingleLaneInfoClient> const & lanes = info.m_lanes;
jobjectArray jLanes = nullptr;
@@ -1288,7 +1288,8 @@ Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass)
ToJavaDistance(env, info.m_distToTurn), jni::ToJavaString(env, info.m_currentStreetName),
jni::ToJavaString(env, info.m_nextStreetName), jni::ToJavaString(env, info.m_nextNextStreetName),
info.m_completionPercent, info.m_turn, info.m_nextTurn, info.m_pedestrianTurn, info.m_exitNum,
- info.m_time, jLanes, static_cast<jboolean>(isSpeedCamLimitExceeded), static_cast<jboolean>(shouldPlaySignal));
+ info.m_time, jLanes, info.m_speedLimitMps, static_cast<jboolean>(isSpeedCamLimitExceeded),
+ static_cast<jboolean>(shouldPlaySignal));
ASSERT(result, (jni::DescribeException()));
return result;
}
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java b/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
index 10c612adbb..afb238a826 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
@@ -34,6 +34,9 @@ public class RoutingInfo
public final SingleLaneInfo[] lanes;
// For pedestrian routing.
public final PedestrianTurnDirection pedestrianTurnDirection;
+ // Current speed limit in meters per second.
+ // If no info about speed limit then speedLimitMps < 0.
+ public final double speedLimitMps;
private final boolean speedLimitExceeded;
private final boolean shouldPlayWarningSignal;
@@ -140,7 +143,7 @@ public class RoutingInfo
public RoutingInfo(Distance distToTarget, Distance distToTurn, String currentStreet, String nextStreet, String nextNextStreet, double completionPercent,
int vehicleTurnOrdinal, int vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
- int totalTime, SingleLaneInfo[] lanes, boolean speedLimitExceeded,
+ int totalTime, SingleLaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
boolean shouldPlayWarningSignal)
{
this.distToTarget = distToTarget;
@@ -155,6 +158,7 @@ public class RoutingInfo
this.lanes = lanes;
this.exitNum = exitNum;
this.pedestrianTurnDirection = PedestrianTurnDirection.values()[pedestrianTurnOrdinal];
+ this.speedLimitMps = speedLimitMps;
this.speedLimitExceeded = speedLimitExceeded;
this.shouldPlayWarningSignal = shouldPlayWarningSignal;
}
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 1c772cd69d..6c32e729f1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -9,6 +9,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import app.organicmaps.R;
import app.organicmaps.location.LocationHelper;
@@ -16,6 +18,7 @@ import app.organicmaps.routing.RoutingInfo;
import app.organicmaps.sound.TtsPlayer;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.StringUtils;
+import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils;
import com.google.android.material.progressindicator.LinearProgressIndicator;
@@ -46,6 +49,8 @@ public class NavMenu
private final NavMenuListener mNavMenuListener;
private int currentPeekHeight = 0;
+ private double mCurrentSpeedLimit;
+ private boolean mIsSpeedLimitExceeded = false;
public interface OnMenuSizeChangedListener
@@ -211,8 +216,20 @@ public class NavMenu
Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
+ if (mCurrentSpeedLimit > 0.0)
+ {
+ Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
+ mSpeedValue.setText(speedAndUnits.first + " / " + speedLimitAndUnits.first);
+ }
+ else
+ mSpeedValue.setText(speedAndUnits.first);
+
+ if (mIsSpeedLimitExceeded)
+ mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
+ else
+ mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));
+
mSpeedUnits.setText(speedAndUnits.second);
- mSpeedValue.setText(speedAndUnits.first);
mSpeedViewContainer.setActivated(info.isSpeedLimitExceeded());
}
@@ -223,6 +240,8 @@ public class NavMenu
mDistanceValue.setText(info.distToTarget.mDistanceStr);
mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));
mRouteProgress.setProgressCompat((int) info.completionPercent, true);
+ mCurrentSpeedLimit = info.speedLimitMps;
+ mIsSpeedLimitExceeded = info.isSpeedLimitExceeded();
}
public interface NavMenuListener
--
2.45.3
From 1dcc6ed9ad88b26d70b8c1453bfed7b4013f398a Mon Sep 17 00:00:00 2001
From: Nitai Sasson <github.com.nr568@sl.neatnit.net>
Date: Fri, 9 Aug 2024 08:33:45 +0300
Subject: [PATCH 2/8] Hebrew translations of type_strings.txt (not by me)
(#8893)
* Update types_strings.txt (#3)
add in Hebrew
Signed-off-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
Co-authored-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
* Update types_strings.txt (#4)
add in Hebrew
Signed-off-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
Co-authored-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
* Update types_strings.txt (#5)
add Hebrew
Signed-off-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
Co-authored-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
* fix language order
Signed-off-by: Nitai Sasson <github.com.nr568@sl.neatnit.net>
---------
Signed-off-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
Signed-off-by: Nitai Sasson <github.com.nr568@sl.neatnit.net>
Co-authored-by: MbTy1 <141584968+MbTy1@users.noreply.github.com>
---
data/strings/types_strings.txt | 110 +++++++++++++++++++++++++++++----
1 file changed, 99 insertions(+), 11 deletions(-)
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 8e30f77575..4a7d008856 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -290,6 +290,7 @@
fa = فرودگاه
fi = Lentokenttä
fr = Aéroport
+ he = שדה תעופה
hi = हवाई अड्डा
hu = Repülőtér
id = Bandar udara
@@ -329,6 +330,7 @@
fa = فرودگاه
fi = Kansainvälinen lentokenttä
fr = Aéroport
+ he = שדה תעופה בינלאומי
hi = अंतर्राष्ट्रीय हवाई अड्डा
hu = Repülőtér
id = Bandar udara
@@ -363,6 +365,7 @@
et = Platvorm
eu = Plataforma
fr = Aire de stationnement pour aéronefs
+ he = חניית מטוסים
it = Area di stazionamento per aeromobili
ja = エプロン
nl = Platform
@@ -387,6 +390,7 @@
eu = Ontziratzeko atea
fi = Portti
fr = Porte d'embarquement
+ he = שער
it = Cancello aeroportuale
ja = 搭乗口
mr = दार
@@ -416,6 +420,7 @@
fa = پد فرود بالگرد
fi = Helikopterialusta
fr = Hélisurface
+ he = מנחת מסוקים
hu = Helikopterleszálló
id = Landasan helikopter
it = Piattaforma per elicotteri
@@ -449,6 +454,7 @@
eu = Pista
fi = Kiitorata
fr = Piste d'aviation
+ he = מסלול המראה
hi = उड़ानपट्टी
it = Pista di decollo/atterraggio
ja = 滑走路
@@ -476,6 +482,7 @@
eu = Taxiway
fi = Rullaustie
fr = Taxiway
+ he = מסלול הסעה
it = Pista di rullaggio
ja = 誘導路
nl = Taxibaan
@@ -610,6 +617,7 @@
fa = خودپرداز
fi = Pankkiautomaatti
fr = GAB
+ he = כספומט
hi = एटीएम
hu = Bankautomata
it = Bancomat
@@ -642,6 +650,7 @@
fa = بانک
fi = Pankki
fr = Banque
+ he = בנק
hi = बैंक
it = Banca
ja = 銀行
@@ -673,6 +682,7 @@
eu = Taberna
fa = میکده
fi = Baari
+ he = בר
hi = मधुशाला
hu = Bár
it = Bar alcolico
@@ -751,6 +761,7 @@
fa = سَکو
fi = Penkki
fr = Banc
+ he = ספסל
hi = बेंच
hu = Pad
id = Bangku panjang
@@ -792,6 +803,7 @@
fa = پارکینگ دوچرخه
fi = Polkupyöräpysäköinti
fr = Parking à vélo
+ he = חניית אופניים
hi = साइकिल पार्किंग
hu = Kerékpárparkoló
id = Parkir Sepeda
@@ -832,6 +844,7 @@
fa = مکان اجاره دوچرخه
fi = Polkupyöränvuokraus
fr = Location de vélos
+ he = השכרת אופניים
hi = साइकिल किराए के लिए
hu = Kerékpárkölcsönző
id = Penyewaan Sepeda
@@ -869,6 +882,7 @@
fa = ایستگاه تعمیر دوچرخه
fi = Polkupyörän korjausasema
fr = Station de réparation de vélos
+ he = תחנת תיקון אופניים
hi = साइकिल मरम्मत स्टेशन
hu = Kerékpárjavító állomás
it = Stazione di riparazione biciclette
@@ -936,6 +950,7 @@
fa = فاحشه خانه
fi = Bordelli
fr = Maison de prostitution
+ he = בית בושת
hi = वेश्यालय
hu = Bordélyház
id = Hiburan
@@ -1014,6 +1029,7 @@
fa = حمل و نقل
fi = Linja-autoasema
fr = Gare routière
+ he = תחנת אוטובוס
hi = बस स्टेशन
hu = Buszpályaudvar
id = Stasiun bus
@@ -1053,6 +1069,7 @@
fa = کافه
fi = Kahvila
fr = Café
+ he = קפה
hi = कॉफ़ीख़ाना
hu = Kávézó
id = Kafe
@@ -1093,6 +1110,7 @@
fa = مکان اجاره ماشین
fi = Autovuokraamo
fr = Location de voitures
+ he = השכרת רכב
hi = किराए पर गाड़ियाँ
hu = Autókölcsönző
id = Rental mobil
@@ -1131,6 +1149,7 @@
eu = Partekatu autoa
fi = Autojen yhteiskäyttö
fr = Station d'autopartage
+ he = רכב שיתופי
hi = गाड़ी साँझा
hu = Közösségi autóbérlés
id = Berbagi mobil
@@ -1170,6 +1189,7 @@
fa = کارواش
fi = Autopesula
fr = Station de lavage
+ he = שטיפת רכב
hi = कार धुलाई
hu = Autómosó
id = Cuci Mobil
@@ -1208,6 +1228,7 @@
fa = قمارخانه
fi = Kasino
fr = Casino
+ he = קזינו
hi = कैसीनो
hu = Kaszinó
id = Hiburan
@@ -1370,6 +1391,7 @@
fa = ایستگاه شارژ
fi = Latausasema
fr = Borne de recharge
+ he = תחנת טעינה
hi = चार्जिंग स्टेशन
hu = Töltőállomás
id = Pusat Pengisian Daya
@@ -1532,6 +1554,7 @@
fa = سرگرمی
fi = Elokuvateatteri
fr = Cinéma
+ he = קולנוע
hi = सिनेमा-घर
hu = Mozi
id = Bioskop
@@ -1572,7 +1595,7 @@
fa = ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ
fi = Keilarata
fr = Salle de bowling
- he = גנילואב םלוא
+ he = אולם באולינג
hi = बोलिंग ऐली
hu = Tekepálya
id = Arena Bowling
@@ -1613,6 +1636,7 @@
fa = کلینیک
fi = Klinikka
fr = Clinique
+ he = מרפאה
hi = चिकित्सालय
hu = Klinika
id = Klinik
@@ -1652,6 +1676,7 @@
fa = دانشگاه
fi = Korkeakoulu
fr = Enseignement post-secondaire
+ he = מכללה
hi = महाविद्यालय
hu = Főiskola
id = Kampus
@@ -1691,6 +1716,7 @@
fa = مرکزاجتماعی
fi = Monitoimitalo
fr = Salle polyvalente
+ he = מרכז קהילתי
hi = सामुदायिक केंद्र
hu = Közösségi központ
id = Pusat komunitas
@@ -1813,6 +1839,7 @@
fa = دادگاه
fi = Oikeustalo
fr = Palais de justice
+ he = בית המשפט
hi = न्यायालय
hu = Bíróság
id = Gedung pengadilan
@@ -1890,6 +1917,7 @@
fa = کلینیک
fi = Lääkärin vastaanotto
fr = Cabinet médical
+ he = רופא
hi = चिकित्सक
hu = Rendelő
id = Praktik dokter
@@ -1928,6 +1956,7 @@
fa = اب اشامیدنی
fi = Juomavesi
fr = Eau potable
+ he = מי שתיה
hi = पीने का पानी
hu = Ivóvíz
id = Air minum
@@ -1972,6 +2001,7 @@
fa = اموزشگاه رانندگی
fi = Autokoulu
fr = Auto-école
+ he = בית ספר לנהיגה
hi = ड्राइविंग स्कूल
hu = Autósiskola
id = Sekolah Mengemudi
@@ -2098,7 +2128,7 @@
fa = ﯽﻘﯿﺳﻮﻣ ﻩﺎﮕﺷﺯﻮﻣﺁ
fi = Musiikkikoulu
fr = École de musique
- he = הקיזומל רפס תיב
+ he = בית ספר למוזיקה
hi = संगीत विद्यालय
hu = Zeneiskola
id = Sekolah musik
@@ -2139,7 +2169,7 @@
fa = ﻥﺎﺑﺯ ﻪﺳﺭﺪﻣ
fi = Kielikoulu
fr = École de langue
- he = תופשל רפס תיב
+ he = בית ספר לשפות
hi = भाषा का स्कूल
hu = Nyelviskola
id = Sekolah bahasa
@@ -2178,6 +2208,7 @@
fa = سفارت
fi = Suurlähetystö
fr = Ambassade
+ he = שגרירות
hi = दूतावास
hu = Nagykövetség
id = Kedutaan
@@ -2217,6 +2248,7 @@
fa = فست فود
fi = Pikaruokala
fr = Restauration rapide
+ he = מזון מהיר
hi = फास्ट फूड
hu = Gyorsétterem
id = Cepat saji
@@ -2296,6 +2328,7 @@
fa = ایستگاه اتش نشانی
fi = Paloasema
fr = Caserne de pompiers
+ he = תחנת כיבוי אש
hi = दमकल केंद्र
hu = Tűzoltóság
id = Kantor pemadam kebakaran
@@ -2357,6 +2390,7 @@
fa = فواره
fi = Suihkulähde
fr = Fontaine
+ he = מזרקה
hi = झरना
hu = Szökőkút
id = Air mancur
@@ -2398,6 +2432,7 @@
fa = سوخت
fi = Huoltoasema
fr = Station-service
+ he = תחנת דלק
hi = पेट्रोल पंप
hu = Benzinkút
id = Pompa bensin
@@ -2439,6 +2474,7 @@
fa = قبرستان
fi = Hautausmaa
fr = Cimetière
+ he = בית קברות
hi = क़ब्रिस्तान
hu = Temető
id = Pemakaman
@@ -2474,6 +2510,7 @@
et = Kristlik surnuaed
fi = Kristillinen hautausmaa
fr = Cimetière chrétien
+ he = בית קברות נוצרי
hi = ईसाई कब्रिस्तान
it = Cimitero cristiano
ja = キリスト教墓地
@@ -2504,6 +2541,7 @@
fa = بیمارستان
fi = Sairaala
fr = Hôpital
+ he = בית חולים
hi = चिकित्सालय
hu = Kórház
id = Rumahsakit
@@ -2582,6 +2620,7 @@
fa = غذا
fi = Jäätelökioski
fr = Stand de crèmes glacées
+ he = גלידה
hi = आइसक्रीम
hu = Fagylaltárus
id = Kios Es Krim
@@ -2621,6 +2660,7 @@
fa = کافی نت
fi = Internetkahvila
fr = Cybercafé
+ he = קפה אינטרנט
hi = इंटरनेट कैफे
hu = Internet kávézó
id = Kafe Internet
@@ -2659,6 +2699,7 @@
fa = مهدکودک
fi = Päiväkoti
fr = Crèche
+ he = גן ילדים
hi = किंडरगार्टन
hu = Óvoda
id = Taman kanak-kanak
@@ -2698,6 +2739,7 @@
fa = کتابخانه
fi = Kirjasto
fr = Bibliothèque
+ he = ספריה
hi = पुस्तकालय
hu = Könyvtár
id = Perpustakaan
@@ -2780,6 +2822,7 @@
fa = فروشگاه
fi = Kauppatori
fr = Marché
+ he = זירת מסחר
hi = बाजार
hu = Piac
id = Pasar
@@ -2820,6 +2863,7 @@
fa = پارکینگ موتورسیکلت
fi = Moottoripyörien pysäköinti
fr = Parking moto
+ he = חניית אופנועים
hi = मोटरसाइकिल पार्किंग
hu = Motorbicikli parkoló
id = Tempat Parkir Sepeda Motor
@@ -2859,6 +2903,7 @@
fa = کلوپ شبانه
fi = Yökerho
fr = Discothèque
+ he = מועדון לילה
hi = नाइट क्लब
hu = Éjszakai mulató
id = Kelab malam
@@ -2940,7 +2985,7 @@
fa = پارکینگ
fi = Parkkipaikka
fr = Stationnement
- he = היָנָחֲ
+ he = חניה
hi = पार्किंग
hu = Parkoló
id = Parkir
@@ -2986,7 +3031,7 @@
fa = ﻪﻘﺒﻃ ﺪﻨﭼ ﮓﻨﯿﮐﺭﺎﭘ
fi = Monikerroksinen pysäköinti
fr = Stationnement à plusieurs étages
- he = תומוק בר הינח
+ he = חניון רב קומות
hi = पार्किंग गैरेज
hu = Többszintes parkoló
id = Parkir Bertingkat
@@ -3038,7 +3083,7 @@
fa = ﯽﺻﺎﺼﺘﺧﺍ ﮓﻨﯿﮐﺭﺎﭘ
fi = Yksityinen pysäköinti
fr = Stationnement privé
- he = תיטרפ הינח
+ he = חניה פרטית
hi = निजी पार्किंग
hu = Magánparkoló
id = Parkir pribadi
@@ -3079,6 +3124,7 @@
fa = پارکینگ
fi = Liityntäpysäköinti
fr = Parking relais
+ he = חניית חנה וסע
hi = पार्क करें और सवारी करें
hu = P+R Parkoló
id = Parkir
@@ -3121,7 +3167,7 @@
fa = ﯽﻨﯿﻣﺯ ﺮﯾﺯ ﮓﻨﯿﮐﺭﺎﭘ
fi = Maanalainen pysäköinti
fr = Stationnement souterrain
- he = תיעקרק - תת הינח
+ he = חניה תת קרקעית
hi = भूमिगत कार पार्क
hu = Mélygarázs
id = Parkir bawah tanah
@@ -3382,7 +3428,7 @@
fa = ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ
fi = Pysäköinnin sisäänkäynti
fr = Entrée parking
- he = הינחל הסינכ
+ he = כניסה לחניה
hi = पार्किंग प्रवेश द्वार
hu = Parkoló bejárata
id = Pintu masuk parkir
@@ -3467,6 +3513,7 @@
fa = جای پارک
fi = Parkkipaikka
fr = Place de stationnement
+ he = מקום חניה
hi = पार्किंग की जगह
hu = Parkolóhely
id = Tempat parkir
@@ -3518,7 +3565,7 @@
fa = ﻦﯿﻟﻮﻠﻌﻣ ﮎﺭﺎﭘ ﯼﺎﺟ
fi = Vammaispysäköinti
fr = Place de stationnement handicapé
- he = םיכנל הינח
+ he = חניה לנכים
hi = दिव्यांग पार्किंग स्थान
hu = Mozgássérült parkolóhely
id = Tempat parkir penyandang cacat
@@ -3557,6 +3604,7 @@
fa = دستگاه کارتخوان
fi = Maksupääte
fr = Terminal de paiement
+ he = מסוף תשלום
hi = भुगतान टर्मिनल
hu = Fizetőterminál
id = Terminal Pembayaran
@@ -3596,6 +3644,7 @@
fa = داروخانه
fi = Apteekki
fr = Pharmacie
+ he = בית מרקחת
hi = दवाखाना
hu = Gyógyszertár
id = Apotek
@@ -3635,6 +3684,7 @@
fa = گردشگری
fi = Uskonnollinen kohde
fr = Lieu de culte
+ he = מקום דתי
hi = उपासनास्थल
hu = Templom
id = Tempat ibadah
@@ -3712,6 +3762,7 @@
fa = گردشگری
fi = Kirkko
fr = Église
+ he = כנסיה
hi = गिरजाघर
hu = Templom
id = Gereja
@@ -3792,7 +3843,7 @@
fa = سال مملکت شاهدان یهوه
fi = Jehovan todistajien valtakunnansali
fr = Salle du Royaume des Témoins de Jéhovah
- he = בית הכנסת של עדי יהוה
+ he = כנסיה של עדי יהוה
hu = Jehova Tanúinak Királysága terem
id = Aula Kerajaan Saksi-Saksi Yehuwa
it = Sala del Regno dei Testimoni di Geova
@@ -3869,6 +3920,7 @@
eu = Sinagoga
fa = گردشگری
fi = Synagoga
+ he = בית כנסת
hi = यहूदी मंदिर
hu = Zsinagóga
id = Sinagoge
@@ -3908,6 +3960,7 @@
fa = گردشگری
fi = Moskeija
fr = Mosquée
+ he = מסגד
hi = मस्जिद
hu = Mecset
id = Masjid
@@ -4024,6 +4077,7 @@
eu = Polizia
fa = کلانتری
fi = Poliisi
+ he = משטרה
hi = थाना
hu = Rendőrség
id = Polisi
@@ -4065,6 +4119,7 @@
fa = صندوق پست
fi = Postilaatikko
fr = Boîte aux lettres
+ he = תיבת דואר
hi = पोस्ट बॉक्स
hu = Levelesláda
id = Kotak pos
@@ -4104,6 +4159,7 @@
fa = دفتر پست
fi = Postitoimisto
fr = Bureau de poste
+ he = דואר
hi = डाकघर
hu = Posta
id = Kantor pos
@@ -4139,6 +4195,7 @@
et = Vangla
eu = Kartzela
fi = Vankila
+ he = בית כלא
hi = कारागार
it = Prigione
ja = 刑務所
@@ -4170,6 +4227,7 @@
fa = میکده
fi = Pubi
fr = Pub
+ he = פאב
hi = सराय
hu = Kocsma
it = Taverna
@@ -4247,6 +4305,7 @@
fa = مرکز بازیافت
fi = Kierrätyskeskus
fr = Centre de recyclage
+ he = מרכז מיחזור
hi = रीसाइक्लिंग सेंटर
hu = Újrahasznosító központ
id = TPA
@@ -4287,6 +4346,7 @@
fa = ظرف بازیافت
fi = Kierrätysjäteastia
fr = Conteneur de recyclage
+ he = מיכל מיחזור
hi = रीसाइक्लिंग कंटेनर
hu = Újrahasznosító konténer
id = Wadah daur ulang
@@ -4331,7 +4391,7 @@
fa = ﺎﻫ ﯼﺮﺗﺎﺑ
fi = Paristot
fr = Batteries
- he = תוללוס
+ he = סוללות
hu = Elemek
id = Baterai
it = Batterie
@@ -4372,6 +4432,7 @@
fa = لباسهای قدیمی
fi = Vaatteet
fr = Vêtements usagés
+ he = בגדים
hu = Régi ruhák
id = Pakaian lama
it = Vestiti usati
@@ -4411,6 +4472,7 @@
fa = بطریهای شیشهای
fi = Lasipullot
fr = Verre
+ he = בקבוקי זכוכית
hu = Üvegpalackok
id = Botol kaca
it = Contenitori in vetro
@@ -4450,6 +4512,7 @@
fa = پسماند کاغذ
fi = Paperi
fr = Papier usagé
+ he = נייר
hu = Papírhulladék
id = Limbah kertas
it = Rifiuti in carta e cartone
@@ -4489,6 +4552,7 @@
fa = پسماند پلاستیک
fi = Muovi
fr = Déchets plastiques
+ he = פלסטיק
hu = Műanyaghulladék
id = Limbah plastik
it = Rifiuti in plastica
@@ -4528,6 +4592,7 @@
fa = بطریهای پلاستیک
fi = Muovipullot
fr = Bouteilles en plastique
+ he = בקבוקי פלסטיק
hu = Műanyag palackok
id = Botol-botol plastik
it = Bottiglie di plastica
@@ -4568,6 +4633,7 @@
fa = ضایعات فلزی
fi = Metalliromu
fr = Ferraille
+ he = גרוטאות מתכת
hu = Fémhulladék
id = Besi tua
it = Rifiuti metallici
@@ -4607,6 +4673,7 @@
fa = پسماند الکترونیکی
fi = SER
fr = Déchets d'équipements électriques
+ he = פסולת אלקטרונית
hu = Elektromos hulladék
id = Limbah elektronik
it = Rifiuti di apparecchiature elettriche ed elettroniche
@@ -4642,6 +4709,7 @@
eu = Kartoia
fi = Pahvi
fr = Carton
+ he = קרטון
it = Cartone
mr = पुठ्ठा
nl = Karton
@@ -4665,6 +4733,7 @@
eu = Latak
fi = Tölkit
fr = Emballages métalliques
+ he = פחיות
it = Lattine
mr = कॅन
nl = Blikafval
@@ -4688,6 +4757,7 @@
eu = Oinetakoak
fi = Kengät
fr = Chaussures
+ he = נעליים
it = Scarpe
mr = पादत्राणे
nl = Schoenen
@@ -4711,6 +4781,7 @@
eu = Organikoa
fi = Biojäte
fr = Déchets organiques
+ he = פסולת אורגנית/ירוקה
it = Umido
nl = GFT afval
pl = Odpady zielone
@@ -4756,6 +4827,7 @@
eu = Jatetxea
fa = غذا
fi = Ravintola
+ he = מסעדה
hi = रेस्तरां
hu = Étterem
id = Restoran
@@ -4815,6 +4887,7 @@
fa = مدرسه
fi = Koulu
fr = École
+ he = בית ספר
hi = विद्यालय
hu = Iskola
id = Sekolah
@@ -5000,6 +5073,7 @@
fa = حمام
fi = Suihku
fr = Douche
+ he = מקלחת
hi = फुहारा
hu = Tusoló
id = Pancuran
@@ -5077,6 +5151,7 @@
eu = Taxia
fa = تاکسی
fi = Taksi
+ he = תחנת מוניות
hi = टैक्सी
id = Taksi
it = Taxi
@@ -5112,6 +5187,7 @@
fa = تلفن خانه
fi = Puhelin
fr = Téléphone
+ he = טלפון
hi = टेलीफ़ोन
hu = Telefon
id = Telepon
@@ -5151,6 +5227,7 @@
fa = سرگرمی
fi = Teatteri
fr = Théâtre
+ he = תיאטרון
hi = रंगमंच
hu = Színház
id = Teater
@@ -5189,6 +5266,7 @@
fa = دستشویی
fi = WC
fr = Toilettes
+ he = שירותים
hi = शौचालय
hu = Mosdó
it = Servizi igienici
@@ -5231,6 +5309,7 @@
fa = گردشگری
fi = Kaupungintalo
fr = Mairie
+ he = בית העיריה
hi = नगर भवन
hu = Városháza
id = Balai kota
@@ -5270,6 +5349,7 @@
fa = دانشگاه
fi = Yliopisto
fr = Université
+ he = אוניברסיטה
hi = विश्वविद्यालय
hu = Egyetem
id = Universitas
@@ -5305,6 +5385,7 @@
eu = Makina saltzailea
fi = Myyntiautomaatti
fr = Distributeur automatique
+ he = מכונת ממכר אוטומטית
hi = वितरक मशीन
it = Distributore automatico
ja = 自動販売機
@@ -5336,6 +5417,7 @@
fa = ماشین سیگار فروشی
fi = Savukeautomaatti
fr = Distributeur de cigarettes
+ he = מכונה לממכר סיגריות
hi = सिगरेट वितरक मशीन
hu = Cigarettaautomata
id = Mesin rokok
@@ -5371,6 +5453,7 @@
eu = Kafea saltzeko makina
fi = Kahviautomaatti
fr = Distributeur de café
+ he = מכונה לממכר קפה
hi = कॉफ़ी वितरक
it = Macchina del caffè
mr = कॉफी विक्रीयंत्र
@@ -5475,6 +5558,7 @@
eu = Egunkariak saltzeko makina
fi = Sanomalehtiautomaatti
fr = Distributeur de journaux
+ he = מתקן עיתונים
hi = समाचार पत्र वितरक
it = Distributore automatico di giornali
mr = वृत्तपत्र विक्रीयंत्र
@@ -5502,6 +5586,7 @@
fa = پارکو متر
fi = Pysäköintimaksuautomaatti
fr = Horodateur
+ he = מדחן
hi = पार्किंग टिकट
hu = Parkolóautomata
id = Mesin pembayaran tiket parkir
@@ -5543,6 +5628,7 @@
fa = دستگاه فروش خودکار بلیط های حمل و نقل عمومی
fi = Julkisen liikenteen lippuautomaatti
fr = Distributeur de billets de transport en commun
+ he = מכונת כרטיסים
hi = टिकट मशीन
hu = Jegyautomata tömegközlekedési eszközökhöz
id = Mesin penjual otomatis tiket transportasi umum
@@ -26694,6 +26780,7 @@
fa = فروشگاه
fi = Kenkäkauppa
fr = Magasin de chaussures
+ he = חנות נעליים
hi = जूते की दुकान
hu = Cipőbolt
id = Toko sepatu
@@ -29636,6 +29723,7 @@
eu = Turismoa
fi = Turismi
fr = Tourisme
+ he = תיירות
hi = पर्यटन
it = Turismo
ja = 観光
--
2.45.3
From 8bc775aafd7dc33c0b3a6835767cedcaec07cf88 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 9 Aug 2024 07:36:24 +0200
Subject: [PATCH 3/8] [strings] Regenerated
Signed-off-by: Alexander Borsuk <me@alex.bio>
---
.../app/src/main/res/values-iw/strings.xml | 134 +++++++++--
.../he.lproj/Localizable.strings | 226 +++++++++---------
2 files changed, 230 insertions(+), 130 deletions(-)
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 8d9c0ee898..71874194e7 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -828,29 +828,78 @@
<string name="type.addr_interpolation">כתובת/חסימה</string>
<string name="type.addr_interpolation.even">כתובת/חסימה</string>
<string name="type.addr_interpolation.odd">כתובת/חסימה</string>
+ <string name="type.aeroway.aerodrome">שדה תעופה</string>
+ <string name="type.aeroway.aerodrome.international">שדה תעופה בינלאומי</string>
+ <string name="type.aeroway.apron">חניית מטוסים</string>
+ <string name="type.aeroway.gate">שער</string>
+ <string name="type.aeroway.helipad">מנחת מסוקים</string>
+ <string name="type.aeroway.runway">מסלול המראה</string>
+ <string name="type.aeroway.taxiway">מסלול הסעה</string>
+ <string name="type.amenity.atm">כספומט</string>
+ <string name="type.amenity.bank">בנק</string>
+ <string name="type.amenity.bar">בר</string>
<string name="type.amenity.bbq">מנגל</string>
+ <string name="type.amenity.bench">ספסל</string>
+ <string name="type.amenity.bicycle_parking">חניית אופניים</string>
+ <string name="type.amenity.bicycle_rental">השכרת אופניים</string>
+ <string name="type.amenity.bicycle_repair_station">תחנת תיקון אופניים</string>
+ <string name="type.amenity.brothel">בית בושת</string>
+ <string name="type.amenity.bus_station">תחנת אוטובוס</string>
+ <string name="type.amenity.cafe">קפה</string>
+ <string name="type.amenity.car_rental">השכרת רכב</string>
+ <string name="type.amenity.car_sharing">רכב שיתופי</string>
+ <string name="type.amenity.car_wash">שטיפת רכב</string>
+ <string name="type.amenity.casino">קזינו</string>
<string name="type.amenity.gambling">הימורים</string>
<string name="type.leisure.adult_gaming_centre">מרכז משחקים למבוגרים</string>
<string name="type.leisure.amusement_arcade">מִקמֶרֶת</string>
+ <string name="type.amenity.charging_station">תחנת טעינה</string>
<string name="type.amenity.charging_station.bicycle">תחנת טעינה לאופניים</string>
<string name="type.amenity.charging_station.motorcar">תחנת טעינה למכוניות</string>
- <string name="type.leisure.bowling_alley">גנילואב םלוא</string>
+ <string name="type.amenity.cinema">קולנוע</string>
+ <string name="type.leisure.bowling_alley">אולם באולינג</string>
+ <string name="type.amenity.clinic">מרפאה</string>
+ <string name="type.amenity.college">מכללה</string>
+ <string name="type.amenity.community_centre">מרכז קהילתי</string>
<string name="type.amenity.compressed_air">אוויר דחוס</string>
<string name="type.amenity.conference_centre">מרכז כנסים</string>
+ <string name="type.amenity.courthouse">בית המשפט</string>
+ <string name="type.amenity.doctors">רופא</string>
+ <string name="type.amenity.drinking_water">מי שתיה</string>
+ <string name="type.drinking_water.yes">מי שתיה</string>
+ <string name="type.amenity.driving_school">בית ספר לנהיגה</string>
<string name="type.amenity.exhibition_centre">מרכז תערוכה</string>
<string name="type.amenity.money_transfer">העברת כספים</string>
- <string name="type.amenity.music_school">הקיזומל רפס תיב</string>
- <string name="type.amenity.language_school">תופשל רפס תיב</string>
+ <string name="type.amenity.music_school">בית ספר למוזיקה</string>
+ <string name="type.amenity.language_school">בית ספר לשפות</string>
+ <string name="type.office.diplomatic">שגרירות</string>
+ <string name="type.amenity.fast_food">מזון מהיר</string>
+ <string name="type.amenity.fire_station">תחנת כיבוי אש</string>
+ <string name="type.amenity.fountain">מזרקה</string>
+ <string name="type.amenity.fuel">תחנת דלק</string>
+ <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+ <string name="type.amenity.grave_yard">בית קברות</string>
+ <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+ <string name="type.amenity.grave_yard.christian">בית קברות נוצרי</string>
+ <string name="type.amenity.hospital">בית חולים</string>
+ <string name="type.amenity.ice_cream">גלידה</string>
+ <string name="type.amenity.internet_cafe">קפה אינטרנט</string>
+ <string name="type.amenity.kindergarten">גן ילדים</string>
+ <string name="type.amenity.library">ספריה</string>
<string name="type.amenity.loading_dock">רציף טעינה</string>
- <string name="type.amenity.parking">היָנָחֲ</string>
- <string name="type.amenity.parking.fee">היָנָחֲ</string>
- <string name="type.amenity.parking.multi.storey">תומוק בר הינח</string>
- <string name="type.amenity.parking.multi.storey.fee">תומוק בר הינח</string>
- <string name="type.amenity.parking.no.access">תיטרפ הינח</string>
- <string name="type.amenity.parking.permissive">תיטרפ הינח</string>
- <string name="type.amenity.parking.private">תיטרפ הינח</string>
- <string name="type.amenity.parking.underground">תיעקרק - תת הינח</string>
- <string name="type.amenity.parking.underground.fee">תיעקרק - תת הינח</string>
+ <string name="type.amenity.marketplace">זירת מסחר</string>
+ <string name="type.amenity.motorcycle_parking">חניית אופנועים</string>
+ <string name="type.amenity.nightclub">מועדון לילה</string>
+ <string name="type.amenity.parking">חניה</string>
+ <string name="type.amenity.parking.fee">חניה</string>
+ <string name="type.amenity.parking.multi.storey">חניון רב קומות</string>
+ <string name="type.amenity.parking.multi.storey.fee">חניון רב קומות</string>
+ <string name="type.amenity.parking.no.access">חניה פרטית</string>
+ <string name="type.amenity.parking.permissive">חניה פרטית</string>
+ <string name="type.amenity.parking.private">חניה פרטית</string>
+ <string name="type.amenity.parking.park_and_ride">חניית חנה וסע</string>
+ <string name="type.amenity.parking.underground">חניה תת קרקעית</string>
+ <string name="type.amenity.parking.underground.fee">חניה תת קרקעית</string>
<string name="type.amenity.parking.underground.private">חניה תת קרקעית פרטית</string>
<string name="type.amenity.parking.street_side">חניה בצד הרחוב</string>
<string name="type.amenity.parking.street_side.fee">חניה בצד הרחוב</string>
@@ -858,15 +907,46 @@
<string name="type.amenity.parking.lane">חנייה בנתיב</string>
<string name="type.amenity.parking.lane.fee">חנייה בנתיב</string>
<string name="type.amenity.parking.lane.private">חניה פרטית בנתיב</string>
- <string name="type.amenity.parking_entrance">הינחל הסינכ</string>
+ <string name="type.amenity.parking_entrance">כניסה לחניה</string>
<string name="type.amenity.parking_entrance.private">כניסה פרטית לחניה</string>
- <string name="type.amenity.parking_entrance.permissive">הינחל הסינכ</string>
- <string name="type.amenity.parking_space.disabled">םיכנל הינח</string>
+ <string name="type.amenity.parking_entrance.permissive">כניסה לחניה</string>
+ <string name="type.amenity.parking_space">מקום חניה</string>
+ <string name="type.amenity.parking_space.permissive">מקום חניה</string>
+ <string name="type.amenity.parking_space.private">מקום חניה</string>
+ <string name="type.amenity.parking_space.underground">מקום חניה</string>
+ <string name="type.amenity.parking_space.disabled">חניה לנכים</string>
+ <string name="type.amenity.payment_terminal">מסוף תשלום</string>
+ <string name="type.amenity.pharmacy">בית מרקחת</string>
+ <string name="type.amenity.place_of_worship">מקום דתי</string>
+ <string name="type.amenity.place_of_worship.christian">כנסיה</string>
<string name="type.amenity.place_of_worship.christian.mormon">כנסיית ישוע המשיח של קדושי אחרון הימים</string>
- <string name="type.amenity.place_of_worship.christian.jehovahs_witness">בית הכנסת של עדי יהוה</string>
+ <string name="type.amenity.place_of_worship.christian.jehovahs_witness">כנסיה של עדי יהוה</string>
+ <string name="type.amenity.place_of_worship.jewish">בית כנסת</string>
+ <string name="type.amenity.place_of_worship.muslim">מסגד</string>
+ <string name="type.amenity.police">משטרה</string>
+ <string name="type.amenity.post_box">תיבת דואר</string>
+ <string name="type.amenity.post_office">דואר</string>
+ <string name="type.amenity.prison">בית כלא</string>
+ <string name="type.amenity.pub">פאב</string>
<!-- SECTION: Types: Recycling -->
- <string name="type.recycling.batteries">תוללוס</string>
+ <string name="type.amenity.recycling.centre">מרכז מיחזור</string>
+ <string name="type.amenity.recycling">מיכל מיחזור</string>
+ <string name="type.amenity.recycling.container">מיכל מיחזור</string>
+ <string name="type.recycling.batteries">סוללות</string>
+ <string name="type.recycling.clothes">בגדים</string>
+ <string name="type.recycling.glass_bottles">בקבוקי זכוכית</string>
+ <string name="type.recycling.paper">נייר</string>
+ <string name="type.recycling.plastic">פלסטיק</string>
+ <string name="type.recycling.plastic_bottles">בקבוקי פלסטיק</string>
+ <string name="type.recycling.scrap_metal">גרוטאות מתכת</string>
+ <string name="type.recycling.small_appliances">פסולת אלקטרונית</string>
+ <string name="type.recycling.cardboard">קרטון</string>
+ <string name="type.recycling.cans">פחיות</string>
+ <string name="type.recycling.shoes">נעליים</string>
+ <string name="type.recycling.green_waste">פסולת אורגנית/ירוקה</string>
+ <string name="type.amenity.restaurant">מסעדה</string>
+ <string name="type.amenity.school">בית ספר</string>
<!-- Weather shelter (including sun shelters and natural rock shelters). -->
<string name="type.amenity.shelter">מחסה</string>
<!-- A weather shelter by the public transport stop. -->
@@ -876,7 +956,21 @@
<!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
<string name="type.amenity.shelter.lean_to">מחסה ללינה</string>
<string name="type.amenity.public_bath">אמבטיה ציבורית</string>
+ <string name="type.amenity.shower">מקלחת</string>
<string name="type.amenity.stripclub">מועדון חשפנות</string>
+ <string name="type.amenity.taxi">תחנת מוניות</string>
+ <string name="type.amenity.telephone">טלפון</string>
+ <string name="type.amenity.theatre">תיאטרון</string>
+ <string name="type.amenity.toilets">שירותים</string>
+ <string name="type.toilets.yes">שירותים</string>
+ <string name="type.amenity.townhall">בית העיריה</string>
+ <string name="type.amenity.university">אוניברסיטה</string>
+ <string name="type.amenity.vending_machine">מכונת ממכר אוטומטית</string>
+ <string name="type.amenity.vending_machine.cigarettes">מכונה לממכר סיגריות</string>
+ <string name="type.amenity.vending_machine.coffee">מכונה לממכר קפה</string>
+ <string name="type.amenity.vending_machine.newspapers">מתקן עיתונים</string>
+ <string name="type.amenity.vending_machine.parking_tickets">מדחן</string>
+ <string name="type.amenity.vending_machine.public_transport_tickets">מכונת כרטיסים</string>
<string name="type.amenity.vehicle_inspection">לבדיקה טכנית</string>
<string name="type.barrier.city_wall">חומת העיר</string>
<string name="type.waterway.ditch">תעלת ניקוז</string>
@@ -1162,6 +1256,10 @@
<string name="type.historic.wayside_shrine">מקדש בצד הדרך</string>
<string name="type.historic.wreck">לְנַפֵּץ</string>
<string name="type.landuse.basin">אגן מים</string>
+ <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+ <string name="type.landuse.cemetery">בית קברות</string>
+ <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+ <string name="type.landuse.cemetery.christian">בית קברות נוצרי</string>
<string name="type.landuse.flowerbed">מיטת פרחים</string>
<string name="type.leisure.dance">םידוקיר םלוא</string>
<string name="type.leisure.hackerspace">האקרספייס</string>
@@ -1304,6 +1402,7 @@
<string name="type.shop.rental">חנות להשכרה</string>
<string name="type.shop.rental.bicycle">חנות להשכרת אופניים</string>
<string name="type.shop.second_hand">היינש די תונח</string>
+ <string name="type.shop.shoes">חנות נעליים</string>
<string name="type.shop.agrarian">חנות חקלאית</string>
<string name="type.shop.antiques">תוֹקיתִעַ</string>
<string name="type.shop.appliance">חנות מוצרי חשמל</string>
@@ -1362,6 +1461,7 @@
<string name="type.sport.field_hockey">הדש יקוה</string>
<string name="type.sport.badminton">תיצונ</string>
<string name="type.sport.pelota">תיקסאב הטלפ</string>
+ <string name="type.tourism">תיירות</string>
<string name="type.tourism.aquarium">אַקוַרִיוּם</string>
<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
<string name="type.tourism.alpine_hut">בקתת הרים</string>
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 3cf8010660..4fe378a96d 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1400,19 +1400,19 @@
"type.aeroway" = "Airspace Infrastructure";
-"type.aeroway.aerodrome" = "Airport";
+"type.aeroway.aerodrome" = "שדה תעופה";
-"type.aeroway.aerodrome.international" = "International Airport";
+"type.aeroway.aerodrome.international" = "שדה תעופה בינלאומי";
-"type.aeroway.apron" = "Apron";
+"type.aeroway.apron" = "חניית מטוסים";
-"type.aeroway.gate" = "Gate";
+"type.aeroway.gate" = "שער";
-"type.aeroway.helipad" = "Helipad";
+"type.aeroway.helipad" = "מנחת מסוקים";
-"type.aeroway.runway" = "Runway";
+"type.aeroway.runway" = "מסלול המראה";
-"type.aeroway.taxiway" = "Taxiway";
+"type.aeroway.taxiway" = "מסלול הסעה";
"type.aeroway.terminal" = "Terminal";
@@ -1420,39 +1420,39 @@
"type.amenity.arts_centre" = "Arts Center";
-"type.amenity.atm" = "ATM";
+"type.amenity.atm" = "כספומט";
-"type.amenity.bank" = "Bank";
+"type.amenity.bank" = "בנק";
-"type.amenity.bar" = "Bar";
+"type.amenity.bar" = "בר";
"type.amenity.bbq" = "מנגל";
-"type.amenity.bench" = "Bench";
+"type.amenity.bench" = "ספסל";
-"type.amenity.bicycle_parking" = "Bicycle Parking";
+"type.amenity.bicycle_parking" = "חניית אופניים";
-"type.amenity.bicycle_rental" = "Bicycle Rental";
+"type.amenity.bicycle_rental" = "השכרת אופניים";
-"type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
+"type.amenity.bicycle_repair_station" = "תחנת תיקון אופניים";
"type.amenity.biergarten" = "Biergarten";
-"type.amenity.brothel" = "Brothel";
+"type.amenity.brothel" = "בית בושת";
"type.amenity.bureau_de_change" = "Currency Exchange";
-"type.amenity.bus_station" = "Bus Station";
+"type.amenity.bus_station" = "תחנת אוטובוס";
-"type.amenity.cafe" = "Cafe";
+"type.amenity.cafe" = "קפה";
-"type.amenity.car_rental" = "Car Rental";
+"type.amenity.car_rental" = "השכרת רכב";
-"type.amenity.car_sharing" = "Car Sharing";
+"type.amenity.car_sharing" = "רכב שיתופי";
-"type.amenity.car_wash" = "Car Wash";
+"type.amenity.car_wash" = "שטיפת רכב";
-"type.amenity.casino" = "Casino";
+"type.amenity.casino" = "קזינו";
"type.amenity.gambling" = "הימורים";
@@ -1460,7 +1460,7 @@
"type.leisure.amusement_arcade" = "מִקמֶרֶת";
-"type.amenity.charging_station" = "Charging Station";
+"type.amenity.charging_station" = "תחנת טעינה";
"type.amenity.charging_station.bicycle" = "תחנת טעינה לאופניים";
@@ -1468,101 +1468,101 @@
"type.amenity.childcare" = "Nursery";
-"type.amenity.cinema" = "Cinema";
+"type.amenity.cinema" = "קולנוע";
-"type.leisure.bowling_alley" = "גנילואב םלוא";
+"type.leisure.bowling_alley" = "אולם באולינג";
-"type.amenity.clinic" = "Clinic";
+"type.amenity.clinic" = "מרפאה";
-"type.amenity.college" = "College";
+"type.amenity.college" = "מכללה";
-"type.amenity.community_centre" = "Community Centre";
+"type.amenity.community_centre" = "מרכז קהילתי";
"type.amenity.compressed_air" = "אוויר דחוס";
"type.amenity.conference_centre" = "מרכז כנסים";
-"type.amenity.courthouse" = "Courthouse";
+"type.amenity.courthouse" = "בית המשפט";
"type.amenity.dentist" = "Dentist";
-"type.amenity.doctors" = "Doctor";
+"type.amenity.doctors" = "רופא";
-"type.amenity.drinking_water" = "Drinking Water";
+"type.amenity.drinking_water" = "מי שתיה";
-"type.drinking_water.yes" = "Drinking Water";
+"type.drinking_water.yes" = "מי שתיה";
-"type.amenity.driving_school" = "Driving School";
+"type.amenity.driving_school" = "בית ספר לנהיגה";
"type.amenity.exhibition_centre" = "מרכז תערוכה";
"type.amenity.money_transfer" = "העברת כספים";
-"type.amenity.music_school" = "הקיזומל רפס תיב";
+"type.amenity.music_school" = "בית ספר למוזיקה";
-"type.amenity.language_school" = "תופשל רפס תיב";
+"type.amenity.language_school" = "בית ספר לשפות";
-"type.office.diplomatic" = "Embassy";
+"type.office.diplomatic" = "שגרירות";
-"type.amenity.fast_food" = "Fast Food";
+"type.amenity.fast_food" = "מזון מהיר";
"type.amenity.ferry_terminal" = "Ferry";
-"type.amenity.fire_station" = "Fire Station";
+"type.amenity.fire_station" = "תחנת כיבוי אש";
"type.amenity.food_court" = "Food Court";
-"type.amenity.fountain" = "Fountain";
+"type.amenity.fountain" = "מזרקה";
-"type.amenity.fuel" = "Gas Station";
+"type.amenity.fuel" = "תחנת דלק";
/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard" = "Graveyard";
+"type.amenity.grave_yard" = "בית קברות";
/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard.christian" = "Graveyard";
+"type.amenity.grave_yard.christian" = "בית קברות נוצרי";
-"type.amenity.hospital" = "Hospital";
+"type.amenity.hospital" = "בית חולים";
"type.amenity.hunting_stand" = "Hunting Stand";
-"type.amenity.ice_cream" = "Ice Cream";
+"type.amenity.ice_cream" = "גלידה";
-"type.amenity.internet_cafe" = "Internet Cafe";
+"type.amenity.internet_cafe" = "קפה אינטרנט";
-"type.amenity.kindergarten" = "Kindergarten";
+"type.amenity.kindergarten" = "גן ילדים";
-"type.amenity.library" = "Library";
+"type.amenity.library" = "ספריה";
"type.amenity.loading_dock" = "רציף טעינה";
-"type.amenity.marketplace" = "Marketplace";
+"type.amenity.marketplace" = "זירת מסחר";
-"type.amenity.motorcycle_parking" = "Motorcycle Parking";
+"type.amenity.motorcycle_parking" = "חניית אופנועים";
-"type.amenity.nightclub" = "Nightclub";
+"type.amenity.nightclub" = "מועדון לילה";
"type.amenity.nursing_home" = "Nursing Home";
-"type.amenity.parking" = "היָנָחֲ";
+"type.amenity.parking" = "חניה";
-"type.amenity.parking.fee" = "היָנָחֲ";
+"type.amenity.parking.fee" = "חניה";
-"type.amenity.parking.multi.storey" = "תומוק בר הינח";
+"type.amenity.parking.multi.storey" = "חניון רב קומות";
-"type.amenity.parking.multi.storey.fee" = "תומוק בר הינח";
+"type.amenity.parking.multi.storey.fee" = "חניון רב קומות";
-"type.amenity.parking.no.access" = "תיטרפ הינח";
+"type.amenity.parking.no.access" = "חניה פרטית";
-"type.amenity.parking.permissive" = "תיטרפ הינח";
+"type.amenity.parking.permissive" = "חניה פרטית";
-"type.amenity.parking.private" = "תיטרפ הינח";
+"type.amenity.parking.private" = "חניה פרטית";
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "חניית חנה וסע";
-"type.amenity.parking.underground" = "תיעקרק - תת הינח";
+"type.amenity.parking.underground" = "חניה תת קרקעית";
-"type.amenity.parking.underground.fee" = "תיעקרק - תת הינח";
+"type.amenity.parking.underground.fee" = "חניה תת קרקעית";
"type.amenity.parking.underground.private" = "חניה תת קרקעית פרטית";
@@ -1578,98 +1578,98 @@
"type.amenity.parking.lane.private" = "חניה פרטית בנתיב";
-"type.amenity.parking_entrance" = "הינחל הסינכ";
+"type.amenity.parking_entrance" = "כניסה לחניה";
"type.amenity.parking_entrance.private" = "כניסה פרטית לחניה";
-"type.amenity.parking_entrance.permissive" = "הינחל הסינכ";
+"type.amenity.parking_entrance.permissive" = "כניסה לחניה";
-"type.amenity.parking_space" = "Parking Space";
+"type.amenity.parking_space" = "מקום חניה";
-"type.amenity.parking_space.permissive" = "Parking Space";
+"type.amenity.parking_space.permissive" = "מקום חניה";
-"type.amenity.parking_space.private" = "Parking Space";
+"type.amenity.parking_space.private" = "מקום חניה";
-"type.amenity.parking_space.underground" = "Parking Space";
+"type.amenity.parking_space.underground" = "מקום חניה";
-"type.amenity.parking_space.disabled" = "םיכנל הינח";
+"type.amenity.parking_space.disabled" = "חניה לנכים";
-"type.amenity.payment_terminal" = "Payment Terminal";
+"type.amenity.payment_terminal" = "מסוף תשלום";
-"type.amenity.pharmacy" = "Pharmacy";
+"type.amenity.pharmacy" = "בית מרקחת";
-"type.amenity.place_of_worship" = "Place of Worship";
+"type.amenity.place_of_worship" = "מקום דתי";
"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
-"type.amenity.place_of_worship.christian" = "Church";
+"type.amenity.place_of_worship.christian" = "כנסיה";
"type.amenity.place_of_worship.christian.mormon" = "כנסיית ישוע המשיח של קדושי אחרון הימים";
-"type.amenity.place_of_worship.christian.jehovahs_witness" = "בית הכנסת של עדי יהוה";
+"type.amenity.place_of_worship.christian.jehovahs_witness" = "כנסיה של עדי יהוה";
"type.amenity.place_of_worship.hindu" = "Hindu Temple";
-"type.amenity.place_of_worship.jewish" = "Synagogue";
+"type.amenity.place_of_worship.jewish" = "בית כנסת";
-"type.amenity.place_of_worship.muslim" = "Mosque";
+"type.amenity.place_of_worship.muslim" = "מסגד";
"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
"type.amenity.place_of_worship.taoist" = "Taoist Temple";
-"type.amenity.police" = "Police";
+"type.amenity.police" = "משטרה";
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "תיבת דואר";
-"type.amenity.post_office" = "Post Office";
+"type.amenity.post_office" = "דואר";
-"type.amenity.prison" = "Prison";
+"type.amenity.prison" = "בית כלא";
-"type.amenity.pub" = "Pub";
+"type.amenity.pub" = "פאב";
"type.amenity.public_bookcase" = "Book Exchange";
/********** Types: Recycling **********/
-"type.amenity.recycling.centre" = "Recycling Center";
+"type.amenity.recycling.centre" = "מרכז מיחזור";
-"type.amenity.recycling" = "Recycling Container";
+"type.amenity.recycling" = "מיכל מיחזור";
-"type.amenity.recycling.container" = "Recycling Container";
+"type.amenity.recycling.container" = "מיכל מיחזור";
-"type.recycling.batteries" = "תוללוס";
+"type.recycling.batteries" = "סוללות";
-"type.recycling.clothes" = "Clothes";
+"type.recycling.clothes" = "בגדים";
-"type.recycling.glass_bottles" = "Glass Bottles";
+"type.recycling.glass_bottles" = "בקבוקי זכוכית";
-"type.recycling.paper" = "Paper";
+"type.recycling.paper" = "נייר";
-"type.recycling.plastic" = "Plastic";
+"type.recycling.plastic" = "פלסטיק";
-"type.recycling.plastic_bottles" = "Plastic Bottles";
+"type.recycling.plastic_bottles" = "בקבוקי פלסטיק";
-"type.recycling.scrap_metal" = "Scrap Metal";
+"type.recycling.scrap_metal" = "גרוטאות מתכת";
-"type.recycling.small_appliances" = "Electronic Waste";
+"type.recycling.small_appliances" = "פסולת אלקטרונית";
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "קרטון";
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "פחיות";
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "נעליים";
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "פסולת אורגנית/ירוקה";
"type.recycling.cartons" = "Cartons";
-"type.amenity.restaurant" = "Restaurant";
+"type.amenity.restaurant" = "מסעדה";
"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
-"type.amenity.school" = "School";
+"type.amenity.school" = "בית ספר";
/* Weather shelter (including sun shelters and natural rock shelters). */
"type.amenity.shelter" = "מחסה";
@@ -1685,29 +1685,29 @@
"type.amenity.public_bath" = "אמבטיה ציבורית";
-"type.amenity.shower" = "Shower";
+"type.amenity.shower" = "מקלחת";
"type.amenity.stripclub" = "מועדון חשפנות";
-"type.amenity.taxi" = "Taxi Stand";
+"type.amenity.taxi" = "תחנת מוניות";
-"type.amenity.telephone" = "Phone";
+"type.amenity.telephone" = "טלפון";
-"type.amenity.theatre" = "Theatre";
+"type.amenity.theatre" = "תיאטרון";
-"type.amenity.toilets" = "Toilet";
+"type.amenity.toilets" = "שירותים";
-"type.toilets.yes" = "Toilet";
+"type.toilets.yes" = "שירותים";
-"type.amenity.townhall" = "Town Hall";
+"type.amenity.townhall" = "בית העיריה";
-"type.amenity.university" = "University";
+"type.amenity.university" = "אוניברסיטה";
-"type.amenity.vending_machine" = "Vending Machine";
+"type.amenity.vending_machine" = "מכונת ממכר אוטומטית";
-"type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser";
+"type.amenity.vending_machine.cigarettes" = "מכונה לממכר סיגריות";
-"type.amenity.vending_machine.coffee" = "Coffee Dispenser";
+"type.amenity.vending_machine.coffee" = "מכונה לממכר קפה";
"type.amenity.vending_machine.condoms" = "Condoms Dispenser";
@@ -1715,11 +1715,11 @@
"type.amenity.vending_machine.food" = "Food Dispenser";
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "מתקן עיתונים";
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "מדחן";
-"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
+"type.amenity.vending_machine.public_transport_tickets" = "מכונת כרטיסים";
"type.amenity.vending_machine.sweets" = "Sweets Dispenser";
@@ -2512,10 +2512,10 @@
"type.landuse.brownfield" = "Brownfield";
/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.landuse.cemetery" = "Graveyard";
+"type.landuse.cemetery" = "בית קברות";
/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.landuse.cemetery.christian" = "Graveyard";
+"type.landuse.cemetery.christian" = "בית קברות נוצרי";
"type.landuse.churchyard" = "Churchyard";
@@ -3655,7 +3655,7 @@
"type.shop.second_hand" = "היינש די תונח";
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "חנות נעליים";
"type.shop.sports" = "Sports Shop";
@@ -3805,7 +3805,7 @@
"type.sport.pelota" = "תיקסאב הטלפ";
-"type.tourism" = "Tourism";
+"type.tourism" = "תיירות";
"type.tourism.aquarium" = "אַקוַרִיוּם";
--
2.45.3
From ee4c525877c2801a56e6b2e2b71d7fb1e111a51f Mon Sep 17 00:00:00 2001
From: Sergiy Kozyr <s.trump@gmail.com>
Date: Fri, 9 Aug 2024 11:04:16 +0300
Subject: [PATCH 4/8] Fixed speed limit display
Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
---
.../src/main/java/app/organicmaps/widget/menu/NavMenu.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 6c32e729f1..3416a6ec52 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -218,8 +218,8 @@ public class NavMenu
if (mCurrentSpeedLimit > 0.0)
{
- Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
- mSpeedValue.setText(speedAndUnits.first + " / " + speedLimitAndUnits.first);
+ Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(mCurrentSpeedLimit);
+ mSpeedValue.setText(speedAndUnits.first + "\u202F/\u202F" + speedLimitAndUnits.first);
}
else
mSpeedValue.setText(speedAndUnits.first);
--
2.45.3
From 39a6a0ca14d3f4b3c3434e71e69768c772c37109 Mon Sep 17 00:00:00 2001
From: Sergiy Kozyr <s.trump@gmail.com>
Date: Wed, 14 Aug 2024 11:38:02 +0300
Subject: [PATCH 5/8] Removed red background for speedometer
Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
---
.../java/app/organicmaps/widget/menu/NavMenu.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 3416a6ec52..92fabe9d15 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -49,8 +49,6 @@ public class NavMenu
private final NavMenuListener mNavMenuListener;
private int currentPeekHeight = 0;
- private double mCurrentSpeedLimit;
- private boolean mIsSpeedLimitExceeded = false;
public interface OnMenuSizeChangedListener
@@ -216,21 +214,20 @@ public class NavMenu
Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
- if (mCurrentSpeedLimit > 0.0)
+ if (info.speedLimitMps > 0.0)
{
- Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(mCurrentSpeedLimit);
+ Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(info.speedLimitMps);
mSpeedValue.setText(speedAndUnits.first + "\u202F/\u202F" + speedLimitAndUnits.first);
}
else
mSpeedValue.setText(speedAndUnits.first);
- if (mIsSpeedLimitExceeded)
+ if (info.isSpeedLimitExceeded())
mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
else
mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));
mSpeedUnits.setText(speedAndUnits.second);
- mSpeedViewContainer.setActivated(info.isSpeedLimitExceeded());
}
public void update(@NonNull RoutingInfo info)
@@ -240,8 +237,6 @@ public class NavMenu
mDistanceValue.setText(info.distToTarget.mDistanceStr);
mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));
mRouteProgress.setProgressCompat((int) info.completionPercent, true);
- mCurrentSpeedLimit = info.speedLimitMps;
- mIsSpeedLimitExceeded = info.isSpeedLimitExceeded();
}
public interface NavMenuListener
--
2.45.3
From 8bcdeb9b77799a4bfd70209ed90fd99e44fd33ea Mon Sep 17 00:00:00 2001
From: Sergiy Kozyr <s.trump@gmail.com>
Date: Wed, 14 Aug 2024 16:06:05 +0300
Subject: [PATCH 6/8] Renamed `isSpeedLimitExceeded` to
`isSpeedCamLimitExceeded`. Fixed speed value color when background is red.
Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
---
.../java/app/organicmaps/routing/RoutingInfo.java | 8 ++++----
.../java/app/organicmaps/widget/menu/NavMenu.java | 12 ++++++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java b/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
index afb238a826..6b0a393783 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java
@@ -37,7 +37,7 @@ public class RoutingInfo
// Current speed limit in meters per second.
// If no info about speed limit then speedLimitMps < 0.
public final double speedLimitMps;
- private final boolean speedLimitExceeded;
+ private final boolean speedCamLimitExceeded;
private final boolean shouldPlayWarningSignal;
/**
@@ -159,13 +159,13 @@ public class RoutingInfo
this.exitNum = exitNum;
this.pedestrianTurnDirection = PedestrianTurnDirection.values()[pedestrianTurnOrdinal];
this.speedLimitMps = speedLimitMps;
- this.speedLimitExceeded = speedLimitExceeded;
+ this.speedCamLimitExceeded = speedLimitExceeded;
this.shouldPlayWarningSignal = shouldPlayWarningSignal;
}
- public boolean isSpeedLimitExceeded()
+ public boolean isSpeedCamLimitExceeded()
{
- return speedLimitExceeded;
+ return speedCamLimitExceeded;
}
public boolean shouldPlayWarningSignal()
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 92fabe9d15..392fa838f6 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -222,12 +222,20 @@ public class NavMenu
else
mSpeedValue.setText(speedAndUnits.first);
- if (info.isSpeedLimitExceeded())
- mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
+ if (last.getSpeed() > info.speedLimitMps)
+ {
+ if (info.isSpeedCamLimitExceeded())
+ // White text on red background for camera speeding
+ mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
+ else
+ // Black text for speeding if there's no camera
+ mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
+ }
else
mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));
mSpeedUnits.setText(speedAndUnits.second);
+ mSpeedViewContainer.setActivated(info.isSpeedCamLimitExceeded());
}
public void update(@NonNull RoutingInfo info)
--
2.45.3
From 1993a2b9dc293fe4969162e4745cb089f10ac075 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Date: Thu, 15 Aug 2024 12:22:44 +0200
Subject: [PATCH 7/8] Update
android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
---
.../app/src/main/java/app/organicmaps/widget/menu/NavMenu.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 392fa838f6..e01639a5fa 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -225,7 +225,6 @@ public class NavMenu
if (last.getSpeed() > info.speedLimitMps)
{
if (info.isSpeedCamLimitExceeded())
- // White text on red background for camera speeding
mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
else
// Black text for speeding if there's no camera
--
2.45.3
From 050e853dd4aece3da0df6214e059f0d3cba27950 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Date: Thu, 15 Aug 2024 12:22:50 +0200
Subject: [PATCH 8/8] Update
android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
---
.../app/src/main/java/app/organicmaps/widget/menu/NavMenu.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index e01639a5fa..e6404012ff 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -227,7 +227,6 @@ public class NavMenu
if (info.isSpeedCamLimitExceeded())
mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
else
- // Black text for speeding if there's no camera
mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
}
else
--
2.45.3