[CarPlay] bug fixes, navigation hierarchy changes, icons and localization fixes

data/strings/strings.txt

@@ -40406,38 +40406,38 @@
     fa = امکان ایجاد مسیر نیست. لطفاً نقاط مسیر دیگری را مشخص کنید
 
   [dialog_routing_download_files_carplay]
-    en = Some maps required for planning the route are not present. Please, download them on your mobile device
-    ru = Не все карты, необходимые для построения маршрута, доступны. Пожалуйста, скачайте их в приложении на мобильном устройстве
-    ar = لا تتواجد جميع الخرائط من أجل تحديد طريق. يرجى تحميلهم على هاتفك المحمول
-    cs = K sestavení trasy nejsou přítomny žádné mapy. Stáhněte si je prosím na váš mobilní telefon
-    da = Der mangler kort for at beregne en rute. Download dem på din mobiltelefon
-    nl = Niet alle kaarten zijn beschikbaar voor het opbouwen van een route. Download ze in de applicatie op uw smartphone
-    fi = Kaikki kartat eivät ole käytettävissä reitin luomiseen. Lataa ne puhelimen sovellukseen
-    fr = Pas toutes les cartes sont disponibles pour tracer un itinéraire. Téléchargez-les dans l'application sur le téléphone
-    de = Nicht alle Karten sind für Routenplanung zugänglich. Laden Sie sie in der App auf Ihrem Handy herunter
-    hu = Nincs meg minden térkép egy útvonal tervezéséhez. Kérjük töltsd le a mobiltelefonodra őket
-    id = Tidak semua peta dapat dibuat rute. Silakan unduh peta ke ponsel Anda
-    it = Non tutte le mappe sono disponibili per pianificare il percorso. Scaricale in App
-    ja = ルートを構築するために全てのマップが表示されているわけではありません。携帯電話にそれらをダウンロードしてください
-    ko = 모든 지도가 경로를 만들기 위해 존재하는 것은 아닙니다. 귀하의 모바일 폰으로 지도들을 다운로드 해주세요
-    nb = Ikke alle kart tilgjengeliig for å planlegge rute. Vennligst last dem ned på din mobil
-    pl = Nie wszystkie mapy są dostępne do budowania trasy. Pobierz je w aplikacji na telefon
-    pt = Alguns mapas estão indisponíveis para criar percurso. Baixe-os no aplicação do telefone
-    pt-BR = Não é possível traçar rotas em todos os mapas. Por favor, baixe-os em seu celular
-    ro = Nu toate hărțile sunt accesibile pentru elaborarea traseului. Descărcați-le în aplicația de pe telefon
-    es = No todos los mapas están disponibles para trazar una ruta. Descárgalos en la aplicación de tu teléfono
-    es-MX = No todos los mapas están disponibles para construir una ruta. Descárguelos en la aplicación de su teléfono
-    sv = Inte alla kartor finns tillgängliga för att bygga en rutt. Ladda ner dem i appen på telefonen
-    th = แผนที่ที่ใช้สร้างเส้นทางยังได้รับการโหลดไม่ครบ โปรดดาวน์โหลดแผนที่เหล่านั้นจากโทรศัพท์มือถือของคุณ
-    tr = Rota oluşturmak için gereken tüm haritalar mevcut değil. Lütfen bunları cep telefonunuza indirin
-    uk = Не всі карти доступні для побудування маршруту. Завантажте їх в додатку на телефоні
-    vi = Không phải tất cả bản đồ đều khả dụng để tạo tuyến đường. Hãy tải ứng dụng về điện thoại của bạn
-    el = Δεν είναι διαθέσιμοι όλοι οι χάρτες για τη δημιουργία της διαδρομής. Κατεβάστε τους από την εφαρμογή στο κινητό σας τηλέφωνο
-    sk = Nie všetky mapy sú k dispozícii pre vytvorenie trasy. Prosím stiahnite si ich na svojom mobilnom telefóne
-    sw = Ramani zote hazipo kuunda njia. Tafadhali zipakue kwenye simu yako ya mkononi
-    zh-Hans = 并非所有地图都可用于创建路线。请在手机的应用程序中下载它们
-    zh-Hant = 並非所有地圖都可用於創建路線。請在手機的應用程序中下載它們
-    fa = همه نقشه ها برای ایجاد یک مسیر موجود نیست. لطفا آنها را بر روی تلفن همراه خود دانلود کنید
+    en = To create a route, download missing maps on your device
+    ru = Чтобы построить маршрут, загрузите недостающие карты на своем устройстве
+    ar = كي تُنشئ مساراً، يجب أن تحمل الخرائط المفقودة على جهازك
+    cs = K vytvoření trasy si stáhněte chybějící mapy do vašeho zařízení
+    da = Download manglende kort til din enhed, for at lave ruten
+    nl = Om een route te bouwen, download u ontbrekende kaarten
+    fi = Luodaksesi reitin lataa puutt. kartat
+    fr = Pour créer la route, téléchargez les cartes sur votre appareil
+    de = Laden Sie die fehlenden Karten hoch, um die Route zu erstellen
+    hu = Útvonal létrehozásához töltsd le a hiányzó térképeket az eszközre
+    id = Untuk membuat rute, unduh peta baru di perangkat anda
+    it = Per creare percorso scarica mappe mancanti sul proprio dispositivo
+    ja = ルートを作成するには、地図に表示されていない部分を端末でダウンロードします
+    ko = 루트를 만들려면, 빠진 맵을 기기에 다운로드하세요
+    nb = For å beregne rute last ned manglende kart på enheten din
+    pl = Aby wyznaczyć trasę, pobierz brakujące mapy na Twoim urządzeniu
+    pt = Para construir percurso falta carregar os mapas no seu dispositivo
+    pt-BR = Para criar uma rota, baixe os mapas ausentes no seu dispositivo
+    ro = Pentru noi trasee, încărcați hărțile lipsa pe dispozitivul dvs.
+    es = Al construir ruta, descarga los mapas ausentes en tu dispositivo
+    es-MX = Al construir ruta, descargue los mapas ausentes en su dispositivo
+    sv = För att skapa en rutt, ladda ner saknade kartor på din enhet
+    th = เพื่อสร้างเส้นทาง โปรดดาวน์โหลดแผนที่บนอุปกรณ์ของคุณ
+    tr = Rota oluşturmak için cihazınızdaki eksik haritaları indirin
+    uk = Щоб побудувати маршрут, завантажте відсутні карти на своєму пристрої
+    vi = Để tạo tuyến đường, hãy tải xuống các bản đồ còn thiếu về thiết bị
+    el = Για να χτίσετε διαδρομή, κατεβάστε χάρτες που λείπουν στη συσκευή
+    sk = Pre vytvorenie trasy si stiahnite do zariadenia chýbajúce mapy
+    sw = Kuunda njia, pakua ramani zilizokosekana kwenye kifaa chako
+    zh-Hans = 为了创建线路，请在您的设备中下载所缺少的地图
+    zh-Hant = 爲了創建線路，請在您的設備中下載所缺少的地圖
+    fa = برای ایجاد مسیر، نقشه های ناقص را روی دستگاه خود را دانلود کنید
 
   [dialog_routing_system_error_carplay]
     en = An error occurred. Please restart the application
@@ -41974,3 +41974,343 @@
     zh-Hans = 我们优化了距离道路较远的目标地点的线路设置
     zh-Hant = 我們優化了距離道路較遠的目標地點的線路設置
     fa = مسیر برنامه ریزی به نقاطی دور از جاده‌ها بهبود داده ایم
+
+  [avoid_unpaved_carplay_1]
+    en = No dirt road
+    ru = Без грунт.
+    ar = غير ترابي
+    cs = Bez pr. cest
+    da = Ingen grus
+    nl = Geen aardew.
+    fi = Päällyste
+    fr = Route de ter
+    de = Ohne Landstr
+    hu = Nem földút
+    id = Jalan aspal
+    it = No sterrati
+    ja = 未舗装道路無し
+    ko = 비포장 도로 없음
+    nb = Ikke grusvei
+    pl = Bez gruntow.
+    pt = Sem rurais
+    pt-BR = Não pav.
+    ro = Fără neasfal
+    es = Sin de grava
+    es-MX = Sin de grava
+    sv = Utan kärrväg
+    th = ไม่มีลูกรัง
+    tr = Stabilizesiz
+    uk = Без ґрунт.
+    vi = Trừ đườg đất
+    el = Χ/χωματόδρ.
+    sk = Nespevn. NIE
+    sw = Hamna za vum
+    zh-Hans = 无土路路段
+    zh-Hant = 無土路路段
+    fa = بی جاده خاکی
+
+  [avoid_unpaved_carplay_2]
+    en = Avoid unpaved
+    ru = Без грунтовых
+    ar = تجنب غير الممهد
+    cs = Vyhnout se nezp
+    da = Undgå grus
+    nl = Geen aardewegen
+    fi = Vain päällyste
+    fr = Route de terre
+    de = Ohne Landstr.
+    hu = Földút kerülése
+    id = Hindari tanah
+    it = No sterrati
+    ja = 未舗装道路無し
+    ko = 비포장 도로 없음
+    nb = Ikke uasfaltert
+    pl = Bez gruntowych
+    pt = Sem rurais
+    pt-BR = Evitar não pav.
+    ro = Fără neasfaltat
+    es = Sin de grava
+    es-MX = Sin de grava
+    sv = Utan kärrvägar
+    th = หลีกเลี่ยงทาง
+    tr = Asfaltsız hariç
+    uk = Без ґрунтових
+    vi = Trừ khôg trnhựa
+    el = Χ/χωματόδρομους
+    sk = Nespevnené ÁNO
+    sw = Epuka za vumbi
+    zh-Hans = 无土路路段
+    zh-Hant = 無土路路段
+    fa = پرهیز از خاکی
+
+  [avoid_ferry_carplay_1]
+    en = No ferries
+    ru = Без паромов
+    ar = بدون عبََارة
+    cs = Bez trajektů
+    da = Ingen færger
+    nl = Geen ferry's
+    fi = Ei lauttoja
+    fr = Sans navires
+    de = Ohne Fähren
+    hu = Komp nélkül
+    id = Tanpa feri
+    it = No traghetti
+    ja = フェリー無し
+    ko = 여객선 없음
+    nb = Ingen ferger
+    pl = Bez promów
+    pt = Sem ferry
+    pt-BR = Sem balsas
+    ro = Fără bacuri
+    es = Sin ferri
+    es-MX = Sin ferri
+    sv = Utan färjor
+    th = ไม่มีเรือ
+    tr = Feribotsuz
+    uk = Без поромів
+    vi = Không có phà
+    el = Χ/πορθμεία
+    sk = Trajekty NIE
+    sw = Hamna feri
+    zh-Hans = 无渡船
+    zh-Hant = 無渡船
+    fa = بدون بزرگراه
+
+  [avoid_ferry_carplay_2]
+    en = Avoid ferries
+    ru = Без паромов
+    ar = تجنب العبََارة
+    cs = Vyh. se traj.
+    da = Undgå færger
+    nl = Geen ferry's
+    fi = Ei lauttoja
+    fr = Sans navires
+    de = Ohne Fähren
+    hu = Kompok kerülése
+    id = Hindari feri
+    it = No traghetti
+    ja = フェリーを回避
+    ko = 여객선 없음
+    nb = Unngå ferger
+    pl = Bez promów
+    pt = Sem ferry
+    pt-BR = Evitar balsas
+    ro = Fără bacuri
+    es = Sin ferri
+    es-MX = Sin ferri
+    sv = Utan färjor
+    th = หลีกเลี่ยงเรือ
+    tr = Feribot hariç
+    uk = Без поромів
+    vi = Trừ phà
+    el = Χωρίς πορθμεία
+    sk = Trajekty ÁNO
+    sw = Epuka feri
+    zh-Hans = 无渡船
+    zh-Hant = 無渡船
+    fa = پرهیز از اتوبان
+
+  [avoid_tolls_carplay_1]
+    en = No toll road
+    ru = Без платных
+    ar = بدون رسوم
+    cs = Bez pl.sil.
+    da = Ingen betal.
+    nl = Zonder tol
+    fi = Ei maksua
+    fr = Sans péage
+    de = Ohne kpf Str
+    hu = Nincs útdíj
+    id = Tanpa tol
+    it = No pedaggi
+    ja = 有料道路無し
+    ko = 유료 도로 없음
+    nb = Ingen bomvei
+    pl = Wył. płatne
+    pt = Sem pedágio
+    pt-BR = Sem pedágio
+    ro = Gratis
+    es = Sin peaje
+    es-MX = Sin peaje
+    sv = Utan betalda
+    th = ไม่มีค่าผ่าน
+    tr = Paralı yok
+    uk = Без платних
+    vi = Khôg đgcóphí
+    el = Χωρίς διόδια
+    sk = Spoplat. NIE
+    sw = Hamna za ada
+    zh-Hans = 无付费路段
+    zh-Hant = 無付費路段
+    fa = بدون عوارضی
+
+  [avoid_tolls_carplay_2]
+    en = Avoid toll road
+    ru = Без платных
+    ar = تجنب الرسوم
+    cs = Vyh. se pl. sil
+    da = Undgå betaling
+    nl = Zonder tol
+    fi = Ei maksua
+    fr = Sans péage
+    de = Ohne kpfl. Str.
+    hu = Útdíj kerülése
+    id = Hindari tol
+    it = Senza pedaggi
+    ja = 有料道路を回避
+    ko = 유료 도로 없음
+    nb = Unngå bomvei
+    pl = Wyłącz płatne
+    pt = Sem pedágio
+    pt-BR = Evitar pedágios
+    ro = Gratis
+    es = Sin peaje
+    es-MX = Sin peaje
+    sv = Utan betalda
+    th = เลี่ยงทางด่วน
+    tr = Paralı hariç
+    uk = Без платних
+    vi = Trừ đg có phí
+    el = Χωρίς διόδια
+    sk = Spoplatnené ÁNO
+    sw = Epuka njia-kodi
+    zh-Hans = 无付费路段
+    zh-Hant = 無付費路段
+    fa = اجتناب از عوارض
+
+  [speedcams_alert_title_carplay_1]
+    en = Speedсams
+    ru = Камеры
+    ar = كاميرا سريعة
+    cs = Rych. kam.
+    da = Radarkontrol
+    nl = Cameras
+    fi = Nopeuskamera
+    fr = Caméras
+    de = Blitzer
+    hu = Traffipaxok
+    id = Speedcam
+    it = Autovelox
+    ja = 速度警告
+    ko = 속도단속 카메라
+    nb = Kamera-info
+    pl = Kamery
+    pt = Radares
+    pt-BR = Radares
+    ro = Cameră video
+    es = Cám.velocid.
+    es-MX = Cám.velocid.
+    sv = Kameror
+    th = จับความเร็ว
+    tr = Hız kamerası
+    uk = Камери
+    vi = Сam tốc độ
+    el = Κάμερες
+    sk = Radary
+    sw = Kam za kasi
+    zh-Hans = 摄像头
+    zh-Hant = 攝像頭
+    fa = دوربین سرعت
+
+  [speedcams_alert_title_carplay_2]
+    en = Speed warnings
+    ru = Инфо о камерах
+    ar = تحذير سريع
+    cs = Rych. varování
+    da = Radar advarsel
+    nl = Over cameras
+    fi = Nopeuskamerat
+    fr = Info Caméras
+    de = Blitzerwarnung
+    hu = Sebességjelzés
+    id = Info kecepatan
+    it = Info autovelox
+    ja = 速度警告
+    ko = 속도단속 카메라
+    nb = Kamera-advarsel
+    pl = Info o kamerach
+    pt = Avisos de radar
+    pt-BR = Alertas de vel.
+    ro = Info camere
+    es = Alerta velocid.
+    es-MX = Alerta velocid.
+    sv = Info om kameror
+    th = เตือนความเร็ว
+    tr = Hız uyarıları
+    uk = Інфо о камерах
+    vi = Cảnh báo tốc độ
+    el = Πληροφ. γιαόρια
+    sk = Rýchl. upozorn.
+    sw = Onyo la kasi
+    zh-Hans = 摄像头信息
+    zh-Hant = 攝像頭信息
+    fa = هشدارهای سرعت
+
+  [download_map_carplay]
+    en = Please download maps in MAPS.ME app on your device
+    ru = Скачайте карты в приложении MAPS.ME на своем устройстве
+    ar = يُرجى تحميل الخرائط في تطبيق MAPS.ME على جهازك
+    cs = Stáhněte si prosím mapy do aplikace MAPS.ME ve vašem zařízení
+    da = Download kort i MAPS.ME appen, på din enhed
+    nl = Download kaarten in de MAPS.ME app op uw apparaat
+    fi = Lataa kartat laitteesi MAPS.ME-sovelluksessa
+    fr = Téléchargez des cartes dans l'application MAPS.ME sur votre appareil
+    de = Laden Sie Karten in der App MAPS.ME auf Ihrem Gerät herunter
+    hu = Kérjük, töltsd le a térképeket a MAPS.ME alkalmazásban az eszközödre
+    id = Silakan unduh peta di apl MAPS.ME pada perangkat Anda
+    it = Scarica l'applicazione MAPS.ME sul tuo smartphone
+    ja = あなたの機器のMAPS.MEのアプリにマップをダウンロードしてください
+    ko = MAPS.ME 앱 안의 지도들을 디바이스에 다운로드하세요
+    nb = Vennligst last ned kart i MAPS.ME appen på enheten din
+    pl = Pobierz mapy do aplikacji MAPS.ME na swoje urządzenie
+    pt = Baixar mapas de aplicação MAPS.ME para o seu dispositivo
+    pt-BR = Por favor, baixe mapas no app MAPS.ME em seu dispositivo
+    ro = Vă rugăm să descărcați hărțile în aplicația MAPS.ME de pe dispozitivul dvs.
+    es = Descarga mapas en la aplicación MAPS.ME en tu dispositivo
+    es-MX = Descargue mapas en la aplicación MAPS.ME en su dispositivo
+    sv = Ladda ner kartor i applikation MAPS.ME på din enhet
+    th = โปรดดาวน์โหลดแผนที่ในแอพฯ MAPS.ME บนอุปกรณ์ของคุณ
+    tr = Lütfen haritaları cihazınıza MAPS.ME uygulamasından indirin
+    uk = Завантажте карти в додатку MAPS.ME на своєму пристрої
+    vi = Vui lòng tải xuống bản đồ trong ứng dụng MAPS.ME trên thiết bị của bạn
+    el = Κάντε λήψη χαρτών στην εφαρμογή MAPS.ME στη συσκευή σας
+    sk = Prosím stiahnite si mapy v aplikácii MAPS.ME vo vašom zariadení
+    sw = Tafadhali pakua ramani katika programu tumizi ya MAPS.ME kwenye kifaa chako
+    zh-Hans = 将MAPS.ME软件中的地图下载至个人设备中
+    zh-Hant = 將MAPS.ME軟件中的地圖下載至個人設備中
+    fa = لطفا نقشه ها را در نرم افزار MAPS.ME روی دستگاه خود دانلود کنید
+
+  [carplay_roundabout_exit]
+    en = %s exit
+    ru = %s съезд
+    ar = المخرج رقم %s
+    cs = %s výjezd
+    da = %s exit
+    nl = Afrit nr. %s
+    fi = Poistumisramppi %s
+    fr = %s sortie
+    de = %s Ausfahrt
+    hu = %s kijárat
+    id = Jalan keluar ke %s
+    it = %s uscita
+    ja = 第%s出口
+    ko = %s번 출구
+    nb = %s avkjøring
+    pl = %s zjazd
+    pt = %s saída
+    pt-BR = %s saída
+    ro = %s ieșire
+    es = %s desviación
+    es-MX = %s desviación
+    sv = %s utgången
+    th = ทางออกที่ %s
+    tr = %s çıkış
+    uk = %s з’їзд
+    vi = Lối ra %s của vòng xuyến
+    el = %s έξοδος
+    sk = %s výjazd
+    sw = Kutoka kwa %s
+    zh-Hans = %s号坡道
+    zh-Hant = %s號坡道
+    fa = خروجی %s

iphone/Maps/Classes/CarPlay/CarPlayRouter.swift

@@ -237,7 +237,15 @@ extension CarPlayRouter {
     var maneuvers = [CPManeuver]()
     let primaryManeuver = CPManeuver()
     primaryManeuver.userInfo = CPConstants.Maneuvers.primary
-    primaryManeuver.instructionVariants = [routeInfo.streetName]
+    var instructionVariant = routeInfo.streetName
+    if routeInfo.roundExitNumber != 0 {
+      let ordinalExitNumber = NumberFormatter.localizedString(from: NSNumber(value: routeInfo.roundExitNumber),
+                                                              number: .ordinal)
+      let exitNumber = String(coreFormat: L("carplay_roundabout_exit"),
+                              arguments: [ordinalExitNumber])
+      instructionVariant = instructionVariant.isEmpty ? exitNumber : (exitNumber + ", " + instructionVariant)
+    }
+    primaryManeuver.instructionVariants = [instructionVariant]
     if let imageName = routeInfo.turnImageName,
       let symbol = UIImage(named: imageName) {
       primaryManeuver.symbolSet = CPImageSet(lightContentImage: symbol,

iphone/Maps/Classes/CarPlay/CarPlayService.swift

@@ -306,7 +306,7 @@ extension CarPlayService: CPMapTemplateDelegate {
     FrameworkHelper.stopLocationFollow()
   }
   
-  public func mapTemplateWillDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
+  public func mapTemplateDidDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
     if let info = mapTemplate.userInfo as? MapInfo,
       info.type == CPConstants.TemplateType.navigation {
       MapTemplateBuilder.configureNavigationUI(mapTemplate: mapTemplate)
@@ -535,13 +535,15 @@ extension CarPlayService: LocationModeListener {
     }
     switch mode {
     case .follow, .followAndRotate:
-      MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
+      if !rootMapTemplate.isPanningInterfaceVisible {
+        MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
+      }
     case .notFollow:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
       }
-    default:
-      break
+    case .pendingPosition, .notFollowNoPosition:
+      rootMapTemplate.leadingNavigationBarButtons = []
     }
   }
   
@@ -597,7 +599,11 @@ extension CarPlayService {
   
   func preparePreview(trips: [CPTrip]) {
     let mapTemplate = MapTemplateBuilder.buildTripPreviewTemplate(forTrips: trips)
-    pushTemplate(mapTemplate, animated: false)
+    if let interfaceController = interfaceController {
+      mapTemplate.mapDelegate = self
+      interfaceController.popToRootTemplate(animated: false)
+      interfaceController.pushTemplate(mapTemplate, animated: false)
+    }
   }
   
   func showPreview(mapTemplate: CPMapTemplate, trips: [CPTrip]) {
@@ -658,13 +664,23 @@ extension CarPlayService {
       titleVariants = ["\(L("dialog_routing_change_start_carplay"))"]
     case .endPointNotFound:
       titleVariants = ["\(L("dialog_routing_change_end_carplay"))"]
-    case .routeNotFoundRedressRouteError, .routeNotFound, .inconsistentMWMandRoute:
+    case .routeNotFoundRedressRouteError,
+         .routeNotFound,
+         .inconsistentMWMandRoute:
       titleVariants = ["\(L("dialog_routing_unable_locate_route_carplay"))"]
-    case .routeFileNotExist, .fileTooOld, .needMoreMaps, .pointsInDifferentMWM:
+    case .routeFileNotExist,
+         .fileTooOld,
+         .needMoreMaps,
+         .pointsInDifferentMWM:
       titleVariants = ["\(L("dialog_routing_download_files_carplay"))"]
-    case .internalError:
+    case .internalError,
+         .intermediatePointNotFound:
       titleVariants = ["\(L("dialog_routing_system_error_carplay"))"]
-    default:
+    case .noError,
+         .cancelled,
+         .hasWarnings,
+         .transitRouteNotFoundNoNetwork,
+         .transitRouteNotFoundTooLongPedestrian:
       return
     }
     
@@ -689,6 +705,7 @@ extension CarPlayService {
       self.interfaceController?.dismissTemplate(animated: true)
     })
     let noAction = CPAlertAction(title: L("cancel"), style: .cancel, handler: { [unowned self] _ in
+      FrameworkHelper.stopLocationFollow()
       self.router?.completeRouteAndRemovePoints()
       self.interfaceController?.dismissTemplate(animated: true)
     })

iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift

@@ -24,7 +24,8 @@ final class SettingsTemplateBuilder {
   private class func createTollButton(options: RoutingOptions) -> CPGridButton {
     var tollIconName = "ic_carplay_toll"
     if options.avoidToll { tollIconName += "_active" }
-    let tollButton = CPGridButton(titleVariants: [L("avoid_tolls")],
+    let tollButton = CPGridButton(titleVariants: [L("avoid_tolls_carplay_1"),
+                                                  L("avoid_tolls_carplay_2")],
                                   image: UIImage(named: tollIconName)!) { _ in
                                     options.avoidToll = !options.avoidToll
                                     options.save()
@@ -40,7 +41,8 @@ final class SettingsTemplateBuilder {
   private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton {
     var unpavedIconName = "ic_carplay_unpaved"
     if options.avoidDirty { unpavedIconName += "_active" }
-    let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")],
+    let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved_carplay_1"),
+                                                     L("avoid_unpaved_carplay_2")],
                                      image: UIImage(named: unpavedIconName)!) { _ in
                                       options.avoidDirty = !options.avoidDirty
                                       options.save()
@@ -56,7 +58,8 @@ final class SettingsTemplateBuilder {
   private class func createFerryButton(options: RoutingOptions) -> CPGridButton {
     var ferryIconName = "ic_carplay_ferry"
     if options.avoidFerry { ferryIconName += "_active" }
-    let ferryButton = CPGridButton(titleVariants: [L("avoid_ferry")],
+    let ferryButton = CPGridButton(titleVariants: [L("avoid_ferry_carplay_1"),
+                                                   L("avoid_ferry_carplay_2")],
                                    image: UIImage(named: ferryIconName)!) { _ in
                                     options.avoidFerry = !options.avoidFerry
                                     options.save()
@@ -88,7 +91,8 @@ final class SettingsTemplateBuilder {
     var speedcamIconName = "ic_carplay_speedcam"
     let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated
     if isSpeedCamActivated { speedcamIconName += "_active" }
-    let speedButton = CPGridButton(titleVariants: [L("speedcams_alert_title")],
+    let speedButton = CPGridButton(titleVariants: [L("speedcams_alert_title_carplay_1"),
+                                                   L("speedcams_alert_title_carplay_2")],
                                    image: UIImage(named: speedcamIconName)!) { _ in
                                     CarPlayService.shared.isSpeedCamActivated = !isSpeedCamActivated
                                     CarPlayService.shared.popTemplate(animated: true)

iphone/Maps/Classes/MapViewController.mm

@@ -96,7 +96,7 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
 @property(strong, nonatomic) IBOutlet NSLayoutConstraint * placePageAreaKeyboard;
 @property(strong, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaBottom;
 @property(strong, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaKeyboard;
-@property(strong, nonatomic) IBOutlet UILabel * carplayPlaceholderLabel;
+@property(strong, nonatomic) IBOutlet UIImageView * carplayPlaceholderLogo;
 
 @property(strong, nonatomic) NSHashTable<id<MWMLocationModeListener>> *listeners;
 
@@ -798,7 +798,7 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
 
 - (void)disableCarPlayRepresentation
 {
-  self.carplayPlaceholderLabel.hidden = YES;
+  self.carplayPlaceholderLogo.hidden = YES;
   self.mapView.frame = self.view.bounds;
   [self.view insertSubview:self.mapView atIndex:0];
   [[self.mapView.topAnchor constraintEqualToAnchor:self.view.topAnchor] setActive:YES];
@@ -820,7 +820,7 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
   if (!self.controlsView.isHidden) {
     self.controlsView.hidden = YES;
   }
-  self.carplayPlaceholderLabel.hidden = NO;
+  self.carplayPlaceholderLogo.hidden = NO;
 }
 
 @end

iphone/Maps/Images.xcassets/CarPlay/ic_carplay_activated.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_activated.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_activated@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_activated@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/UI/Storyboard/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,12 +18,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CarPlay Activated" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kUL-gQ-qaf">
-                                <rect key="frame" x="20" y="281" width="280" height="26.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="22"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_carplay_activated" translatesAutoresizingMaskIntoConstraints="NO" id="Tqh-46-Yrm">
+                                <rect key="frame" x="80" y="214" width="160" height="160"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="160" id="dkE-Cj-sE5"/>
+                                    <constraint firstAttribute="width" constant="160" id="pz7-lu-Ocm"/>
+                                </constraints>
+                            </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -84,11 +85,11 @@
                         </subviews>
                         <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="Tqh-46-Yrm" firstAttribute="centerX" secondItem="utd-Jy-pE5" secondAttribute="centerX" id="0T0-4t-4m2"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="65S-M4-TnM" secondAttribute="bottom" priority="100" id="2E3-5i-6An"/>
-                            <constraint firstItem="kUL-gQ-qaf" firstAttribute="centerY" secondItem="utd-Jy-pE5" secondAttribute="centerY" id="2d6-IK-Qp8"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="kUL-gQ-qaf" secondAttribute="trailing" constant="20" id="3mb-qK-t4t"/>
                             <constraint firstAttribute="bottom" secondItem="rL1-9E-4b7" secondAttribute="bottom" id="4fw-Xu-gAG"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QKu-4A-UgP" secondAttribute="bottom" priority="100" id="6ko-rI-S5u"/>
+                            <constraint firstItem="Tqh-46-Yrm" firstAttribute="centerY" secondItem="utd-Jy-pE5" secondAttribute="centerY" id="7pv-5d-X2W"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="xJx-UU-IdV" secondAttribute="top" priority="100" id="BMq-jc-qfO"/>
                             <constraint firstItem="rL1-9E-4b7" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="E89-WV-ZTh"/>
                             <constraint firstAttribute="trailing" secondItem="aPn-pa-nCx" secondAttribute="trailing" id="GKJ-zm-8xb"/>
@@ -107,14 +108,13 @@
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="pwZ-Fm-mHR"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="NI8-tV-i2B" secondAttribute="top" priority="100" id="sSU-QE-9zI"/>
                             <constraint firstAttribute="bottom" secondItem="aPn-pa-nCx" secondAttribute="bottom" id="tB3-eX-gUV"/>
-                            <constraint firstItem="kUL-gQ-qaf" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="20" id="vUG-uh-lFN"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="vfQ-ZT-Dlc"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="utd-Jy-pE5"/>
                     </view>
                     <navigationItem key="navigationItem" id="8E8-0f-UV9"/>
                     <connections>
-                        <outlet property="carplayPlaceholderLabel" destination="kUL-gQ-qaf" id="yqd-YG-wb6"/>
+                        <outlet property="carplayPlaceholderLogo" destination="Tqh-46-Yrm" id="S7m-Df-UPv"/>
                         <outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
                         <outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
                         <outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
@@ -1480,6 +1480,7 @@
         <image name="ic_add_button" width="28" height="28"/>
         <image name="ic_arrow_gray_down" width="28" height="28"/>
         <image name="ic_arrow_gray_right" width="28" height="28"/>
+        <image name="ic_carplay_activated" width="160" height="160"/>
         <image name="img_no_maps" width="240" height="240"/>
         <image name="img_whatsnew_migration" width="240" height="240"/>
         <image name="separator_image" width="1" height="1"/>