From 025512921e88bdab48e5c1a51d6d0ed8be138926 Mon Sep 17 00:00:00 2001
From: abkumar <abhishek.kumar@here.com>
Date: Thu, 1 Aug 2024 22:32:36 +0530
Subject: [PATCH] Update example apps for release 4.19.3.0

Signed-off-by: abkumar <abhishek.kumar@here.com>
---
 README.md                                     |   2 +-
 examples/latest/README.md                     |   2 +-
 .../java/com/here/hellomap/MainActivity.java  |  13 +-
 .../flutter/hello_map_app/lib/main.dart       |  11 +-
 .../HelloMap/HelloMap/ViewController.swift    |  17 +-
 .../Routing/Base.lproj/Main.storyboard        |  28 +-
 .../java/com/here/routing/MainActivity.java   |   3 +
 .../java/com/here/routing/RoutingExample.java |  23 +-
 .../app/src/main/res/layout/activity_main.xml |  15 +
 .../java/com/here/hellomap/MainActivity.java  |  13 +-
 .../examples/venues/VenueTapController.java   | 191 ++++-
 .../app/src/main/res/drawable/ambulance.png   | Bin 0 -> 573 bytes
 .../app/src/main/res/drawable/bike.png        | Bin 0 -> 576 bytes
 .../app/src/main/res/drawable/car.png         | Bin 0 -> 433 bytes
 .../app/src/main/res/drawable/pedestrian.png  | Bin 0 -> 599 bytes
 .../app/src/main/res/drawable/taxi.png        | Bin 0 -> 537 bytes
 .../app/src/main/res/layout/activity_main.xml |  28 +
 .../main/res/layout/topology_direction.xml    |  32 +
 .../flutter/hello_map_app/lib/main.dart       |  11 +-
 .../indoor_map_app/assets/back-button.png     | Bin 0 -> 439 bytes
 .../indoor_down-arrow-level-switcher.png      | Bin 0 -> 696 bytes
 .../indoor_map_app/assets/indoor_handle.png   | Bin 0 -> 761 bytes
 .../assets/indoor_rightaccessory.png          | Bin 0 -> 483 bytes
 .../indoor_map_app/assets/indoor_row_icon.png | Bin 0 -> 447 bytes
 .../indoor_map_app/assets/indoor_rowleft.png  | Bin 0 -> 2902 bytes
 .../indoor_map_app/assets/indoor_rowright.png | Bin 0 -> 399 bytes
 .../indoor_map_app/assets/indoor_spinner.png  | Bin 0 -> 4178 bytes
 .../assets/indoor_up-arrow-level-switcher.png | Bin 0 -> 673 bytes
 .../assets/structure-switcher.png             | Bin 0 -> 7921 bytes
 .../assets/topology-default.png               | Bin 0 -> 1678 bytes
 .../assets/topology-focused.png               | Bin 0 -> 3114 bytes
 .../ios/Flutter/AppFrameworkInfo.plist        |   2 +-
 .../indoor_map_app/lib/drawing_switcher.dart  | 119 +--
 .../flutter/indoor_map_app/lib/events.dart    |  18 +
 .../indoor_map_app/lib/level_switcher.dart    | 129 +++-
 .../flutter/indoor_map_app/lib/main.dart      | 682 +++++++++++++++---
 .../lib/venue_engine_widget.dart              | 162 ++++-
 .../lib/venue_search_controller.dart          |  48 +-
 .../lib/venue_tap_controller.dart             |   9 +
 .../flutter/indoor_map_app/pubspec.yaml       |   1 +
 .../HelloMap/HelloMap/ViewController.swift    |  17 +-
 .../img_ambulance.imageset/Contents.json      |  21 +
 .../img_ambulance.imageset/img_ambulance.png  | Bin 0 -> 697 bytes
 .../img_bike.imageset/Contents.json           |  21 +
 .../img_bike.imageset/img_bike.png            | Bin 0 -> 758 bytes
 .../img_car.imageset/Contents.json            |  21 +
 .../img_car.imageset/img_car.png              | Bin 0 -> 622 bytes
 .../img_pedestrian.imageset/Contents.json     |  21 +
 .../img_pedestrian.png                        | Bin 0 -> 797 bytes
 .../img_taxi.imageset/Contents.json           |  21 +
 .../img_taxi.imageset/img_taxi.png            | Bin 0 -> 748 bytes
 .../IndoorMap/IndoorMap/VenueTapHandler.swift | 259 ++++++-
 .../Routing/Base.lproj/Main.storyboard        |  28 +-
 53 files changed, 1638 insertions(+), 330 deletions(-)
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/ambulance.png
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/bike.png
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/car.png
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/pedestrian.png
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/taxi.png
 create mode 100644 examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/topology_direction.xml
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/back-button.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_down-arrow-level-switcher.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_handle.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rightaccessory.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_row_icon.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowleft.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowright.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_spinner.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/indoor_up-arrow-level-switcher.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/structure-switcher.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/topology-default.png
 create mode 100644 examples/latest/navigate/flutter/indoor_map_app/assets/topology-focused.png
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/Contents.json
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/img_ambulance.png
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/Contents.json
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/img_bike.png
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/Contents.json
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/img_car.png
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/Contents.json
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/img_pedestrian.png
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/Contents.json
 create mode 100644 examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/img_taxi.png

diff --git a/README.md b/README.md
index 5b7de984..d3d2d57c 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ For an overview of the existing features, please check the _Developer Guide_ for
 
 > For now, the _Navigate Edition_ is only available upon request. Please contact your HERE representative to receive access including a set of evaluation credentials.
 
-## List of Available Example Apps (Version 4.19.2.0)
+## List of Available Example Apps (Version 4.19.3.0)
 
 - **HelloMap**: Shows the classic 'Hello World'.
 - **HelloMapKotlin**: Shows the classic 'Hello World' using Kotlin language (Android only).
diff --git a/examples/latest/README.md b/examples/latest/README.md
index 9d1a8c06..46fed70f 100644
--- a/examples/latest/README.md
+++ b/examples/latest/README.md
@@ -1,4 +1,4 @@
-This folder contains the HERE SDK examples apps for version: 4.19.2.0
+This folder contains the HERE SDK examples apps for version: 4.19.3.0
 
 - HERE SDK for Android ([Lite Edition](lite/android/), [Explore Edition](explore/android/), [Navigate Edition](navigate/android/))
 - HERE SDK for iOS ([Lite Edition](lite/ios/), [Explore Edition](explore/ios/), [Navigate Edition](navigate/ios/))
diff --git a/examples/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java b/examples/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
index c80ca083..ae0b0338 100644
--- a/examples/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
+++ b/examples/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
@@ -106,15 +106,16 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     }
 
     private void loadMapScene() {
+        // The camera can be configured before or after a scene is loaded.
+        double distanceInMeters = 1000 * 10;
+        MapMeasure mapMeasureZoom = new MapMeasure(MapMeasure.Kind.DISTANCE, distanceInMeters);
+        mapView.getCamera().lookAt(new GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
+
         // Load a scene from the HERE SDK to render the map with a map scheme.
         mapView.getMapScene().loadScene(MapScheme.NORMAL_DAY, new MapScene.LoadSceneCallback() {
             @Override
             public void onLoadScene(@Nullable MapError mapError) {
-                if (mapError == null) {
-                    double distanceInMeters = 1000 * 10;
-                    MapMeasure mapMeasureZoom = new MapMeasure(MapMeasure.Kind.DISTANCE, distanceInMeters);
-                    mapView.getCamera().lookAt(new GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
-                } else {
+                if (mapError != null) {
                     Log.d(TAG, "Loading map failed: mapError: " + mapError.name());
                 }
             }
@@ -145,7 +146,7 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
         mapView.onSaveInstanceState(outState);
         super.onSaveInstanceState(outState);
     }
-    
+
     private void disposeHERESDK() {
         // Free HERE SDK resources before the application shuts down.
         // Usually, this should be called only on application termination.
diff --git a/examples/latest/explore/flutter/hello_map_app/lib/main.dart b/examples/latest/explore/flutter/hello_map_app/lib/main.dart
index c1180374..fd15852a 100644
--- a/examples/latest/explore/flutter/hello_map_app/lib/main.dart
+++ b/examples/latest/explore/flutter/hello_map_app/lib/main.dart
@@ -56,15 +56,16 @@ class MyApp extends StatelessWidget {
   }
 
   void _onMapCreated(HereMapController hereMapController) {
+    // The camera can be configured before or after a scene is loaded.
+    const double distanceToEarthInMeters = 8000;
+    MapMeasure mapMeasureZoom = MapMeasure(MapMeasureKind.distance, distanceToEarthInMeters);
+    hereMapController.camera.lookAtPointWithMeasure(GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
+
+    // Load the map scene using a map scheme to render the map with.
     hereMapController.mapScene.loadSceneForMapScheme(MapScheme.normalDay, (MapError? error) {
       if (error != null) {
         print('Map scene not loaded. MapError: ${error.toString()}');
-        return;
       }
-
-      const double distanceToEarthInMeters = 8000;
-      MapMeasure mapMeasureZoom = MapMeasure(MapMeasureKind.distance, distanceToEarthInMeters);
-      hereMapController.camera.lookAtPointWithMeasure(GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
     });
   }
 }
diff --git a/examples/latest/explore/ios/HelloMap/HelloMap/ViewController.swift b/examples/latest/explore/ios/HelloMap/HelloMap/ViewController.swift
index 1d02dd73..7087536b 100644
--- a/examples/latest/explore/ios/HelloMap/HelloMap/ViewController.swift
+++ b/examples/latest/explore/ios/HelloMap/HelloMap/ViewController.swift
@@ -23,7 +23,7 @@ import UIKit
 class ViewController: UIViewController {
 
     var mapView : MapView!
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -31,21 +31,20 @@ class ViewController: UIViewController {
         mapView = MapView(frame: view.bounds)
         view.addSubview(mapView)
 
+        // The camera can be configured before or after a scene is loaded.
+        let camera = mapView.camera
+        let distanceInMeters = MapMeasure(kind: .distance, value: 1000 * 10)
+        camera.lookAt(point: GeoCoordinates(latitude: 52.518043, longitude: 13.405991), zoom: distanceInMeters)
+
         // Load the map scene using a map scheme to render the map with.
         mapView.mapScene.loadScene(mapScheme: MapScheme.normalDay, completion: onLoadScene)
     }
 
     // Completion handler when loading a map scene.
     private func onLoadScene(mapError: MapError?) {
-        guard mapError == nil else {
-            print("Error: Map scene not loaded, \(String(describing: mapError))")
-            return
+        if let error = mapError {
+            print("Error: Map scene not loaded, \(error)")
         }
-
-        // Configure the map.
-        let camera = mapView.camera
-        let distanceInMeters = MapMeasure(kind: .distance, value: 1000 * 10)
-        camera.lookAt(point: GeoCoordinates(latitude: 52.518043, longitude: 13.405991), zoom: distanceInMeters)
     }
 
     override func didReceiveMemoryWarning() {
diff --git a/examples/latest/explore/ios/Routing/Routing/Base.lproj/Main.storyboard b/examples/latest/explore/ios/Routing/Routing/Base.lproj/Main.storyboard
index d1e17998..fa2f536a 100644
--- a/examples/latest/explore/ios/Routing/Routing/Base.lproj/Main.storyboard
+++ b/examples/latest/explore/ios/Routing/Routing/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?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="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,12 +19,24 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jv9-0R-Tz9" customClass="MapView" customModule="heresdk">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yhR-d4-nO0">
+                                        <rect key="frame" x="8" y="53" width="170" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" red="0.0" green="0.71372549019999998" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <state key="normal" title="Traffic Optimization -On "/>
+                                        <connections>
+                                            <action selector="toggleTraffic:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GOB-VV-rkF"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="eu1-QJ-vBV">
                                 <rect key="frame" x="8" y="28" width="359" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Bv-Tp-mIo">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Bv-Tp-mIo">
                                         <rect key="frame" x="0.0" y="0.0" width="114.5" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -35,7 +45,7 @@
                                             <action selector="onAddRouteButtonClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dMJ-B7-5zw"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IDY-a8-cO4">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IDY-a8-cO4">
                                         <rect key="frame" x="122.5" y="0.0" width="114" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -44,7 +54,7 @@
                                             <action selector="onAddWaypointsButtonClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="TbN-U1-8lZ"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dqL-zX-9qE">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dqL-zX-9qE">
                                         <rect key="frame" x="244.5" y="0.0" width="114.5" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -59,6 +69,7 @@
                                 </constraints>
                             </stackView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="7yx-63-l25"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="eu1-QJ-vBV" firstAttribute="top" secondItem="7yx-63-l25" secondAttribute="top" constant="8" id="1NJ-EX-MTG"/>
@@ -69,7 +80,6 @@
                             <constraint firstItem="jv9-0R-Tz9" firstAttribute="leading" secondItem="d7N-t3-PMt" secondAttribute="leading" id="qOE-QK-qnt"/>
                             <constraint firstItem="7yx-63-l25" firstAttribute="trailing" secondItem="eu1-QJ-vBV" secondAttribute="trailing" constant="8" id="xbd-jw-H4Z"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="7yx-63-l25"/>
                     </view>
                     <connections>
                         <outlet property="mapView" destination="jv9-0R-Tz9" id="NWv-T2-utS"/>
diff --git a/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/MainActivity.java b/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/MainActivity.java
index e78703aa..eaecd6de 100644
--- a/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/MainActivity.java
+++ b/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/MainActivity.java
@@ -118,6 +118,9 @@ public void clearMapButtonClicked(View view) {
         routingExample.clearMap();
     }
 
+    public void toggleTrafficOptimization(View view) {
+        routingExample.toggleTrafficOptimization();
+    }
     @Override
     protected void onPause() {
         mapView.onPause();
diff --git a/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/RoutingExample.java b/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/RoutingExample.java
index f8541c8d..547e92df 100644
--- a/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/RoutingExample.java
+++ b/examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/RoutingExample.java
@@ -45,6 +45,7 @@
 import com.here.sdk.routing.RoutingEngine;
 import com.here.sdk.routing.RoutingError;
 import com.here.sdk.routing.Section;
+import com.here.sdk.routing.TrafficOptimizationMode;
 import com.here.sdk.routing.Waypoint;
 
 import java.util.ArrayList;
@@ -63,6 +64,7 @@ public class RoutingExample {
     private RoutingEngine routingEngine;
     private GeoCoordinates startGeoCoordinates;
     private GeoCoordinates destinationGeoCoordinates;
+    private boolean trafficDisabled;
 
     public RoutingExample(Context context, MapViewLite mapView) {
         this.context = context;
@@ -89,7 +91,7 @@ public void addRoute() {
 
         routingEngine.calculateRoute(
                 waypoints,
-                new CarOptions(),
+                getCarOptions(),
                 new CalculateRouteCallback() {
                     @Override
                     public void onRouteCalculated(@Nullable RoutingError routingError, @Nullable List<Route> routes) {
@@ -106,10 +108,12 @@ public void onRouteCalculated(@Nullable RoutingError routingError, @Nullable Lis
 
     private void showRouteDetails(Route route) {
         long estimatedTravelTimeInSeconds = route.getDuration().getSeconds();
+        long estimatedTrafficDelayInSeconds = route.getTrafficDelay().getSeconds();
         int lengthInMeters = route.getLengthInMeters();
 
         String routeDetails =
                 "Travel Time: " + formatTime(estimatedTravelTimeInSeconds)
+                + ", Traffic delay: " + formatTime(estimatedTrafficDelayInSeconds)
                 + ", Length: " + formatLength(lengthInMeters);
 
         showDialog("Route Details", routeDetails);
@@ -158,6 +162,21 @@ private void showRouteOnMap(Route route) {
         }
     }
 
+    public void toggleTrafficOptimization() {
+        trafficDisabled = !trafficDisabled;
+    }
+
+    private CarOptions getCarOptions() {
+        CarOptions carOptions = new CarOptions();
+        carOptions.routeOptions.enableTolls = true;
+        // Disabled - Traffic optimization is completely disabled, including long-term road closures. It helps in producing stable routes.
+        // Time dependent - Traffic optimization is enabled, the shape of the route will be adjusted according to the traffic situation which depends on departure time and arrival time.
+        carOptions.routeOptions.trafficOptimizationMode = trafficDisabled ?
+                TrafficOptimizationMode.DISABLED :
+                TrafficOptimizationMode.TIME_DEPENDENT;
+        return carOptions;
+    }
+
     private void logManeuverInstructions(Section section) {
         Log.d(TAG, "Log maneuver instructions per route section:");
         List<Maneuver> maneuverInstructions = section.getManeuvers();
@@ -185,7 +204,7 @@ public void addWaypoints() {
 
         routingEngine.calculateRoute(
                 waypoints,
-                new CarOptions(),
+                getCarOptions(),
                 new CalculateRouteCallback() {
                     @Override
                     public void onRouteCalculated(@Nullable RoutingError routingError, @Nullable List<Route> routes) {
diff --git a/examples/latest/lite/android/RoutingLite/app/src/main/res/layout/activity_main.xml b/examples/latest/lite/android/RoutingLite/app/src/main/res/layout/activity_main.xml
index 875be07b..510be500 100644
--- a/examples/latest/lite/android/RoutingLite/app/src/main/res/layout/activity_main.xml
+++ b/examples/latest/lite/android/RoutingLite/app/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:id="@+id/firstRow"
         android:orientation="horizontal">
         <Button
             android:layout_width="0dp"
@@ -39,5 +40,19 @@
             android:text="Clear Map"
             android:onClick="clearMapButtonClicked" />
     </LinearLayout>
+    <LinearLayout
+        app:layout_constraintTop_toBottomOf="@id/firstRow"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <ToggleButton
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textOff="Traffic optimization -On"
+            android:textOn="Traffic optimization -Off"
+            android:onClick="toggleTrafficOptimization" />
+    </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/examples/latest/navigate/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java b/examples/latest/navigate/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
index c80ca083..ae0b0338 100644
--- a/examples/latest/navigate/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
+++ b/examples/latest/navigate/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
@@ -106,15 +106,16 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     }
 
     private void loadMapScene() {
+        // The camera can be configured before or after a scene is loaded.
+        double distanceInMeters = 1000 * 10;
+        MapMeasure mapMeasureZoom = new MapMeasure(MapMeasure.Kind.DISTANCE, distanceInMeters);
+        mapView.getCamera().lookAt(new GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
+
         // Load a scene from the HERE SDK to render the map with a map scheme.
         mapView.getMapScene().loadScene(MapScheme.NORMAL_DAY, new MapScene.LoadSceneCallback() {
             @Override
             public void onLoadScene(@Nullable MapError mapError) {
-                if (mapError == null) {
-                    double distanceInMeters = 1000 * 10;
-                    MapMeasure mapMeasureZoom = new MapMeasure(MapMeasure.Kind.DISTANCE, distanceInMeters);
-                    mapView.getCamera().lookAt(new GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
-                } else {
+                if (mapError != null) {
                     Log.d(TAG, "Loading map failed: mapError: " + mapError.name());
                 }
             }
@@ -145,7 +146,7 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
         mapView.onSaveInstanceState(outState);
         super.onSaveInstanceState(outState);
     }
-    
+
     private void disposeHERESDK() {
         // Free HERE SDK resources before the application shuts down.
         // Usually, this should be called only on application termination.
diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/VenueTapController.java b/examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/VenueTapController.java
index 6bf532f0..7c13324d 100644
--- a/examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/VenueTapController.java
+++ b/examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/VenueTapController.java
@@ -21,12 +21,15 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -46,12 +49,16 @@
 import com.here.sdk.venue.control.VenueMap;
 import com.here.sdk.venue.control.VenueSelectionListener;
 import com.here.sdk.venue.data.VenueGeometry;
+import com.here.sdk.venue.data.VenueTopology;
+import com.here.sdk.venue.routing.VenueTransportMode;
 import com.here.sdk.venue.style.VenueGeometryStyle;
 import com.here.sdk.venue.style.VenueLabelStyle;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 class SpaceSelectionHolder extends RecyclerView.ViewHolder{
 
@@ -93,11 +100,81 @@ public int getItemCount() {
     }
 }
 
+class TopologyMeta {
+    List<VenueTransportMode> modes;
+    VenueTopology.TopologyDirectionality direction;
+}
+
+class TopologySelectionHolder extends RecyclerView.ViewHolder{
+
+    public LinearLayout linearLayout;
+    public TextView topoDirectionText;
+    public TopologySelectionHolder(@NonNull View itemView) {
+        super(itemView);
+        linearLayout = itemView.findViewById(R.id.topology_images);
+        topoDirectionText = itemView.findViewById(R.id.TopologyDirectionText);
+    }
+}
+
+class TopologySelectionAdapter extends RecyclerView.Adapter<TopologySelectionHolder> {
+
+    private Context context;
+    private List<TopologyMeta> directions;
+
+    public TopologySelectionAdapter(Context context, List<TopologyMeta> directions) {
+        this.context = context;
+        this.directions = directions;
+    }
+
+
+    @NonNull
+    @Override
+    public TopologySelectionHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new TopologySelectionHolder(LayoutInflater.from(context).inflate(R.layout.topology_direction, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull TopologySelectionHolder holder, int position) {
+        holder.topoDirectionText.setText(directions.get(position).direction.name());
+        List<VenueTransportMode> modes = directions.get(position).modes;
+        for(int i = 0; i < modes.size(); i++) {
+            ImageView imageView = new ImageView(context);
+            switch (modes.get(i)) {
+                case AUTO:
+                    imageView.setImageResource(R.drawable.car);
+                    break;
+                case TAXI:
+                    imageView.setImageResource(R.drawable.taxi);
+                    break;
+                case MOTORCYCLE:
+                    imageView.setImageResource(R.drawable.bike);
+                    break;
+                case EMERGENCY_VEHICLE:
+                    imageView.setImageResource(R.drawable.ambulance);
+                    break;
+                case PEDESTRIAN:
+                    imageView.setImageResource(R.drawable.pedestrian);
+                    break;
+            }
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(50, 50);
+            params.setMargins(10, 10, 10, 10);
+            imageView.setLayoutParams(params);
+            holder.linearLayout.addView(imageView);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return directions.size();
+    }
+}
+
 public class VenueTapController {
     private static Color SELECTED_COLOR = Color.valueOf(0.282f, 0.733f, 0.96f);
     private static Color SELECTED_OUTLINE_COLOR = Color.valueOf(0.118f, 0.667f, 0.921f);
     private static Color SELECTED_TEXT_COLOR = Color.valueOf(1.0f, 1.0f, 1.0f);
     private static Color SELECTED_TEXT_OUTLINE_COLOR = Color.valueOf(0.f, 0.51f, 0.765f);
+    private static Color SELECTED_TOPOLOGY_COLOR = Color.valueOf(0.353f, 0.769f, 0.757f);
 
     private VenueEngine venueEngine;
     private MapView mapView;
@@ -107,14 +184,19 @@ public class VenueTapController {
     private MapMarker marker = null;
     private Venue selectedVenue = null;
     private VenueGeometry selectedGeometry = null;
+    private VenueTopology selectedTopology = null;
     private BottomSheetBehavior sheetBehavior;
-    private RecyclerView recyclerView;
+    private RecyclerView recyclerView, topologyRecycle;
+    private TextView topologyID;
+    private LinearLayout topologyLayout;
 
     // Create geometry and label styles for the selected geometry.
     private final VenueGeometryStyle geometryStyle = new VenueGeometryStyle(
             SELECTED_COLOR, SELECTED_OUTLINE_COLOR, 1);
     private final VenueLabelStyle labelStyle = new VenueLabelStyle(
             SELECTED_TEXT_COLOR, SELECTED_TEXT_OUTLINE_COLOR, 1, 28);
+    private final VenueGeometryStyle selectedTopologyStyle =
+            new VenueGeometryStyle(SELECTED_COLOR, SELECTED_TOPOLOGY_COLOR, 4);
     private Context context;
     private List<VenueGeometry> geometryList;
 
@@ -127,6 +209,10 @@ public class VenueTapController {
 
         // Get an image for MapMarker.
         markerImage = MapImageFactory.fromResource(activity.getResources(), R.drawable.marker);
+        topologyID = activity.findViewById(R.id.topology_id);
+        topologyLayout = activity.findViewById(R.id.topologyLayout);
+        topologyRecycle = activity.findViewById(R.id.TopologyDirection);
+        topologyLayout.setVisibility(View.GONE);
     }
 
     @Override
@@ -158,6 +244,7 @@ void setVenueMap(VenueMap venueMap) {
             this.venueMap.add(drawingSelectionListener);
             this.venueMap.add(levelChangeListener);
             deselectGeometry();
+            deselectTopolgy();
         }
     }
 
@@ -191,6 +278,56 @@ public void selectGeometry(VenueGeometry geometry, GeoCoordinates position, bool
         }
     }
 
+    public void selectTopology(VenueTopology topology, GeoCoordinates position) {
+        deselectTopolgy();
+        selectedVenue = venueMap.getSelectedVenue();
+        if (selectedVenue == null) {
+            return;
+        }
+        selectedVenue.setSelectedDrawing(topology.getLevel().getDrawing());
+        selectedVenue.setSelectedLevel(topology.getLevel());
+        selectedTopology = topology;
+        topologyID.setText(topology.getIdentifier());
+        List<TopologyMeta> directions = new ArrayList<>();
+        for(VenueTopology.AccessCharacteristics access : topology.getAccessibility()) {
+            VenueTopology.TopologyDirectionality direction = access.getDirection();
+            VenueTransportMode mode = access.getMode();
+            if(mode == VenueTransportMode.PEDESTRIAN) {
+                List<VenueTransportMode> modes = new ArrayList<>();
+                modes.add(mode);
+                TopologyMeta meta = new TopologyMeta();
+                meta.direction = direction;
+                meta.modes = modes;
+                directions.add(0, meta);
+                continue;
+            }
+            int size = directions.size();
+            int i;
+            for(i = 0; i<size; i++) {
+                if(directions.get(i).direction == direction && mode != VenueTransportMode.PEDESTRIAN && directions.get(i).modes.get(0) != VenueTransportMode.PEDESTRIAN) {
+                    directions.get(i).modes.add(mode);
+                    break;
+                }
+            }
+            if(i >= size) {
+                List<VenueTransportMode> modes = new ArrayList<>();
+                modes.add(mode);
+                TopologyMeta meta = new TopologyMeta();
+                meta.direction = direction;
+                meta.modes = modes;
+                directions.add(meta);
+            }
+        }
+        topologyRecycle.setLayoutManager(new LinearLayoutManager(context));
+        topologyRecycle.setAdapter(new TopologySelectionAdapter(context, directions));
+        sheetBehavior.setPeekHeight(0);
+        topologyLayout.setVisibility(View.VISIBLE);
+
+        // Set a selected style for the geometry.
+        ArrayList<VenueTopology> topologies = new ArrayList<>(Collections.singletonList(topology));
+        selectedVenue.setCustomStyle(topologies, selectedTopologyStyle);
+    }
+
     private void deselectGeometry() {
         sheetBehavior.setPeekHeight(300);
 
@@ -209,13 +346,34 @@ private void deselectGeometry() {
             recyclerView.setAdapter(new SpaceAdapter(context, geometryList, (MainActivity) context));
     }
 
+    private void deselectTopolgy() {
+        topologyLayout.setVisibility(View.GONE);
+        sheetBehavior.setPeekHeight(300);
+        // If there is a selected geometry, reset its style.
+        if (selectedVenue != null && selectedTopology != null) {
+            ArrayList<VenueTopology> topologies =
+                    new ArrayList<>(Collections.singletonList(selectedTopology));
+            selectedVenue.setCustomStyle(topologies, null);
+        }
+        selectedTopology = null;
+        selectedVenue = null;
+    }
+
     public void setGeometries(List<VenueGeometry> list) {
         geometryList = list;
     }
 
     // Tap listener for MapView
     public void onTap(@NonNull final Point2D origin) {
-        deselectGeometry();
+        if (selectedGeometry != null) {
+            deselectGeometry();
+            selectedGeometry = null;
+        }
+
+        if (selectedTopology != null) {
+            deselectTopolgy();
+            selectedTopology = null;
+        }
 
         // Get geo coordinates of the tapped point.
         GeoCoordinates position = mapView.viewToGeoCoordinates(origin);
@@ -224,17 +382,23 @@ public void onTap(@NonNull final Point2D origin) {
         }
 
         VenueMap venueMap = venueEngine.getVenueMap();
-        // Get a VenueGeometry under the tapped position.
-        VenueGeometry geometry = venueMap.getGeometry(position);
-
-        if (geometry != null) {
-            selectGeometry(geometry, position, false);
-        } else {
-            // If no geometry was tapped, check if there is a not-selected venue under
-            // the tapped position. If there is one, select it.
-            Venue venue = venueMap.getVenue(position);
-            if (venue != null) {
-                venueMap.setSelectedVenue(venue);
+        VenueTopology topology = venueMap.getTopology(position);
+        if (topology != null) {
+            selectTopology(topology, position);
+        }
+        else {
+            // Get a VenueGeometry under the tapped position.
+            VenueGeometry geometry = venueMap.getGeometry(position);
+
+            if (geometry != null) {
+                selectGeometry(geometry, position, false);
+            } else {
+                // If no geometry was tapped, check if there is a not-selected venue under
+                // the tapped position. If there is one, select it.
+                Venue venue = venueMap.getVenue(position);
+                if (venue != null) {
+                    venueMap.setSelectedVenue(venue);
+                }
             }
         }
     }
@@ -246,6 +410,7 @@ private void onLevelChanged(Venue venue) {
         }
         // Deselect the geometry in case of a selection of a venue, a drawing or a level.
         deselectGeometry();
+        deselectTopolgy();
     }
 
     private final VenueSelectionListener venueSelectionListener =
diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/ambulance.png b/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/ambulance.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca2e208b55e09f4766397a69304ca036fb69c932
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001fg001Ni1^@s6|H-H;00001b5ch_0Itp)
z=>Px$_en%SR9Hvtm`ifPFbsyR^Z>9a!xDOu<YbVOkzNE?cIXBU(3p`Y&d81*a$ck}
zWYrQZf0lpCKLSCX^>&xj|Hu6M{&TH#y!GbmD1|%-DJuAoC4J|c6Yxbla7;213j~z+
z+xe*G+U{~$!--DyxLp)S=mFQj*r3$+2B^*^3Bm$heeO>J#AI8JJP0bXT5Y}jgM&RE
z4|KDasTmsk`;f^Zrc+og090pP>)4fu#egDQNCJxjrH9VWDj&3|c{G4sX1v;Uj7>dQ
zY*5!~x%&2H%2mI8+y7cnNAdS9>ZPE#{r0Y;gGy07elG>LW`=IK&>`tuIG%a^8J!7~
ztJ6h-x^AjjK((E7%BaqAW%)dAOMe_ZOv+5?C#x&_KE`b`>Z&y%SKpoDPHZ6yG`31^
z9qk2dnd(`}Q!mhFkk;$sK~djWCfT4kpp%)24R@<g0VN-F$o>r+i--DOfGT4>>B$|K
zNu%n#K}XEyd+XWB#FED>as0zXY~SD(P--l^PPv^DYQ2Vn+BPnFpb?ZiDRt@G#rY%<
zYnpZ3R3?kGZXT`-;M?|(Y)zV;kQGZW%4qi){ZWUZP5s^8e!pid>VJcM$*6W35>7Xc
zD;HnGEC{N8SvuN;ZKe`B#yBPh8|vysJH0qT2e{E{sQc!VN#9scqWYKeLny~Z00000
LNkvXXu0mjfQE3fx

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/bike.png b/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/bike.png
new file mode 100644
index 0000000000000000000000000000000000000000..940805c788dd39f59189524f2d2f852d46e834bf
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq001fg001Hg1^@s6DUeGx00001b5ch_0Itp)
z=>Px$`bk7VR9Hvdm_c&FFbqYl^Z>9a!xDOt!pVS>kzS;9*`XUaK;w?namL8swj4V!
zZI_L)p7rG~C8Q?$n=fAWTIpSC`|J5csWs-gXpv+izUJS7lA^=q{Ju{m<KY>7Jm_+@
zQC+j)nL>3dsnf|a8j=##E;V|4`TS^O^4}kHx!UNCjxLl${=0)3z}aH0{{$$KKUJs1
zPlxJ6B8~eysfVU4$%PkznhjGYwn1w_@|a>!Nmgq@js{K1G{y59=}i_;5UusABIOx&
z4IrZq+TZ-&-QR7kQG1#_uaC81-4e>NsVL|im~%-+d7XQXqg8wTI&HD@BqG<kAgE2|
z_^GHfm6kxLm&3jv82da>d$}ajxu^^xazeGVYUxQI_>gh~TADco9%>ZHSPZxat$k?*
zV35t+SoWYjX!3L-jr~QaHgjWHr=ZXYt@)N1KbL)MEW<+Rgxv2&Srm|cY^+~UHpHsH
zEzO3NfM&$<KtoefE-2bZ+A^WPN`DM5fmUs37AOIQB_in#F=OU0YWD6U(4tsDNsZwW
zy_vwMOIhnNHyORZtEOvtcPWWA&PO9{F=e^AK58%b&_X3Id4sHi4+g;x5SgQ+Rc-+7
z&G?&ku|c_S0zlGK7Ws2YEN+wj^aOxymy&#S%YjC~p;)4MG$;5}YkvU26R;imD>DTE
O0000<MNUMnLSTZeV+g_k

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/car.png b/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/car.png
new file mode 100644
index 0000000000000000000000000000000000000000..578858a77507609e61620bba5a67e7686ca36bf7
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001fg000~a1^@s67vL@H00001b5ch_0Itp)
z=>Px$Ye_^wR9Hvtm_csBFc3vO<p8iL>az4Az{!A<5iU}?tY8BNXr~H@C@~)Yk7FYh
zk*&wy&)?&*9dX1r8h<QRb?U^;h;SUDt`d>WVfVSj!RH8x1&-d{XZkB^RxBk>UUYu=
z{;E*lDClrJQ6!L~{kYpkIiil9mfPtf2ME#-Co7Z&=1hDy88HNOX%CrzTn&Pz2(gft
zxGN(-t_DF%y4irfPS%|&qOLmbw{vU4SD^QBvxW&(lvo82v}tnYrtj9!chw7Mk1ePK
zv32g&9JO5S=(N&7(5zAbvh`_$qNUF^Xo65@>8)~+pqsUeUss!5k8(9D1tCU*TD!gP
zghD3}QxZ)_ts|`nXyBH{J8B$hB|z&;@O61m<3>{gwAa!T`Cc@HcC;u3A^rp<Ou8wg
zx1;DLj%e7;_yC~bZg_qP;zt;CG;y5fWIElre`I0)WT<}{40Of3!DFzg<G}Yca_C;|
b{|59At6}sViV4B200000NkvXXu0mjfN}#~@

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/pedestrian.png b/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/pedestrian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd994d6365c5d789e81d12d0f999ee575fabee7
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px%5lKWrR9Hvtm_c&FFbqZQT%c^qbXj_max&=2NH0>l?9dGyfVg8da!uk$vaK-8
z6qdx1pTA^Dku{3H#qwqAjN5pV*4Ve>;bW_1-f9_&A<?ELtQzRUa^+HoJ{|Tdd#D)k
zfOpW|P5)2P)MYZxw5RX=TI0g1DGG7=xY`+OUT-=*p=yh#X8=8ZeYP4({-ruiYctv^
zay_bMx(3vvep=Nj8`ML(&h9wC@LcIaWrI#7b`o3xHVZVFf~3+`!iqtwAn`C2up-b&
zNM~Bin^Iw?)^VLyF(?|Ql=f?|KjjXh0y?@tkqb%C#zFa%WQkcoW1}1>RwypUZwAyW
z3x#5;NHkqbm0eMc4qacOC>NvL^LkLCQrX6>wVD$VsE@CU6A#=pRjsZL%DIIqt6H!k
zMJZ73HbWDw5CYYp(k7)AwhC0DrdGRG44MUbt)^rcqg;K5vf0m|M)6(PL1imSDk<#&
z3I=Fdpi;>2MH)@_hRSlaeY~DalKt~sNNre=qT~miAm*sXTRKS*fnw(~>MI41sBAn%
zf&Vhzg`y$!JS@9Vc48xHQW9V@A+tdP?AdNoE|bijd>E7rB}R&ZYG?a9hqv}!VwB6P
zA{+g_eow#m@SOk}0Q+fN91=d2m_!Foy;J)>>=^-D>1KEVQ039(5CnVpaz(EtL`mga
l@UFD`5pc}9<PNGW?++8CsnMx^-|PSY002ovPDHLkV1f%P4Rrtj

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/taxi.png b/examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/taxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e0c92e23832acb27f1d495b1801287c029655e5
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq001fg001Ni1^@s6|H-H;00001b5ch_0Itp)
z=>Px$(@8`@R9Hvtm_c&FFbqYd^Z>9a(`D&J8cqhBjPxR<%MRVZ0U9w*Yw8#~l5B@*
zI%SJ&J%7tTvJn!0^TpGKfY$7Ag68zGU$Jpa0H#bZe|W5^#hr940&b6o*Nrqj6qg1n
zRny6MI_#5j*(s6+&+eByK&UkeO$HPzS{>it8qMO|*fd2KOVTFHty49q_8|S#Sl)qB
zff`6?t6F4Bp5#VRsM>DpQ%ZmZ75k;O76=-=qpcKr5Og$1XHn8a76nbMMXj(VUSeHQ
z(4bcmB-=}G0iFj-93coAQd6>OshXjZ;^q&6`f5s6EQPdjGtY~;99N(rHKhfwfz_(o
zfto=!2@yT_zT<`3w9q1aRl!&m;!77>wT)|C$XU=BYFcPEx6>Zt)vDa3f19#qOEt0d
ziR-~G%-Ky=QBC6Fu`Z~YJf*)Z4&_hiePX{3lk#dYI%ME$^#?#BwlsM77^!2XF7ec;
zqA^<<1vF54{wFmK8oA>BN>JO8_pDWMpZ6=l?eZ`GMQ#jYMQ?GkhjRRbmfnGUMRU7+
z;R{PPDA$Q|%1T{h+Mwdbq(BobYJdWHdRGzq5)#|K+&9ik12oWwTCepVCfJt}uI6s_
b|71YVMfXxP>3WzE00000NkvXXu0mjfS`+Va

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/activity_main.xml b/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/activity_main.xml
index d7ef841b..cac179b8 100644
--- a/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/activity_main.xml
+++ b/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/activity_main.xml
@@ -95,7 +95,35 @@
                 android:orientation="vertical"
                 android:elevation="3dp"
                 />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:orientation="vertical"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/bottom_sheet_background"
+                android:elevation="10dp"
+                android:id="@+id/topologyLayout"
+                android:visibility="gone"
+                >
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/topology_id"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:layout_marginTop="30dp"
+                    android:layout_marginLeft="20dp"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/TopologyDirection"
+                    android:layout_marginTop="5dp"
+                    android:layout_below="@id/topology_id"
+                    />
+            </LinearLayout>
         </RelativeLayout>
+
     </LinearLayout>
     <include layout="@layout/bottom_sheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/topology_direction.xml b/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/topology_direction.xml
new file mode 100644
index 00000000..52f62339
--- /dev/null
+++ b/examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/topology_direction.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/topology_direction"
+        android:layout_margin="10dp"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:id="@+id/topology_images"
+            android:gravity="left"
+            android:layout_weight="50"
+            android:layout_marginLeft="10dp"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="50"
+            android:id="@+id/TopologyDirectionText"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/examples/latest/navigate/flutter/hello_map_app/lib/main.dart b/examples/latest/navigate/flutter/hello_map_app/lib/main.dart
index c1180374..fd15852a 100644
--- a/examples/latest/navigate/flutter/hello_map_app/lib/main.dart
+++ b/examples/latest/navigate/flutter/hello_map_app/lib/main.dart
@@ -56,15 +56,16 @@ class MyApp extends StatelessWidget {
   }
 
   void _onMapCreated(HereMapController hereMapController) {
+    // The camera can be configured before or after a scene is loaded.
+    const double distanceToEarthInMeters = 8000;
+    MapMeasure mapMeasureZoom = MapMeasure(MapMeasureKind.distance, distanceToEarthInMeters);
+    hereMapController.camera.lookAtPointWithMeasure(GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
+
+    // Load the map scene using a map scheme to render the map with.
     hereMapController.mapScene.loadSceneForMapScheme(MapScheme.normalDay, (MapError? error) {
       if (error != null) {
         print('Map scene not loaded. MapError: ${error.toString()}');
-        return;
       }
-
-      const double distanceToEarthInMeters = 8000;
-      MapMeasure mapMeasureZoom = MapMeasure(MapMeasureKind.distance, distanceToEarthInMeters);
-      hereMapController.camera.lookAtPointWithMeasure(GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
     });
   }
 }
diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/back-button.png b/examples/latest/navigate/flutter/indoor_map_app/assets/back-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..df2a3afcf78f3ef2b0b3ba7dd0035d3ac586f512
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$aY;l$RA@u(n9Yj9Fce0=;BMYv-oqyn$9bLsQCEZDiwT15W)K9cD>GD3tK|R2
z=0+m8Yua<}cax?O$owZV=SLAponT3zBtWb{X`zP#etb><IY3j-iG_6@9xs6lJla1X
zvBI(Xai$<#7)PKBe}fS-G}~VSo6}IbfD#^mkYbGEcH=}rxQHf@7{2um7hnJ%E}(|r
zL5fiyZPV>I{{(dKXZeLwy(YAC&`>`CX7GM3#1P(HfGND20AqN&0CRY=fC^rUJ>+?m
zVztpNQR-DlUHPD8F8ZLR8k*k&oZ(yY_ZMg_Ij3Mv;M!nWPhyh<utTDKk7_}%?}eDZ
z3+w{=Il&?cHvz^H?gC6D`~*xA3BJbcn>pP+fXVl8xPU&1-i}kQwe@eIZYm6tpb0QY
zf-azw5ORt`y^Ow{e!5{CfoF;A4tMW+r|-*YUsEk!UHLeZxGze>bK<p7BAFtPsPMPP
hmIO)y#0q5JLjP9DxiNhEZj}H4002ovPDHLkV1l!Dz0v>x

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_down-arrow-level-switcher.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_down-arrow-level-switcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..f774a29166889222a3bf522e4233f060c7ca7415
GIT binary patch
literal 696
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)jKx9jP7LeL$-HD>U@G!-aSW-5
zdwbo`J33H?^}}cNgISA?o^`P<eevKyg1xu9x~q`DUyUR|9l_;m{%ZK~@$tRAG-*fY
ztQid_<K>dF7U}PM=J8JUT(bbj_n3FT_ZEM?XZ&ITOOKZ}591_Nfdvenj7IC&xF(1w
zJkFv4M{ZqX@zVSPd)Mcm%uD$;d(ThY*0=kaf7U$C!-)*tPkAlAJ*Z>-o?D_<@4Mxn
z`yQz?Vu=<Gs{`j}$SIlB9ys(#?ZMT9v+k~YxOeS;x0r~ZP1XMyKleB9WKv*b(8*`^
zu>0S~Vwf*_=g-~~A#E({@7uR6wlLb)R<?LrW?#7!(1etS#ZPS|%-YT!ywFrBy8Z0u
zjnB>EqgroY<hF5_E$?kEFFI-CD{-LYh}jwKl^sX@vmM?G^c^Z_KKwv6n}gkgPjIK~
zmVa}26;&(lSu=f56x;KmA+y6leA;S00q&>k8TK7-6K8*5;gTSJ@BHB$`3*B?%=*4%
z+J@*KJ3SVLu;vs$xxbrRfnUM=&+hpP?)q#i{-7*(;EP({jn>_Xd&;&xVyfXbys-Gx
zj#<aqXS7Ku#@U!pysr20bNgG5kB``DvXVZ@KHyb;eOL3G?wr!Ef<3|tm4Yl94nYk)
ls~eeASWoPbq5;RAVQyGgU}a#N1u!Wxc)I$ztaD0e0s!b*9%}#q

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_handle.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_handle.png
new file mode 100644
index 0000000000000000000000000000000000000000..e24084ecd34ae862367af432ffdb6bd55b5bdc17
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0y~yV0s5+D{!y@N#BIO>OhLIILO_JVcj{Imq6Lgo-U3d
z6>)FxEc9b`6kvOB^O}QJmnEYOn^?E1jbM}cs-ur8dnN@q^G@|<n&a{&=;Fz`tJc$R
z=DYoQv`+O8hk$}Z0|O%y3x|M3Wn<AN*{lf=9!R)R;EpaMSPsl%VQQ*wQp}tPSJ3bv
zj~!uvih#f!VII$JpixjWS<0<phATKIG&Ve#m*5el0vA%)aT{(pBNHbJ%Xb#%OG*f#
zgLnC0CUFROC@AbumzX5R2^ZpcR|ayqEYt0~$9+3LNd&%EI#qdGnN4eDyHNM@RGs<D
zGQV0~I2t<@sK{MZ;7<Rkmx(MKJqjO$Z;9&*h9=}oRIL3P;C&~~U;I#Y^X$bych6vD
zDc=q9xLf1)yLG~X-+NR0++BKa#Q45umjL<ef}X;T?Xy=ZI3yG_zWx0#z-tcgxeL{Q
z&!5iR`${*=9jJ36E6ewZ%iq6a;V9wcco&;fJn_LleY>MTi**!s^xM>yt2-?4KCs#-
zHs`);+|-xbgFS(sfcSJl;DO^SdlU8_ubp%2`LZscvo`}nSR7=n;)C}J(HH*6rgTr+
z40Oj2Z-;{I(ujZ-;^274*|x+L6pfIuZ`v&jjRc^`1P6x#e*+a=A-Ishowx8<WN4&w
b#5U?*Uu>u7=f&3nOv?<Ou6{1-oD!M<t-t05

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rightaccessory.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rightaccessory.png
new file mode 100644
index 0000000000000000000000000000000000000000..97035acafad9f19fb6bad589d1d93df1f7ec0762
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000&M001Ni1^@s6jRwk{00001b5ch_0Itp)
z=>Px$ok>JNR7gv;*1t}|P!z}U?=3_vuuF+g;Narm!lH{0;2Zc7#uyU^B}y;`HPNuT
zxj31qi;q(tKwyGvN<sSX-nO^36DjQ{zn*h@ZUw8Og5B&;;e(&yci_CyPqDbGO5N!p
zX#+DXc~TVjVY}5u$b&$%8G>_0?x#^)z=vzjF31NEYXL|iIAi2~nc&M(l#Z|9l9PvF
z9ge(UJbceumN;Azo(%ut+ym>OhGtBzhCQvmwS$~K#c)Z7iTkE2iyl_vAi2`v>98T5
z4c6ka%VhW(ElYMdC!P<^f#-*pIMYWYwNMEJeMat!cg_s<?rb!-k>Xi}o5Lyi|G+RX
zhgGG30b|z?_Fna*<}FaO<|WS$&zdJ)u9AGE$cW}kJl_{%V>FgDU*hD=R*7ayY;W!%
z#9d?u*P`k09JTsDH8Q<IjY=B$>gE+d)rmKpHWodTr0VAR=q*sm`}o1@!=)$*4VR+P
z+-D}PizW@1!bfiatH|TWOHp?Ykz7Uwf9jIT_FZ8+M+i<A7Z*a~%dOTr23ZYGDP1bv
Zf4|dC$S<2J<M{vp002ovPDHLkV1fZ_;7b4i

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_row_icon.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_row_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cca33ed634c123e2b6ced0fd040fe7395f5bd09
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq000~S000^Y1^@s6q*OeK00001b5ch_0Itp)
z=>Px$c}YY;R7gwZmQ7B>Kn#VSLzb1wCM7FGBv$1Rggel1oRs7A=MI!Z&}|T_rr8jQ
zWg4RyP1-cfFqIfZNX=?wdu(Z*KRbk;KeE-k3~yp)n%d${@zah|Yr$a<B_PaBNob8>
zBxg|2q*0k?v3R0k5KTasi!+0#o`+X?uIWWSA!9`s{49?<N<onK$m0j;uf3STsfwMD
zNuzR`$>%=uGm^5%7ScY7SSBGX$~;SyP52(g*>wLr3Tid_+`O;48WL#D#D&u1USUvx
zuvWG)fIvO9)S8$A1`E5;yQ5)CqlPKx9GaTqe-w1orF#wA8tFI`8k9x0>|il3^Xy65
zuA&(j5|I`b`}{vOYz@OR<<PngECFI$m}aGp!@t&RG&~ZuX^IvW+NJ`d2k;$XaoFg#
zN#m$s?;IX9)N}az0w!p|ce8+XZE9G++KyIOX#dKzlg35CL3kVZsP4MC8V*hVCcZ+w
p{n~uUeK-iO$3DD~iPsAL+c!o+n%Nvy37`M~002ovPDHLkV1iKU#{d8T

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowleft.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce55fac6f68f882cf43a17d2706294df7df8a42
GIT binary patch
literal 2902
zcmV-c3#s&pP)<h;3K|Lk000e1NJLTq001Ze002S=1^@s6C6Sa-00001b5ch_0Itp)
z=>Px=5J^NqRA@u(nR!&xR~E;=HxQB#!X6Nn)q<7^0wONesx#J8$5Y#>t<z3-+haGo
zXwgDlDC63SOGn#|oleJU+cTr>soJVNI<3XJlq%we8;Z&fvW5T&Nq%q6`#~^)UqS#o
zXa3-xlXKwrd+)wazVF@p?t3BppBwd-k1=)+fXM)o0mJ|Z0pJCI0nh^|18^C@2>=I)
z=x}ew>JcDgObcKxfTt@fDs?&ge`qQyyskAGjViOnqGAH`1JLRwlj&t{vKFOM*%BTT
zRW)|Xz1{&@e@_5g0DM41wXVXt49FN;1YpU*eFqL7J9t<t6U_0h4#L|BGWm%~(|%tw
zZt{fj0G1KayRP)_7LYNP0N|t3M}NWoUHbwo7IU=KvA;%%0B;pM6>_+{$)J$C!6Go2
zEdopy0WAg-s&y@>(;GTi+~o2Lf0#L={;uRC3xJo1=$tc9r+|#HnM@GA*tTI~VOd$#
zo!pU|j1a2zMzEh+{M!|?2m&f<n^0Wc2tnXW6bKI=ocHM57h{O%aU$B~$dAJj7-LU1
z>-8J|@!tA|re;GJcM#(5g;1?VRI4|}RV}L2p|ZY7?Cz~m7d*Fc{y>FFIfsb8l=3MF
z$Qb)$v%YD|N6X)9HJQzUT&bah{o(7S><w3!KDCVoTrR1Fz!*F{JWA(gr1^L#6kN&O
zof~%nWQ+|5W4~<5Tv@5tH%BSu?uZQ!fYQVLw!m4Pv>44eUsMgF$pW=TbLQ2Iv<LuW
zi0FdtKvIC&pKbWiv%I7<*-a)x!jK?w@&6Xq(rU(;!kgf0G;By@_McyRo)HnxtsQ0u
z$QVn_KY8k*Z@=6zmbVxl5eRQj#c#pZ;j^L1i2NJXU<|^nInNv!GBkQ85v{W}=m2Dl
zX#f<jOMj=K)np1A7~qA7U>`|1xl)CYp|NPLuS4~XLZ@HAP3{4OS}nG9WQFDRsHkg#
zyNAcA)Rh_G078jKj3isYv?Jf|pYij5vd6m1WEdF}3_iu3O{MWc!i<@aE7}64<ZK=a
zj~|m9J2Wm45hF)~WHPkq8gS~nuVFIW%8AxaJa6U}REkqQ^`ZNJNE$chfHjfZ0$zB3
z@iLDVgCUA5#}$;a!Ep(Q8a1xtmBrMGBilZaY&-Vx*&SbmHz+uojq;26l5I<C^te&k
z0F_FW_xiHMN+OEwP>?Z}qSxuRZpvI8LoykS9vT9fgCrcDI12n@YllAlP;$_FX1{Fr
z{6^k!@Q;-79Vq8w85m>6`74)RQz(>A5z%o`LB`lyKkVE+{rKUW3BGEjm{uIw;J8FY
zjS^!>G;?b!j(#q!;P|KJK<0icJzdQ?g3|oc4t?`r;XyP0zA4|2pECI;KFwCZuePjN
zA6-#d9UnQs7a{&?hfb6lZzRrm*k%o$LgDeFlI@3#z8iz?8X>;pYcFs24jA-}4t<x^
z=yAQW0U-l}4?R8qwJIWd#0q$JQ^s<IzNsa8c!U<-o*oXJ@E6u7ZmO$AP0=;6Ee`}9
z+1$!6od**H@$bNhD0uq#iO)=i7N>r#DaT9gd17wnBEAmetbn!a(lT0F&E|oLcLYP#
z(_MoIN%ubtuRvZd0*%#G$lLvuQy8h2%|<g$U9E)N-Tlg&t1|<L$lnTRes95IgTR=2
z^so@g^uitb3>XMLZC(LwAl60C!IEY?VmIc=o!g<Wtri2y8dMyduR~pBxg<O<CXQb!
z2NBi3wPv}7h}?-W#w*>r)v1fbc^wx!NV0R#kQfY`IK}Rr70@?i5aOpjVE69KzFnv<
zFSP@-Hn{N90o*JskR0de`BL$DTGonOB1-0fz5t4{7B2BJ3j(DK4e3%&@uZwG>q)rD
z<&uD!z#uVjY%O=^b~JTT(E8qNG$LpFHt-zU*+f7FOWN8MSwxh^0aXAR)~7FJMw7)O
z>5kwol?z||(RWW0eHokdIJs+w{eqWTgWrD5^H<0CJg|};oCSqvTZXupeE?Ng?Nw|w
zTX5oX1sA9}_1$HBX5}40^8VWyXlXV3jfe_@T4}FTctSG5lTt*-#ivi=TJA4hzIjI!
zGobwPtthr_7@0g4q4A00qwBdjC_0^M=SOca;Y?u_lydi~H&$ixDE6@e=5Ad2m%yfG
zW7u8cf$&k=S1`5<-Pvv+xu|R&cIT(A(SQrZHPEP)S6<0nVz5m!TR&U7A)&ndW?a+&
zUkvD!s2w?0sJ)Q%z%0m>(v>z(&L?;N8^-3g62CjZlADbvx~W6(0PTrqQ{N~gqCZ&`
zeEs0p-#n9Z>_h@TsSOLY-|8GW4vkMjWbzoN!d*LY48>>iTmn3Iy&Ae^BSwxLm2>aR
z2fresEGuAgRZ-E7Pyf0(f)@#6h7GhE)DfUm;n11Zc1bu>&{{0;{x7D@yW$%d_yiH<
z*p^$xYtxsiOeRYJSCA`dwf_YmKS*6Hu7N_~Q9N%&hM9<>`1rPfAMV<+ZN!Ch7sqKl
zJrEbswp(!HiJ0#q+!`v%#01=VO*xupTLm5Y;eF3uyNSk@R>UR@KQ!Zs$9R&S-x+X1
zb3?<{P0QDW3ye`*q!t>L^P-`rQ|#zV@Y@G|3?;z$>N{^&dwQv7^69k$<o__n_I$p6
zV`xcfMVyz)1M!i!RFralI{^9Fn3ww|vjq{6VL6Y!@<JsMb?lp+Pj!>@_4WVyXl0hK
zMPLf4lw%8OJ7td4v0V~UZAz*eQB<Xa8<Fm{%tZ!;r|J<RI%I7tbuRwk$8UBe|9a%t
z6d4iXqk`b6xV?vV>)^b4$-P`5-Y|@xGBJDneN)d75x?H+FeyM@JRJWZbCr8zqdtP)
zC?rG$IXt5{Qm(t_e3#B|&wCngP5vuO)A;r^ikDhW0o&K&bX|SJ*3GN3+$<KshhMSr
zyP4Z*SIX*8Ro@JfQRUnv>27L``dK3SuJahqZnqW{=AVCf`#-<n7nQOwtv3d1`Pshj
zW<6pu2E*eoK6f@OI%+o&Etm4#-TmN}>~HrDJ(hh$+|Qy1`9bT$tDxSSwIJXgCQqOG
z<LJo~ONr<yM;^Na<hMrqcYLzN>*~b<vEGUe3+VMVT$8~hCS)EIBT_~lm^SMnUe`?}
zB2%vb+t(xCLiT;OVI#^*D&l!$-x(Irr6lW4(`KVd3<@5(5mDjC9({QZUoX>$sKi-c
zm+o*GWBfe1XX}Pd?qwzAgL?|e;drIO?_fegg7Tk!^K~9^Tsf!r(;VC-z;-1c69i$+
z-&e0~uB)w&b`_FOD_71e2nY%axcuybd1@k>PDGBc7@XxnXL2*f5(Pon`^oBcy4u>h
znC>7s99NFtT4}X`mu4?~!@C`>tw40aTvpKPi!qig2*RF^S7qty>l*Ihkg?(XqSL;x
z(6_WA|3-}n7Z~V&Y4*bTzA~Apoc%$h8^|65woiA8V6p7|c=g&kDM$`??nbrvlY_s%
z@1^I{Qv+me)B39mqS-a+6<|B$7$yjNH?PX7v4!Lg^NZTxeEoc`%t=r6m&s%tuIo|I
z1=?N%wnN^{1YytSm04Bw^$i`rK=F5eem(_r(o?n61}A;}^;-kBLr&mIe!OZ;SzVou
z|LO@}U+;n!-d-@E9qwlrI2<<VlY%yZGl?ttw-xV}GbXdVw0OawcDU@m!1X8(b~g}X
z>~|)kalKrj;FZ)oB0AVzA6MSr76omT93p;eqN}b9?n;~63h2s!J#Etu*i*$ix9?Z5
zU%|dA(AWO`Yp`FzzADhy{{3sPU%|dA(AWO|1@zq-j|P~La{vGU07*qoM6N<$g7wLh
Au>b%7

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowright.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_rowright.png
new file mode 100644
index 0000000000000000000000000000000000000000..4831d738736513d0a6867c09ef01cdf79b6dfad1
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^T<o}Mm_AsNnZ
zuiW=yaui|vkRN_lI-jZc(D4hq1f1dzEdR=C)}-*?rhQfm$K59{)|_dLoOr6@+|0z6
zZ@!+p`Lp)^8x@TolSOL&2ROW8+sc^RFrz_EF{$Cn(_0LdPLCSuZyYGyULTlodig=u
z*XMLT<vTF$vCUv^x0x)H+OzRQ+8)XI^N!tds9<3}5T)RoZ0g7^@wv<EtK5b_fs%&Z
z_p|5Dj^L1Mu(m%gkY;=2`03eK`p>dkbb08WdG5h=kh`Pd0XvJ^35I<F;rtH&-b(*D
zep3FyXLGZv?Kc+ac1~cmSYzNMr_jT}Ea1|@%%OOQiACTc<CzW%hV~Wq_Y$MC{_aT1
zH9D##{rk?9j|}?-SI&L>_h#-rG4>7aGlGOy=P)UJzqzN{Jdb(b?!S*~Sq)k|q!#i{
kc$6Hmh8LY3_=Bx1@cT}~ppu?Bzz}BeboFyt=akR{05iv_fB*mh

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_spinner.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_spinner.png
new file mode 100644
index 0000000000000000000000000000000000000000..73fe242722f6a3efe92d2e690da9fde48029005f
GIT binary patch
literal 4178
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

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_up-arrow-level-switcher.png b/examples/latest/navigate/flutter/indoor_map_app/assets/indoor_up-arrow-level-switcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..76ec835b9f6e9678600b32816ba41aead9b04a59
GIT binary patch
literal 673
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)jKx9jP7LeL$-HD>V2bv1aSW-5
zdwbp1KR8jQ?c?vj$ER0Hm}^>DS{Td_u<KsjEyQ$e`uRuRYZ_lXI-_o=$H&Ka%uzGP
z<*i`v(|o_LD@@s$V=jF@awkW1um7(<RbNefKgkPuWW3$T!=Y@jfN>$ioZSx0PK*}i
zjchGU1@D-6IanXuVU-f#I<S-5L_wsXSUkf)gW<W}g@yozbFoBe_z}-6cK7JTpQrwD
z**sr(_OtGW%X?Q{n0xW$<ab#Y>Z>xi9vrG<`qvjOuNQpe55w#aMs8=gKjc@;RC>l7
zaVBQ+qhs>h7oWG6n=kRdzG_9$U(Ow+e>Z2!HS|6`Dz16=SKXx@`b!@tFF*HW-VM8i
z&&RiEz2A1~-)F(7i*u)!_+P5%lvLQpedAAVw3mB+)`xFLBMRqoPZvELm)G%@@m<^W
zBu{zsIJ0|8v|M=QHA0?zD$HZwAep~F<n-=GSCf`6PZwReJV2fO$Vq0ihptuYlQTW#
z@9n*H`TFB4KfQ0=j6BO&_^ILOnNrPZ^-iG`hA|huJ$r5Y@T&hRf&Isnms)(zo?fMO
zUH<)Rs}Cn9v#*IOh)p~)O-bx~Z@B!gCp){nGF>(2=Dz-3WZfWoVC73~F5AoBj!BCg
z<oI}Ej@{Sm7fSgo^7ubA=v!=`$@tJZiQ4gk9FYnvf7pVKb_GW5ns^wP<`_I({an^L
HB{Ts5DZV3;

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/structure-switcher.png b/examples/latest/navigate/flutter/indoor_map_app/assets/structure-switcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..3267c25e0ba0ed9800e613c89830623c5a23f2a7
GIT binary patch
literal 7921
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
Z5gPZRAMy4d{QF@8#+S_vD)exX{{s)4yp#X{

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/topology-default.png b/examples/latest/navigate/flutter/indoor_map_app/assets/topology-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..904fcfc8a7042e754be1e7ae7ed22c1748da0871
GIT binary patch
literal 1678
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
YAJwe|R{BW)#sB~S07*qoM6N<$g2nSMyZ`_I

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/assets/topology-focused.png b/examples/latest/navigate/flutter/indoor_map_app/assets/topology-focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5109e4f932daa528d3bc736706c3d7e7cdf4470
GIT binary patch
literal 3114
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
Eg3K_~aR2}S

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/flutter/indoor_map_app/ios/Flutter/AppFrameworkInfo.plist b/examples/latest/navigate/flutter/indoor_map_app/ios/Flutter/AppFrameworkInfo.plist
index 8c6e5614..082c8df0 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/latest/navigate/flutter/indoor_map_app/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>12.4</string>
 </dict>
 </plist>
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/drawing_switcher.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/drawing_switcher.dart
index 6514f15d..68f84737 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/drawing_switcher.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/drawing_switcher.dart
@@ -46,55 +46,86 @@ class DrawingSwitcherState extends State<DrawingSwitcher> {
 
   @override
   Widget build(BuildContext context) {
-    // Don't show the drawing switcher if no venue is selected or there is only
-    // one drawing in the venue.
-    if (_selectedDrawing == null || _selectedVenue!.venueModel.drawings.length < 2) {
+    if (_selectedDrawing == null) {
       return SizedBox.shrink();
     }
 
     // Create a list view with drawings.
-    Widget listView = ListView(
-      padding: EdgeInsets.zero,
-      shrinkWrap: true,
-      reverse: true,
-      itemExtent: kMinInteractiveDimension,
-      children: _selectedVenue!.venueModel.drawings.map((VenueDrawing drawing) {
-        return _drawingItemBuilder(context, drawing);
-      }).toList(),
+    Widget listView = Padding(
+      padding: EdgeInsets.only(bottom: 82), // Adjust the top padding as needed
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.white,
+        ),
+        child: ListView(
+          padding: EdgeInsets.zero,
+          shrinkWrap: true,
+          reverse: true,
+          itemExtent: kMinInteractiveDimension,
+          children: _selectedVenue!.venueModel.drawings.map((VenueDrawing drawing) {
+            return _drawingItemBuilder(context, drawing);
+          }).toList(),
+        ),
+      ),
     );
 
-    return Align(
-      alignment: Alignment.topRight,
-      child: Container(
-        margin: EdgeInsets.only(top: 5, right: 0),
-        child: Row(mainAxisSize: MainAxisSize.min, children: [
-          Align(
-            alignment: Alignment.topCenter,
-            child: SizedBox(
-              width: 200,
-              height: _selectedVenue!.venueModel.drawings.length * kMinInteractiveDimension,
-              child: _isOpen ? listView : null,
+    double getTextWidth(String text, TextStyle style) {
+      final TextPainter textPainter = TextPainter(
+        text: TextSpan(text: text, style: style),
+        maxLines: 1,
+        textDirection: TextDirection.ltr,
+      )..layout(minWidth: 0, maxWidth: double.infinity);
+
+      return textPainter.width;
+    }
+
+    return Stack(
+      children: [
+        Positioned(
+          right: 2,
+          bottom: _selectedVenue!.venueModel.drawings.length == 1 ? 280 : 280,
+          child: GestureDetector(
+            onTap: () {
+              // Hide or show the list with drawings.
+              setState(() {
+                _isOpen = !_isOpen;
+              });
+            },
+            child: Image.asset(
+              'assets/structure-switcher.png',
+              width: 70,
+              height: 70,
             ),
           ),
-          Container(
-            alignment: Alignment.topCenter,
-            width: kMinInteractiveDimension,
-            child: TextButton(
-              style: TextButton.styleFrom(
-                  padding: EdgeInsets.zero
-              ),
-              child:
-                  Icon(Icons.menu, color: _isOpen ? Colors.blue : Colors.black, size: kMinInteractiveDimension * 0.75),
-              onPressed: () {
-                // Hide or show the list with drawings.
-                setState(() {
-                  _isOpen = !_isOpen;
-                });
-              },
+        ),
+        Positioned(
+          right: 65,
+          bottom: _selectedVenue!.venueModel.drawings.length == 1
+              ? 210
+              : _selectedVenue!.venueModel.drawings.length == 2
+              ? 185
+              : 150,
+          child: Container(
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: SizedBox(
+                    width: 200,
+                    height: _selectedVenue!.venueModel.drawings.length == 1
+                        ? 130
+                        : _selectedVenue!.venueModel.drawings.length == 2
+                        ? 170
+                        : 280,
+                    child: _isOpen ? listView : null,
+                  ),
+                ),
+              ],
             ),
           ),
-        ]),
-      ),
+        ),
+      ],
     );
   }
 
@@ -104,14 +135,15 @@ class DrawingSwitcherState extends State<DrawingSwitcher> {
     Property? nameProp = drawing.properties["name"];
     return TextButton(
       style: TextButton.styleFrom(
-          foregroundColor: isSelectedDrawing ? Colors.blue : Colors.white,
-          padding: EdgeInsets.zero
+        backgroundColor: Colors.white, // Set background color to white
+        foregroundColor: Colors.black, // Set text color to black
+        padding: EdgeInsets.zero,
       ),
       child: Text(
         nameProp != null ? nameProp.asString : "",
-        textAlign: TextAlign.center,
+        textAlign: TextAlign.left,
         style: TextStyle(
-          color: isSelectedDrawing ? Colors.white : Colors.black,
+          color: isSelectedDrawing ? Colors.blue : Colors.black,
           fontWeight: isSelectedDrawing ? FontWeight.bold : FontWeight.normal,
         ),
       ),
@@ -120,6 +152,7 @@ class DrawingSwitcherState extends State<DrawingSwitcher> {
         _isOpen = false;
         // Select a drawing, if the user clicks on the item.
         _selectedVenue!.selectedDrawing = drawing;
+        setState(() {});
       },
     );
   }
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/events.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/events.dart
index ff37a020..bdcb49d5 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/events.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/events.dart
@@ -6,8 +6,26 @@ class ListEventHandler with ChangeNotifier {
 
 ListEventHandler listEventHandler = new ListEventHandler();
 
+class NameListEventHandler with ChangeNotifier {
+  ValueNotifier<List<String>> updatedNameList = ValueNotifier<List<String>>(["Venue Name"]);
+}
+
+NameListEventHandler nameListEventHandler = new NameListEventHandler();
+
+class VenueGeometryNameEventHandler with ChangeNotifier {
+  ValueNotifier<List<String>> updatedVenueGeometry = ValueNotifier<List<String>>(["Geometry Item"]);
+}
+
+VenueGeometryNameEventHandler venueGeometryNameEventHandler = new VenueGeometryNameEventHandler();
+
 class MapLoading with ChangeNotifier {
   ValueNotifier<bool> isMapLoading = ValueNotifier<bool>(false);
 }
 
 MapLoading mapLoading = new MapLoading();
+
+class SpeceTapped with ChangeNotifier {
+  ValueNotifier<bool> isSpaceTapped = ValueNotifier<bool>(false);
+}
+
+SpeceTapped spaceTapped = new SpeceTapped();
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/level_switcher.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/level_switcher.dart
index 3639068b..62f29f0e 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/level_switcher.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/level_switcher.dart
@@ -38,7 +38,8 @@ class LevelSwitcherState extends State<LevelSwitcher> {
   Venue? _selectedVenue;
   VenueDrawing? _selectedDrawing;
   VenueLevel? _selectedLevel;
-  final int _maxNumberOfVisibleLevels = 5;
+  final int _maxNumberOfVisibleLevels = 3;
+  ScrollController _scrollController = ScrollController();
 
   onLevelsChanged(Venue? selectedVenue) {
     setState(() {
@@ -55,9 +56,8 @@ class LevelSwitcherState extends State<LevelSwitcher> {
 
   @override
   Widget build(BuildContext context) {
-    // Don't show the level switcher if no venue is selected or there is only
-    // one level in the drawing.
-    if (_selectedDrawing == null || _selectedDrawing!.levels.length < 2 || _selectedLevel == null) {
+    // Don't show the level switcher if no venue is selected.
+    if (_selectedDrawing == null || _selectedLevel == null) {
       return SizedBox.shrink();
     }
 
@@ -66,6 +66,15 @@ class LevelSwitcherState extends State<LevelSwitcher> {
     final scrollIndex = _getScrollIndex();
     final scrollPosition = max(0, scrollIndex * kMinInteractiveDimension);
     final scrollController = new ScrollController();
+    double _marginBottom = 594;
+
+    if( _selectedDrawing!.levels.length == 1) {
+      _marginBottom = _marginBottom-(2*visibleHeight);
+    }
+
+    if( _selectedDrawing!.levels.length == 2) {
+      _marginBottom = 545;
+    }
 
     // Create a list view with levels.
     Widget listView = ListView(
@@ -88,43 +97,105 @@ class LevelSwitcherState extends State<LevelSwitcher> {
       });
     }
 
-    return Align(
+    return Stack(
       alignment: Alignment.bottomRight,
-      child: Container(
-        margin: EdgeInsets.only(bottom: 60, right: 5),
-        decoration: BoxDecoration(
-          color: Colors.black12,
-          border: Border.all(color: Colors.black12),
+      children: [
+        Container(
+          width: kMinInteractiveDimension,
+          margin: EdgeInsets.only(bottom: _marginBottom, right: 12),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(20),
+              topRight: Radius.circular(20),
+            ),
+          ),
+          child: GestureDetector(
+            onTap: () {
+              int currentIndex = _selectedDrawing!.levels.indexOf(_selectedLevel!);
+              if (currentIndex >= 0) {
+                VenueLevel levelAbove = _selectedDrawing!.levels[currentIndex + 1];
+                setState(() {
+                  _selectedVenue!.selectedLevel = levelAbove;
+                });
+              }
+            },
+            child: Image.asset(
+              'assets/indoor_up-arrow-level-switcher.png',
+              width: 40,
+              height: 40,
+            ),
+          ),
         ),
-        child: SizedBox(
+        Align(
+          alignment: Alignment.bottomRight,
+          child: Container(
+            margin: EdgeInsets.only(bottom:450, right: 12),
+            decoration: BoxDecoration(
+              color: Colors.black12,
+            ),
+            child: SizedBox(
+              width: kMinInteractiveDimension,
+              height: _getVisibleHeight(_selectedDrawing!.levels.length),
+              child: listView,
+            ),
+          ),
+        ),
+        Container(
           width: kMinInteractiveDimension,
-          height: _getVisibleHeight(_selectedDrawing!.levels.length),
-          child: listView,
+          margin: EdgeInsets.only(bottom: 410, right: 12),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.only(
+              bottomLeft: Radius.circular(20),
+              bottomRight: Radius.circular(20),
+            ),
+          ),
+          child: GestureDetector(
+            onTap: () {
+              int currentIndex = _selectedDrawing!.levels.indexOf(_selectedLevel!);
+              int lastIndex = _selectedDrawing!.levels.length - 1;
+              if (currentIndex <= lastIndex) {
+                VenueLevel levelBelow = _selectedDrawing!.levels[currentIndex - 1];
+                setState(() {
+                  _selectedVenue!.selectedLevel = levelBelow;
+                });
+              }
+            },
+            child: Image.asset(
+              'assets/indoor_down-arrow-level-switcher.png',
+              width: 40,
+              height: 40,
+            ),
+          ),
         ),
-      ),
+      ],
     );
   }
 
   // Create a list view item from the level.
   Widget _levelItemBuilder(BuildContext context, VenueLevel level) {
     bool isSelectedLevel = level.identifier == _selectedLevel!.identifier;
-    return TextButton(
-      style: TextButton.styleFrom(
-          foregroundColor: isSelectedLevel ? Colors.blue : Colors.white,
-          padding: EdgeInsets.zero
-      ),
-      child: Text(
-        level.shortName,
-        textAlign: TextAlign.center,
-        style: TextStyle(
-          color: isSelectedLevel ? Colors.white : Colors.black,
-          fontWeight: isSelectedLevel ? FontWeight.bold : FontWeight.normal,
+
+    return Container(
+      color: isSelectedLevel ? Colors.grey : Colors.white,
+      child: TextButton(
+        style: TextButton.styleFrom(
+          foregroundColor: isSelectedLevel ? Colors.white : Colors.black,
+          padding: EdgeInsets.zero,
+        ),
+        child: Text(
+          level.shortName,
+          textAlign: TextAlign.center,
+          style: TextStyle(
+            fontWeight: isSelectedLevel ? FontWeight.bold : FontWeight.normal,
+          ),
         ),
+        onPressed: () {
+          // Select a level, if the user clicks on the item.
+          _selectedVenue!.selectedLevel = level;
+        },
       ),
-      onPressed: () {
-        // Select a level, if the user clicks on the item.
-        _selectedVenue!.selectedLevel = level;
-      },
     );
   }
 
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/main.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/main.dart
index 29d3c599..f6ea9a39 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/main.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/main.dart
@@ -17,9 +17,13 @@
  * License-Filename: LICENSE
  */
 
+import 'dart:ffi';
+
 import 'package:flutter/material.dart';
 import 'package:here_sdk/core.errors.dart';
+import 'package:here_sdk/venue.data.dart';
 import 'package:indoor_map_app/geometry_info.dart';
+import 'package:indoor_map_app/level_switcher.dart';
 import 'package:indoor_map_app/settings_page.dart';
 import 'package:indoor_map_app/venue_engine_widget.dart';
 import 'package:here_sdk/core.dart';
@@ -27,8 +31,11 @@ import 'package:here_sdk/core.engine.dart';
 import 'package:here_sdk/core.errors.dart';
 import 'package:here_sdk/mapview.dart';
 import 'package:here_sdk/venue.dart';
+import 'package:indoor_map_app/venue_tap_controller.dart';
 import 'dart:convert';
 import 'events.dart';
+import 'package:sliding_up_panel/sliding_up_panel.dart';
+import 'package:indoor_map_app/venue_search_controller.dart';
 
 void main() {
   // Usually, you need to initialize the HERE SDK only once during the lifetime of an application.
@@ -68,8 +75,6 @@ class MyApp extends StatelessWidget {
 }
 
 class MainPage extends StatefulWidget {
-  const MainPage({super.key});
-
   @override
   State<MainPage> createState() => _MainPageState();
 }
@@ -80,139 +85,557 @@ class _MainPageState extends State<MainPage> {
   late String _venueIdAsString = "";
   late String _selectedVenue = "Venue Id";
   List _venueList = ["Venue Id"];
+  List _venueName = ["Venue Name"];
   bool _isPressed = false;
+  PanelController _panelController = PanelController();
+  String searchQuery = '';
+  late Map<String, String> venueMap;
+  late TextEditingController _searchController = TextEditingController();
+  late List<String> _geometryItemsList = ["Item"];
+  bool _isVenueListTapped = false;
+  bool _topologyPressed = false;
+  String _clickedVenueName = "";
+  late HereMapController _hereMapController;
+  int clickCount = 0;
+  bool isTextFieldTapped = false;
 
-  @override
-  void initState() {
-    super.initState();
+  void _resetCameraPosition() {
+    const double distanceToEarthInMeters = 500;
+    MapMeasure mapMeasureZoom = MapMeasure(MapMeasureKind.distance, distanceToEarthInMeters);
+    _hereMapController.camera.lookAtPointWithMeasure(GeoCoordinates(52.530932, 13.384915), mapMeasureZoom);
+
+    // Hide the extruded building layer, so that it does not overlap
+    // with the venues.
+    _hereMapController.mapScene.disableFeatures([MapFeatures.extrudedBuildings]);
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('HERE SDK for Flutter - Indoor Map'),
-      ),
       resizeToAvoidBottomInset: false,
-      body: Column(children: [
-        Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: EdgeInsets.only(left: 5, right: 5),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  ValueListenableBuilder<List>(
-                    builder: (BuildContext context, List value, Widget? child) {
-                      _venueList = value;
-                      return DropdownButton(
-                        hint: Text("MapList"),
-                        value: _selectedVenue,
-                        items: _venueList.map((item) {
-                          return DropdownMenuItem(
-                            child: Text(item),
-                            value: item,
+      body: Stack(
+        children: [
+          SlidingUpPanel(
+            controller: _panelController,
+            minHeight: 140,
+            maxHeight: 850,
+            panel: _buildSlidingPanel(),
+            body: Column(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(top: 50), // Set the desired margin top here
+                  child: Container(
+                    width: double.infinity,
+                    height: 60,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        ValueListenableBuilder<bool>(
+                          valueListenable: mapLoading.isMapLoading,
+                          builder: (BuildContext context, bool isLoading, Widget? child) {
+                            return isLoading
+                                ? Row(
+                              children: [
+                                Padding(
+                                  padding: EdgeInsets.only(left: 20),
+                                  child: GestureDetector(
+                                    onTap: () => _handleBackButtonPress(context),
+                                    child: Image.asset(
+                                      'assets/back-button.png',
+                                      width: 24,
+                                      height: 24,
+                                    ),
+                                  ),
+                                ),
+                                SizedBox(width: 8),
+                                Container(
+                                  width: MediaQuery.of(context).size.width - 105,
+                                  child: Padding(
+                                    padding: EdgeInsets.symmetric(vertical: 8),
+                                    child: Text(
+                                      _clickedVenueName,
+                                      style: TextStyle(fontSize: 16),
+                                      textAlign: TextAlign.left,
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                                  ),
+                                ),
+                                GestureDetector(
+                                  onTap: () {
+                                    setState(() {
+                                      _topologyPressed = !_topologyPressed;
+                                    });
+                                    _venueEngineState.venueEngine!.venueMap.selectedVenue!.isTopologyVisible = _topologyPressed;
+                                  },
+                                  child: Image.asset(
+                                    _topologyPressed ? 'assets/topology-focused.png' : 'assets/topology-default.png',
+                                    width: 40,
+                                    height: 40,
+                                  ),
+                                ),
+                              ],
+                            )
+                                : Container(); // Placeholder widget, replace with actual widget
+                          },
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 5, right: 5),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: <Widget>[
+                              ValueListenableBuilder<List>(
+                                builder: (BuildContext context, List value, Widget? child) {
+                                  _venueList = value;
+                                  return SizedBox();
+                                },
+                                valueListenable: listEventHandler.updatedList,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                Expanded(
+                  child: Stack(
+                    children: <Widget>[
+                      HereMap(onMapCreated: _onMapCreated),
+                      VenueEngineWidget(state: _venueEngineState),
+                      ValueListenableBuilder<bool>(
+                        valueListenable: mapLoading.isMapLoading,
+                        builder: (BuildContext context, bool isLoading, Widget? child) {
+                          return Center(
+                            child: Stack(
+                              children: [
+                                !_isVenueListTapped || isLoading
+                                    ? SizedBox() // Empty container when not loading or not tapped
+                                    : Transform.translate(
+                                  offset: Offset(0, -150),
+                                  child: Container(
+                                    decoration: BoxDecoration(
+                                      color: Colors.white,
+                                      borderRadius: BorderRadius.circular(10),
+                                    ),
+                                    padding: EdgeInsets.all(16),
+                                    child: CircularProgressIndicator(
+                                      valueColor: AlwaysStoppedAnimation<Color>(Colors.black),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
                           );
-                        }).toList(),
-                        onChanged: (value) {
-                          setState(() {
-                            _selectedVenue = "$value";
-                            _venueIdAsString = _selectedVenue;
-                            _isPressed = false;
-                            mapLoading.isMapLoading.value = false;
-                          });
                         },
-                      );
-                    },
-                    valueListenable: listEventHandler.updatedList,
-                    // The child parameter is most helpful if the child is
-                    // expensive to build and does not depend on the value from
-                    // the notifier.
+                      ),
+                    ],
                   ),
-                ],
-              ),
-            ),
-            Container(
-                margin: EdgeInsets.all(4),
-                width: 100,
-                child: ValueListenableBuilder<bool>(
-                  builder: (BuildContext context, bool value, Widget? child) {
-                    if(value) {
-                      _isPressed = false;
-                    }
-                    return ElevatedButton(
-                      onPressed: mapLoading.isMapLoading.value ? null: () async {
-                        if(_isPressed) {
-                          setState(() => _isPressed = false);
-                        }
-                        else {
-                          setState(() => _isPressed = true);
-                        }
-
-                        try {
-                          // Try to parse a venue id.
-                          int venueId = int.parse(_venueIdAsString);
-                          // Select a venue by id.
-                          _venueEngineState.selectVenue(venueId);
-                        } on FormatException catch (_) {
-                          print("Venue ID should be a number!");
-                        }
-                      },
-                      child: Text(_isPressed ? 'Loading...' : 'Go'),
-                    );
-                  },
-                  valueListenable: mapLoading.isMapLoading,
-                  // The child parameter is most helpful if the child is
-                  // expensive to build and does not depend on the value from
-                  // the notifier.
                 ),
+                GeometryInfo(state: _geometryInfoState),
+              ],
             ),
-            Container(
-              margin: EdgeInsets.all(4),
-              width: kMinInteractiveDimension,
-              child: TextButton(
-                style: TextButton.styleFrom(
-                    foregroundColor: Colors.white,
-                    padding: EdgeInsets.zero
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSlidingPanel() {
+    return Column(
+      children: [
+        // Non-scrollable elements
+        GestureDetector(
+          onPanUpdate: (details) {},
+          onPanEnd: (details) {},
+          child: Container(
+            margin: EdgeInsets.all(8.0),
+            padding: EdgeInsets.all(8.0),
+            height: 25,
+            child: Image.asset('assets/indoor_handle.png'),
+          ),
+        ),
+        Container(
+        margin: EdgeInsets.all(8.0),
+          padding: EdgeInsets.all(8.0),
+          height: 60,
+          decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey),
+          borderRadius: BorderRadius.circular(20.0),
+          ),
+          child: ValueListenableBuilder<bool>(
+            valueListenable: mapLoading.isMapLoading,
+            builder: (context, isMapLoading, child) {
+              return TextField(
+                controller: _searchController,
+                onChanged: (query) {
+                  setState(() {
+                    searchQuery = query.toLowerCase();
+                  });
+                },
+                onTap: () {
+                  _panelController.animatePanelToPosition(1.0);
+                },
+                decoration: InputDecoration(
+                  labelText: searchQuery.isEmpty ? (isMapLoading ? 'Search for spaces' : 'Search for venues') : '',
+                  prefixIcon: Icon(Icons.search),
+                  border: InputBorder.none,
+                  labelStyle: TextStyle(color: isTextFieldTapped ? Colors.black : Colors.black),
+                  suffix: searchQuery.isNotEmpty ? GestureDetector(
+                    onTap: () {
+                      setState(() {
+                        _searchController.clear();
+                        searchQuery = '';
+                        isTextFieldTapped = false;
+                      });
+                    },
+                    child: Container(
+                      width: 24,
+                      height: 24,
+                      alignment: Alignment.center,
+                      decoration: BoxDecoration(
+                        shape: BoxShape.circle,
+                        color: Colors.grey,
+                      ),
+                      child: Icon(
+                        Icons.clear,
+                        size: 16,
+                        color: Colors.white,
+                      ),
+                    ),
+                  ) : null,
                 ),
-                child: Icon(Icons.search, color: Colors.black, size: kMinInteractiveDimension),
-                onPressed: () {
-                  final venueSearchState = _venueEngineState.getVenueSearchState();
-                  venueSearchState.setOpen(!venueSearchState.isOpen());
+              );
+            },
+          ),
+        ),
+        Container(
+          alignment: Alignment.topCenter,
+          child: ValueListenableBuilder<List>(
+            builder: (BuildContext context, List value, Widget? child) {
+              _venueList = value;
+              if (_venueList.length == 1) {
+                return Container(
+                  height: 650, // Set the height of the container to match the sliding panel height
+                  alignment: Alignment.center, // Center its child vertically
+                  child: CircularProgressIndicator(
+                    valueColor: AlwaysStoppedAnimation<Color>(Colors.blue),
+                  ),
+                );
+              } else {
+                // Return an empty SizedBox to occupy no space
+                return SizedBox.shrink();
+              }
+            },
+            valueListenable: listEventHandler.updatedList,
+          ),
+        ),
+        SizedBox(height: 25),
+        // Scrollable elements
+        Expanded(
+          child: _buildDataTable(),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildDataTable() {
+    return ValueListenableBuilder<bool>(
+      valueListenable: mapLoading.isMapLoading,
+      builder: (context, isMapLoading, child) {
+        if (isMapLoading) {
+          return ValueListenableBuilder<bool>(
+            valueListenable: spaceTapped.isSpaceTapped,
+            builder: (context, isSpaceTapped, child) {
+              if (isSpaceTapped) {
+                return SingleChildScrollView(
+                  child: DataTable(
+                    columns: [
+                      DataColumn(label: Text('')),
+                      DataColumn(label: Text('')),
+                      DataColumn(label: Text('')),
+                    ],
+                    rows: _buildSingleTableRow(searchQuery, _venueEngineState.geometryList),
+                  ),
+                );
+              } else {
+                return SingleChildScrollView(
+                  child: DataTable(
+                    columns: [
+                      DataColumn(label: Text('')),
+                      DataColumn(label: Text('')),
+                      DataColumn(label: Text('')),
+                    ],
+                    rows: _buildTableRowsOfLoadedVenue(searchQuery, _venueEngineState.geometryList),
+                  ),
+                );
+              }
+            },
+          );
+        } else {
+          return ValueListenableBuilder<List<String>>(
+            valueListenable: nameListEventHandler.updatedNameList,
+            builder: (context, venueNames, child) {
+              _venueName = venueNames.cast<String>();
+              return SingleChildScrollView(
+                child: DataTable(
+                  columns: [
+                    DataColumn(label: Text('')),
+                    DataColumn(label: Text('')),
+                    DataColumn(label: Text('')),
+                  ],
+                  rows: _buildTableRows(searchQuery, _venueName.cast<String>()),
+                ),
+              );
+            },
+          );
+        }
+      },
+    );
+  }
+
+  List<DataRow> _buildSingleTableRow(String searchQuery, List<String> venueList) {
+    FocusScope.of(context).unfocus();
+    _panelController.animatePanelToPosition(0.12);
+
+    List<DataRow> rows = [];
+    rows.clear();
+      rows.add(
+        DataRow(
+          cells: [
+            DataCell(
+              GestureDetector(
+                onTap: () {
+                  //Do Nothing
                 },
+                child: Container(
+                  width: 20,
+                  child: Image.asset(
+                      'assets/indoor_rowleft.png', width: 20, height: 22),
+                ),
               ),
             ),
-            Container(
-              margin: EdgeInsets.all(4),
-              width: kMinInteractiveDimension,
-              child: TextButton(
-                style: TextButton.styleFrom(
-                    foregroundColor: Colors.white,
-                    padding: EdgeInsets.zero
+            DataCell(
+              GestureDetector(
+                onTap: () {
+                  //Do Nothing
+                },
+                child: Container(
+                  //width: 225,
+                  width: MediaQuery.of(context).size.width - 200,
+                  child: Text(
+                    _venueEngineState.venueTapController!.tappedSpaceName,
+                    maxLines: 1,
+                    overflow: TextOverflow
+                        .ellipsis,
+                  ),
+                ),
+              ),
+            ),
+            DataCell(
+              GestureDetector(
+                onTap: () {
+                  //Do Nothing
+                },
+                child: Container(
+                  width: 16,
+                  child: Image.asset(
+                      'assets/indoor_rowright.png', width: 16, height: 18),
                 ),
-                child: Icon(Icons.settings, color: Colors.black, size: kMinInteractiveDimension),
-                onPressed: () => Navigator.pushNamed(context, '/settings'),
               ),
-            )
+            ),
           ],
         ),
-        Expanded(
-          child: Stack(children: <Widget>[
-            // Add a HERE map.
-            HereMap(onMapCreated: _onMapCreated),
-            // Add a venue engine widget, which helps to control venues
-            // on the map.
-            VenueEngineWidget(state: _venueEngineState),
-          ]),
-        ),
-        // Add a geometry info widget, to show information about geometry.
-        GeometryInfo(state: _geometryInfoState)
-      ]),
-    );
+      );
+    return rows;
+  }
+
+  List<DataRow> _buildTableRowsOfLoadedVenue(String searchQuery, List<String> venueList) {
+    if(_venueEngineState.venueTapController?.clickCount == 1) {
+      FocusScope.of(context).unfocus();
+      _panelController.animatePanelToPosition(0.0);
+      _venueEngineState.venueTapController?.clickCount = 0;
+    }
+
+    List<DataRow> rows = [];
+    rows.clear();
+    for (int i = 1; i < venueList.length; i++) {
+      String venue = venueList[i];
+      if (venue.toLowerCase().contains(searchQuery)) {
+        rows.add(
+          DataRow(
+            cells: [
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRowOfLoadedVenue(venue);
+                  },
+                  child: Container(
+                    width: 20,
+                    child: Image.asset(
+                        'assets/indoor_rowleft.png', width: 20, height: 22),
+                  ),
+                ),
+              ),
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRowOfLoadedVenue(venue);
+                  },
+                  child: Container(
+                    //width: 225,
+                    width: MediaQuery.of(context).size.width - 200,
+                    child: Text(
+                      venue,
+                      maxLines: 1,
+                      overflow: TextOverflow
+                          .ellipsis,
+                    ),
+                  ),
+                ),
+              ),
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRowOfLoadedVenue(venue);
+                  },
+                  child: Container(
+                    width: 16,
+                    child: Image.asset(
+                        'assets/indoor_rowright.png', width: 16, height: 18),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      }
+    }
+
+    return rows;
+  }
+
+  List<DataRow> _buildTableRows(String searchQuery, List<String> venueList) {
+    List<DataRow> rows = [];
+
+    // Ensure both _venueName and _venueList are of type List<String>
+    List<String> venueNameList = _venueName.cast<String>();
+    List<String> venueListString = _venueList.cast<String>();
+
+    // Create a map to link venue names to venue IDs
+    venueMap = Map.fromIterables(venueNameList, venueListString);
+    for (int i = 1; i < venueList.length; i++) {
+      String venue = venueList[i];
+
+      // Check if the current row matches the search query
+      if (venue.toLowerCase().contains(searchQuery)) {
+        rows.add(
+          DataRow(
+            cells: [
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRow(venue);
+                  },
+                  child: Container(
+                    width: 20,
+                    child: Image.asset('assets/indoor_row_icon.png', width: 20, height: 22),
+                  ),
+                ),
+              ),
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRow(venue);
+                  },
+                  child: Container(
+                    //width: 225,
+                    width: MediaQuery.of(context).size.width - 200,
+                    child: Text(
+                      venue,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                ),
+              ),
+              DataCell(
+                GestureDetector(
+                  onTap: () {
+                    onTapRow(venue);
+                  },
+                  child: Container(
+                    width: 16,
+                    child: Image.asset('assets/indoor_rightaccessory.png', width: 16, height: 18),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      }
+    }
+
+    return rows;
+  }
+
+  void onTapRowOfLoadedVenue(String venue) {
+    _searchController.text = '';
+    searchQuery = '';
+    _searchController.clear();
+
+    print('clicked spaces for loaded venue: $venue');
+    final index = _venueEngineState.geometryList.indexOf(venue)-1;
+    print('index value : $index');
+
+    if (_venueEngineState.venueTapController != null && _venueEngineState != null) {
+      _venueEngineState.venueTapController?.selectGeometry(
+          _venueEngineState.getVenueSearchState().searchResult[index],
+          _venueEngineState.getVenueSearchState().searchResult[index].center,
+          true
+      );
+    }
+
+    FocusScope.of(context).unfocus();
+    _panelController.animatePanelToPosition(0.0);
+
+    _buildSlidingPanel();
+  }
+
+  void onTapRow(String venue) {
+    _searchController.text = '';
+    searchQuery = '';
+    _searchController.clear();
+    print('clicked name of venue: $venue');
+    _clickedVenueName = venue;
+
+    _isVenueListTapped = true;
+
+    if(mapLoading.isMapLoading.value) {
+      print("true");
+    } else {
+      print("false");
+    }
+
+    mapLoading.isMapLoading.value = true;
+    mapLoading.isMapLoading.value = false;
+
+    // Perform additional actions when a row is tapped
+    String venueId = venueMap[venue] ?? "";
+    if (venueId.isNotEmpty) {
+      int venueIdAsInt = int.parse(venueId);
+      _venueEngineState.selectVenue(venueIdAsInt);
+    } else {
+      print('Venue ID not found for venue: $venue');
+    }
+
+    FocusScope.of(context).unfocus();
+    _panelController.animatePanelToPosition(0.0);
+
+    _buildSlidingPanel();
   }
 
   void _onMapCreated(HereMapController hereMapController) {
+    _hereMapController = hereMapController;
     // Load a scene from the HERE SDK to render the map with a map scheme.
     hereMapController.mapScene.loadSceneForMapScheme(MapScheme.normalDay, (MapError? error) {
       if (error != null) {
@@ -238,9 +661,46 @@ class _MainPageState extends State<MainPage> {
         print('error caught: $e');
       }
     });
+    setWatermarkLocation(hereMapController);
   }
 
   _onVenueEngineCreated() {
     _venueEngineState.onVenueEngineCreated();
   }
+
+  void setWatermarkLocation(HereMapController hereMapController) {
+    Anchor2D anchor = Anchor2D.withHorizontalAndVertical(0.0, 0.78);
+    Point2D offset = Point2D(0, 0);
+    hereMapController.setWatermarkLocation(anchor, offset);
+  }
+
+
+  void _handleBackButtonPress(BuildContext context) {
+    print("back button pressed");
+    setState(() {
+      _isVenueListTapped = false;
+      _clickedVenueName = '';
+    });
+    mapLoading.isMapLoading.value = false;
+
+    setState(() {
+      _topologyPressed = false;
+    });
+    _venueEngineState.venueEngine!.venueMap.selectedVenue!.isTopologyVisible = _topologyPressed;
+
+    _venueEngineState.venueEngine?.venueMap.removeVenue(_venueEngineState.venueEngine!.venueMap.selectedVenue!);
+    _venueEngineState.getLevelSwitcherState().onLevelsChanged(null);
+    _venueEngineState.getDrawingSwitcherState().onDrawingsChanged(null);
+
+    _buildSlidingPanel();
+
+    Navigator.of(context).maybePop();
+    setState(() {});
+
+    if (_hereMapController != null) {
+      _resetCameraPosition();
+    }
+
+  }
+
 }
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_engine_widget.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_engine_widget.dart
index 0de4fc02..7cd75c47 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_engine_widget.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_engine_widget.dart
@@ -35,6 +35,79 @@ import 'events.dart';
 import 'geometry_info.dart';
 import 'package:here_sdk/venue.style.dart';
 
+class CustomAlertDialog extends StatelessWidget {
+  final String errorMsg;
+
+  const CustomAlertDialog({Key? key, required this.errorMsg}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    // Calculate the height based on the text size of the errorMsg
+    double contentHeight = (errorMsg.length / 40) * 30; // Assuming 50 characters per line and 30px per line height
+
+    return SizedBox(
+      height: double.infinity,
+      child: Align(
+        alignment: Alignment.topCenter,
+        child: Padding(
+          padding: const EdgeInsets.only(bottom: 580),
+          child: AlertDialog(
+            backgroundColor: Colors.red,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(10),
+            ),
+            insetPadding: EdgeInsets.symmetric(vertical: 30),
+            content: Container(
+              width: double.infinity,
+              height: contentHeight,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Expanded(
+                    child: Text(
+                      errorMsg,
+                      style: TextStyle(color: Colors.white),
+                    ),
+                  ),
+                  SizedBox(width: 40),
+                  Container(
+                    width: 25,
+                    height: 25,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      color: Colors.white,
+                    ),
+                    child: Center(
+                      child: IconButton(
+                        padding: EdgeInsets.zero,
+                        iconSize: 18,
+                        icon: Icon(Icons.close, color: Colors.red),
+                        onPressed: () {
+                          Navigator.of(context, rootNavigator: true).pop('dialog');
+                        },
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+void showCustomDialog(BuildContext context, String errorMsg) {
+  showDialog(
+    context: context,
+    builder: (BuildContext context) {
+      return CustomAlertDialog(errorMsg: errorMsg);
+    },
+    barrierDismissible: false,
+  );
+}
+
 class VenueEngineWidget extends StatefulWidget {
   final VenueEngineState state;
 
@@ -55,12 +128,14 @@ class VenueEngineState extends State<VenueEngineWidget> {
   late VenueDrawingSelectionListener _drawingSelectionListener;
   late VenueLevelSelectionListener _levelSelectionListener;
   late VenueLifecycleListenerImpl _venueLifecycleListener;
+  late VenueInfoListListener _venueInfoListListener;
   late VenueListener _venueListener;
-  VenueTapController? _venueTapController;
+  VenueTapController? venueTapController;
   VenueTapListenerImpl? _tapListener;
   final _drawingSwitcherState = DrawingSwitcherState();
   final _levelSwitcherState = LevelSwitcherState();
   final _venueSearchState = VenueSearchControllerState();
+  late List<String> geometryList = ["Item"];
 
   // Set value for hrn with your platform catalog HRN value if you want to load non default collection.
   String HRN = "YOUR_CATALOG_HRN";
@@ -95,6 +170,15 @@ class VenueEngineState extends State<VenueEngineWidget> {
     return _venueSearchState;
   }
 
+  LevelSwitcherState getLevelSwitcherState() {
+    return _levelSwitcherState;
+  }
+
+  DrawingSwitcherState getDrawingSwitcherState() {
+    return _drawingSwitcherState;
+  }
+
+
   set(HereMapController hereMapController, VenueEngine venueEngine,
       GeometryInfoState geometryInfoState) {
     _hereMapController = hereMapController;
@@ -139,28 +223,7 @@ class VenueEngineState extends State<VenueEngineWidget> {
             errorMsg = "Unknown Error encountered";
         }
 
-        // set up the button
-        Widget okButton = TextButton(
-          child: Text("OK"),
-          onPressed: () { Navigator.of(context, rootNavigator: true).pop('dialog'); },
-        );
-
-        // set up the AlertDialog
-        AlertDialog alert = AlertDialog(
-          title: Text("Attention"),
-          content: Text(errorMsg),
-          actions: [
-            okButton,
-          ],
-        );
-
-        // show the dialog
-        showDialog(
-          context: context,
-          builder: (BuildContext context) {
-            return alert;
-          },
-        );
+        showCustomDialog(context, errorMsg);
 
       });
     }
@@ -175,20 +238,23 @@ class VenueEngineState extends State<VenueEngineWidget> {
     _drawingSelectionListener = DrawingSelectionListenerImpl(this);
     _levelSelectionListener = LevelSelectionListenerImpl(this);
     _venueLifecycleListener = VenueLifecycleListenerImpl(this);
+    _venueInfoListListener = VenueInfoListListenerImpl(this);
     venueMap.addVenueSelectionListener(_venueSelectionListener);
     venueMap.addDrawingSelectionListener(_drawingSelectionListener);
     venueMap.addLevelSelectionListener(_levelSelectionListener);
     venueMap.addVenueLifecycleListener(_venueLifecycleListener);
+    venueMap.addVenueInfoListListener(_venueInfoListListener);
     _venueListener = VenueListenerImpl(this);
     _venueEngine!.venueService.addVenueListener(_venueListener);
     // Create a venue tap controller.
-    _venueTapController = VenueTapController(
+    venueTapController = VenueTapController(
         hereMapController: _hereMapController, venueMap: venueMap, geometryInfoState: _geometryInfoState);
-    _tapListener = VenueTapListenerImpl(_venueTapController);
+    _tapListener = VenueTapListenerImpl(venueTapController);
 
     // Set a tap listener.
     _hereMapController!.gestures.tapListener = _tapListener;
-    _venueSearchState.set(_venueTapController);
+    _venueSearchState.set(venueTapController);
+    venueEngine!.venueService.loadTopologies();
     // Start VenueEngine. Once authentication is done, the authentication
     // callback will be triggered. Afterwards, VenueEngine will start
     // VenueService. Once VenueService is initialized,
@@ -215,6 +281,7 @@ class VenueEngineState extends State<VenueEngineWidget> {
     if (selectedVenue != null) {
       // Move camera to the selected venue.
       _hereMapController!.camera.lookAtPoint(selectedVenue.venueModel.center);
+      geometryList = _venueSearchState.itemsList;
     }
     // Update the selected drawing with a new selected venue.
     onDrawingSelectionChanged(selectedVenue);
@@ -232,19 +299,47 @@ class VenueEngineState extends State<VenueEngineWidget> {
     // Update the LevelSwitcherState.
     _levelSwitcherState.onLevelsChanged(selectedVenue);
     // Deselect the geometry in case of a selection of a level.
-    _venueTapController!.onLevelChanged(selectedVenue);
+    venueTapController!.onLevelChanged(selectedVenue);
   }
 
   onVenuesChanged() {
     onVenueSelectionChanged(_venueEngine!.venueMap.selectedVenue);
     mapLoading.isMapLoading.value = true;
+    geometryList = _venueSearchState.itemsList;
+  }
+}
+
+class VenueInfoListListenerImpl implements VenueInfoListListener {
+
+  late List<String> list = <String>["Venue Id"];
+  late List<String> nameList = <String>["Venue Name"];
+
+  VenueInfoListListenerImpl(VenueEngineState venueEngineState);
+
+  @override
+  void onVenueInfoListLoad(List<VenueInfo> venueInfoList) {
+    // TODO: implement onVenueInfoListLoad
+    for (int i = 0; i < venueInfoList.length; i++) {
+      int venueId = venueInfoList[i].venueId;
+      var updatedVenueIdList = venueInfoList[i].venueIdentifier.substring(venueInfoList[i].venueIdentifier.length - 5);
+      var updatedVenueNameList = venueInfoList[i].venueName;
+      list.insert(i + 1, updatedVenueIdList);
+      nameList.insert(i+1, updatedVenueNameList);
+      print("list = " + list[i + 1]);
+      print("Venue Identifier: " + venueInfoList[i].venueIdentifier + " Venue Id: $venueId" + " Venue Name: " + venueInfoList[i].venueName);
+    }
+    listEventHandler.updatedList.value = list;
+    nameListEventHandler.updatedNameList.value = nameList;
+    print("listEventHandler value = ${listEventHandler.updatedList.value}");
   }
+  
 }
 
 // Listener for the VenueService event.
 class VenueServiceListenerImpl implements VenueServiceListener {
   late VenueEngineState _venueEngineState;
   late List<String> list = <String>["Venue Id"];
+  late List<String> nameList = <String>["Venue Name"];
 
   VenueServiceListenerImpl(VenueEngineState venueEngineState) {
     _venueEngineState = venueEngineState;
@@ -253,9 +348,7 @@ class VenueServiceListenerImpl implements VenueServiceListener {
   @override
   onInitializationCompleted(VenueServiceInitStatus result) {
     if (result == VenueServiceInitStatus.onlineSuccess) {
-      //Get List of venues info
-      List<VenueInfo> venueInfo =
-      _venueEngineState!._venueEngine!.venueMap.getVenueInfoListWithErrors((VenueErrorCode? venueLoadError) {
+      _venueEngineState!._venueEngine!.venueMap.getVenueInfoListAsyncWithErrors((VenueErrorCode? venueLoadError) {
         String errorMsg;
         switch(venueLoadError) {
           case VenueErrorCode.noNetwork:
@@ -292,15 +385,6 @@ class VenueServiceListenerImpl implements VenueServiceListener {
             errorMsg = "Unknown Error encountered";
         }
       });
-      for (int i = 0; i < venueInfo.length; i++) {
-        int venueId = venueInfo[i].venueId;
-        var updatedVenueIdList = venueInfo[i].venueIdentifier.substring(venueInfo[i].venueIdentifier.length - 5);
-        list.insert(i + 1, updatedVenueIdList);
-        print("list = " + list[i + 1]);
-        print("Venue Identifier: " + venueInfo[i].venueIdentifier + " Venue Id: $venueId" + " Venue Name: " + venueInfo[i].venueName);
-      }
-      listEventHandler.updatedList.value = list;
-      print("listEventHandler value = ${listEventHandler.updatedList.value}");
     } else {
       print("VenueService failed to initialize!");
     }
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_search_controller.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_search_controller.dart
index 7dea8c82..c9fe4bbf 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_search_controller.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_search_controller.dart
@@ -24,6 +24,7 @@ import 'package:flutter/material.dart';
 import 'package:here_sdk/venue.control.dart';
 import 'package:here_sdk/venue.data.dart';
 import 'package:indoor_map_app/venue_tap_controller.dart';
+import 'events.dart';
 
 class VenueSearchController extends StatefulWidget {
   final VenueSearchControllerState state;
@@ -40,9 +41,11 @@ class VenueSearchControllerState extends State<VenueSearchController> {
   bool _isOpen = false;
   TextEditingController _filterController = TextEditingController();
   VenueGeometryFilterType? _filterType = VenueGeometryFilterType.name;
-  late List<String> _itemsList = ["Select Item"];
+  late List<String> itemsList = ["Select Item"];
   late String _dropdownValue = "Select Item";
   late List<VenueGeometry> _searchResult;
+
+  List<VenueGeometry> get searchResult => _searchResult;
   var _iconMap = new Map();
   int _rowStrLength = 40;
 
@@ -64,8 +67,8 @@ class VenueSearchControllerState extends State<VenueSearchController> {
     setState(() {
       _venue = venue;
       _filterType = VenueGeometryFilterType.name;
-      if(_itemsList.length > 1) {
-        _itemsList.removeRange(1, _itemsList.length);
+      if(itemsList.length > 1) {
+        itemsList.removeRange(1, itemsList.length);
         _dropdownValue = "Select Item";
       }
       int duplicateCount = 0;
@@ -79,14 +82,14 @@ class VenueSearchControllerState extends State<VenueSearchController> {
         }
         var geometryLevel = _searchResult[i].level.name;
         var name = geometryName + "," + geometryLevel;
-        if(_itemsList.contains(name)) {
+        if(itemsList.contains(name)) {
           duplicateCount += 1;
           name += " $duplicateCount";
-          _itemsList.insert(i + 1, name);
+          itemsList.insert(i + 1, name);
         }
         else {
           duplicateCount = 0;
-          _itemsList.insert(i + 1, name);
+          itemsList.insert(i + 1, name);
         }
       }
     });
@@ -119,8 +122,8 @@ class VenueSearchControllerState extends State<VenueSearchController> {
               onChanged: (VenueGeometryFilterType? filterType) {
                 setState(() {
                   _filterType = filterType;
-                  if(_itemsList.length > 1) {
-                    _itemsList.removeRange(1, _itemsList.length);
+                  if(itemsList.length > 1) {
+                    itemsList.removeRange(1, itemsList.length);
                   }
                   if(_filterType!.name == "name") {
                     int duplicateCount = 0;
@@ -134,14 +137,14 @@ class VenueSearchControllerState extends State<VenueSearchController> {
                       }
                       var geometryLevel = _searchResult[i].level.name;
                       var name = geometryName + ", " + geometryLevel;
-                      if(_itemsList.contains(name)) {
+                      if(itemsList.contains(name)) {
                         duplicateCount += 1;
                         name += " $duplicateCount";
-                        _itemsList.insert(i + 1, name);
+                        itemsList.insert(i + 1, name);
                       }
                       else {
                         duplicateCount = 0;
-                        _itemsList.insert(i + 1, name);
+                        itemsList.insert(i + 1, name);
                       }
                     }
                   }
@@ -159,14 +162,14 @@ class VenueSearchControllerState extends State<VenueSearchController> {
                       var geometryLevel = _searchResult[i].level.name;
                       var name = geometryName + ", " + geometryLevel;
                       name += "\n(Icon: " + _searchResult[i].labelName + ")";
-                      if(_itemsList.contains(name)) {
+                      if(itemsList.contains(name)) {
                         duplicateCount += 1;
                         name += " $duplicateCount";
-                        _itemsList.insert(i+1, name);
+                        itemsList.insert(i+1, name);
                       }
                       else {
                         duplicateCount = 0;
-                        _itemsList.insert(i+1, name);
+                        itemsList.insert(i+1, name);
                       }
                     }
                   }
@@ -185,21 +188,21 @@ class VenueSearchControllerState extends State<VenueSearchController> {
                       var name = geometryName + ", " + geometryLevel;
                       var address = "";
                       if(geometryAddress != null) {
-                          address = geometryAddress!.address;
+                        address = geometryAddress!.address;
                       }
                       name += "\n(Address: " + address + ")";
-                      if(_itemsList.contains(name)) {
+                      if(itemsList.contains(name)) {
                         duplicateCount += 1;
                         name += " $duplicateCount";
-                        _itemsList.insert(i + 1, name);
+                        itemsList.insert(i + 1, name);
                       }
                       else {
                         duplicateCount = 0;
-                        _itemsList.insert(i + 1, name);
-                      }
+                        itemsList.insert(i + 1, name);
                       }
                     }
-                  _dropdownValue = _itemsList[0];
+                  }
+                  _dropdownValue = itemsList[0];
                 });
               },
               items: VenueGeometryFilterType.values.map((VenueGeometryFilterType type) {
@@ -219,7 +222,7 @@ class VenueSearchControllerState extends State<VenueSearchController> {
           child: DropdownButton(
             // Initial Value
             value: _dropdownValue,
-            items: _itemsList.map((String items) {
+            items: itemsList.map((String items) {
               return DropdownMenuItem(
                 value: items,
                 child: Text(items),
@@ -228,7 +231,7 @@ class VenueSearchControllerState extends State<VenueSearchController> {
             onChanged: (value) {
               setState(() {
                 _dropdownValue = value!;
-                final index = _itemsList.indexOf(_dropdownValue)-1;
+                final index = itemsList.indexOf(_dropdownValue)-1;
                 _tapController!.selectGeometry(_searchResult[index], _searchResult[index].center, true);
                 setOpen(false);
               });
@@ -286,3 +289,4 @@ class VenueSearchControllerState extends State<VenueSearchController> {
     );
   }
 }
+
diff --git a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_tap_controller.dart b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_tap_controller.dart
index f9aa10f6..fc49b1c3 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/lib/venue_tap_controller.dart
+++ b/examples/latest/navigate/flutter/indoor_map_app/lib/venue_tap_controller.dart
@@ -25,11 +25,14 @@ import 'package:here_sdk/venue.data.dart';
 import 'package:here_sdk/venue.style.dart';
 import 'package:indoor_map_app/geometry_info.dart';
 import 'package:indoor_map_app/image_helper.dart';
+import 'events.dart';
 
 class VenueTapController {
   final HereMapController? hereMapController;
   final VenueMap venueMap;
   final GeometryInfoState? geometryInfoState;
+  String tappedSpaceName = "";
+  int clickCount = 0;
 
   MapImage? _markerImage;
   MapMarker? _marker;
@@ -60,8 +63,14 @@ class VenueTapController {
     // Get a VenueGeometry under the tapped position.
     VenueGeometry? geometry = venueMap.getGeometry(position);
     if (geometry != null) {
+      spaceTapped.isSpaceTapped.value = false;
+      spaceTapped.isSpaceTapped.value = true;
+      clickCount = 1;
       selectGeometry(geometry, position, false);
+      tappedSpaceName = geometry.name+ ", "+geometry.level.name;
+      print('tappedSpaceName : $tappedSpaceName');
     } else {
+      spaceTapped.isSpaceTapped.value = false;
       // If no geometry was tapped, check if there is a not-selected venue under
       // the tapped position. If there is one, select it.
       Venue? venue = venueMap.getVenue(position);
diff --git a/examples/latest/navigate/flutter/indoor_map_app/pubspec.yaml b/examples/latest/navigate/flutter/indoor_map_app/pubspec.yaml
index 5aae991e..44ff96c2 100644
--- a/examples/latest/navigate/flutter/indoor_map_app/pubspec.yaml
+++ b/examples/latest/navigate/flutter/indoor_map_app/pubspec.yaml
@@ -22,6 +22,7 @@ environment:
   flutter: ">=3.13.9"
 
 dependencies:
+  sliding_up_panel: ^2.0.0+1
   flutter:
     sdk: flutter
 
diff --git a/examples/latest/navigate/ios/HelloMap/HelloMap/ViewController.swift b/examples/latest/navigate/ios/HelloMap/HelloMap/ViewController.swift
index 1d02dd73..7087536b 100644
--- a/examples/latest/navigate/ios/HelloMap/HelloMap/ViewController.swift
+++ b/examples/latest/navigate/ios/HelloMap/HelloMap/ViewController.swift
@@ -23,7 +23,7 @@ import UIKit
 class ViewController: UIViewController {
 
     var mapView : MapView!
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -31,21 +31,20 @@ class ViewController: UIViewController {
         mapView = MapView(frame: view.bounds)
         view.addSubview(mapView)
 
+        // The camera can be configured before or after a scene is loaded.
+        let camera = mapView.camera
+        let distanceInMeters = MapMeasure(kind: .distance, value: 1000 * 10)
+        camera.lookAt(point: GeoCoordinates(latitude: 52.518043, longitude: 13.405991), zoom: distanceInMeters)
+
         // Load the map scene using a map scheme to render the map with.
         mapView.mapScene.loadScene(mapScheme: MapScheme.normalDay, completion: onLoadScene)
     }
 
     // Completion handler when loading a map scene.
     private func onLoadScene(mapError: MapError?) {
-        guard mapError == nil else {
-            print("Error: Map scene not loaded, \(String(describing: mapError))")
-            return
+        if let error = mapError {
+            print("Error: Map scene not loaded, \(error)")
         }
-
-        // Configure the map.
-        let camera = mapView.camera
-        let distanceInMeters = MapMeasure(kind: .distance, value: 1000 * 10)
-        camera.lookAt(point: GeoCoordinates(latitude: 52.518043, longitude: 13.405991), zoom: distanceInMeters)
     }
 
     override func didReceiveMemoryWarning() {
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/Contents.json b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/Contents.json
new file mode 100644
index 00000000..c78834d3
--- /dev/null
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_ambulance.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/img_ambulance.png b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_ambulance.imageset/img_ambulance.png
new file mode 100644
index 0000000000000000000000000000000000000000..845af2bec540f861cb7c9996b34cb00b8d08f921
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000~S000;W1^@s6>71Q{00001b5ch_0Itp)
z=>Px%b4f%&R7gwZmd{HRVHn3h&+KZEI4h>Rf=IjDk5ea$E*_#nvF;tJKcKoK6%-vR
zL+DcUgNUd<pp&Pt2#TOfHw%&=shlmua$0ppp|aI^YNlNn*IjqZAD7<K%=><y=kv~Y
zp68trfLPO}b|lgz!g~MyZ---#^agnn$;+sm6X<hn>q4nK(vV2@sLGAMg@pC4ZAk!(
zr*c3P`0m=)hLXToJoN=gEC(paB|l!#i-kOO(b>AOv9WK(c_kK4>2hG@W96m%^!7PU
z#tCay5g1_Zxwdt*YGA>tV!IaEl(*EM_wY<XPUbbEu5Gnd4J;Hxz97n4AJ*lyE@1lC
zk-13Q<mCI&0(41B{~efq1iC+fC<ooIR)1NbZ)2gaN)<#yJlz|vMqg9>gkg=swQ1Wr
zy{bU7IekDxANmkMUpRKAV?}`=cLn@@4u+>Rh-gp#_J?aXnlR`e3arRGtklP%3`Di|
za5g(UvnIg&hK87(-@PQT+CHrGgrW5-t9{Ze*o&fX))WX#{O3S{+lm?>$Ez%iX_Q+C
zJAm#IF@dF@ftC`BuUy+|&mYD^!1hW|MXyiWnN#(xts9M8ZMKB|wV2Jx6C!f6#G*5A
zM7DWzxoC}H3<LF*fC$gs@y1TGX{t*M9VpU!D2M+1i!`NoB6NzdPSGR4mNLoT337j7
zt!qSuvp`Lmm?xl5y?GwYOk~~$!0<3zQoF?C8BkZWG=pdCakC!=i(_K(<S~#t#q)mO
zMRG>R)YORoeGJATpg(Cgr?(oS=M}mI=2Y}CXrDX&(JE(aEU|en>YV{P1o`y)o%ct*
fnydc#8IJh{4c`pcN-Y&z00000NkvXXu0mjf=eSO^

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/Contents.json b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/Contents.json
new file mode 100644
index 00000000..27b780f7
--- /dev/null
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_bike.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/img_bike.png b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_bike.imageset/img_bike.png
new file mode 100644
index 0000000000000000000000000000000000000000..4652db07224fae75542e58acf9201e7bd26acdf1
GIT binary patch
literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000~S000&U1^@s6)0X`500001b5ch_0Itp)
z=>Px%ut`KgR7gv`mP=?8K^VvX-=<Wlwi{!!!DqW#ym-*6P>||DJZKd}D0&hEPZbmd
zMLl?tBKW%bxOlJ!p&lxV6}>2k6vTt#O{&etvI?1KlSwKX(%nxd*_4>(v9anNmf6{F
z{=fNNvrCxAr5h$!TF&hDr4t_?S9(YD;Gr52z!fR1Q~wkAMha`wUk8>7Mk0|#Ke#0Y
zpa}pY>nxRWGFc9tS4hjnf=1^UgSHmtsb7ld$Ug>}=NULxfbdNzVn^oyt5%vzd(&T{
zk17^bSJwhvIzu2F^jmaNSovsD^-AMUT25P^Oh#p?XeiXR(rI!=0c`LKQ+7UpjmXuv
zodwQGe57+9Gu^K*F~`CtjSsO)TL4_nXAu}m3+r&HWyLDh!{%@!`2p~fn{#{8wmlUL
zcXTspuRY-Bw6Ipx1-33<*RIXv#sMtx;puy1ot~1OQ*|K#v=_R=Su5j{(W1_*hkDrT
z2k`(vI||W&YT~*;7g}#dOpFx;gGR@GhIR`;$eVlOI(#DYHTEvgS2x`-Rm@NN@TT14
zl@wNwH%YqDc^#mE3OX(^A4w%*w@DA12SB*{2QV<>SUO={%Wv9`j_Yn#@m2}$_LBU-
z4Y+63IN$`X0=&D{MhMuL64qNUO3wjouc^Z{tbkbn&C1XrEixUSPzi?~S-l1vn5YG8
zZO*mWw*B1$s)IUMN5@vc%&+g);=ETgfmKseA8a)aE;BpWLCgbA1IU#X(Kjiq{5lWl
zM@LedVZI=sw-^d`aXO%3AroH!Q(r-j?=fj3#C)g3<BSwmTk+Ya&NB-7Ia!Ey%6Rl?
zt?>HMVeqbETU-KA`Imq(m`YgQC#QBT>xNlX2h3+=B6jh&#%IED0=9WgKduo5lX2@|
oBQ2v2kP;mbW7LIvqxe(x6C#x@b7)!;G5`Po07*qoM6N<$f>G>Iga7~l

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/Contents.json b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/Contents.json
new file mode 100644
index 00000000..653c03a3
--- /dev/null
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_car.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/img_car.png b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_car.imageset/img_car.png
new file mode 100644
index 0000000000000000000000000000000000000000..535059cf09c11de4441d3f7c75d63939bb5579dc
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000~S000sQ1^@s6NC&>;00001b5ch_0Itp)
z=>Px%C`m*?R7gvmls#w^Q4q)f^Dc>q-0k8eFGxUd_e2aR_=QLW30PQINU#vpLeN4B
z8?m(!K}fI@6a_^g3Kk)yg(3z;K}@5f2<~ng^<Hwgd!o%HJF>fXN$ze<-sY9FznR~>
zj~znFGUV1WFh2^=5da&~nDiKbW8h&;6|V#D>uC(N2lK_!c9EmE01SOm2l+Hm?oj|?
z`<D)(A+0w64m7|i5LjEx*aTo(#53b!ZPvZHqA)MZ2L-}cF+_M0RNNEVG64C3fugAQ
zd<W12zzdXHZr^3g4h?Bf06Y@=LLT<#yq8&o5nGV<eFC3JdZy#PaweA7pn|ln5aDnf
zWE_e(27jt4Z%0;H#G8Fvb~B0TM2H_u_!`$)2rmV5Gt*>9>o0)yZN=}9;Kyqb#(jtM
z0Kn$fe7YSd=K`6s^qN6KYb~yuM@(n^S?6AShXrX(5^zj6IV(rt5np+ejbm;V66h*K
z_#%1QA_wMYnu6yf_*#?YP}~4`Pa^rhkOQ@G-O`j8?lR;|>cr@5f*%FSJJpOE{nj}!
z?ye>T3))}%>AXu4^@RkC`^r7ND3tasfX}Zg)I7dS*ot?Usgfp~MaUpbY1IuOK^RP9
zvk2z{<#y``3;p&<VjkBL8qyjAa5)A37$|qAj?n0}_d#&uv9)G|3q1I{>U~-K4}rbi
zW^Z)}UD5bkTJ?}V|50v5M;I|?UuhR|FqiYhqWY`id}zl00adow6Dh=(*8l(j07*qo
IM6N<$g6!%MVgLXD

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/Contents.json b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/Contents.json
new file mode 100644
index 00000000..715fd8a3
--- /dev/null
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_pedestrian.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/img_pedestrian.png b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_pedestrian.imageset/img_pedestrian.png
new file mode 100644
index 0000000000000000000000000000000000000000..fde4e9efd713f829da89d089187904d45aec0964
GIT binary patch
literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%*GWV{R7gv`mOW_HU>L{$PY&BsY7)WAbx=&sB3c}r1i_)uMGz+~g19Pm5EqL$
z*bh61=->y`(p9L7x(QBN7jbb=sXDZm8ytG?2`06cTD?5-<}TN}n7bs@`Ys81pZEWJ
zKHlfKBcxn<);z=tJ(9;1#_4auexF8y(ilryEoXfKW50in@YyZd2hwPy2O1VP0$gFI
z(nw|OM`&2<0Jhbjzg%H=Y-xnLVO?k7S~a7Xbc8*+r9eN*taVC0-Lm~S4Xoy5+9R8@
zkFBA)Gk=^Ez6T&5g<@cIS=f_F-DnHkk=uLFWA811xQj933j1~vXltNpc4@2h4#2)7
zLI4s$TLLx1oC4@V4OS-56obb?@Gk&%wQ?w`N813cH2|H}n?)xbQFy9_nw~%t9`jcs
z+>e5$1qKtvbA_F$HGR{Rkw8Zj#x=tn2Iy|M)@gu>W>}TL>)>Eigc6vr#<lSqZJp5!
z>vtHa8~J$#_XppD2>%5zQbRMW835-RHVYL}j;xdxMN(*N;|D^zZtC1YHUPa*oWb+T
zI*vL{(MbYL3{<oEJ4AdbN|eB_oo)=GSd=%r?MejHjr@412g_irfv~$l{kbdloB-zP
zwU2f##v|1*#|YGX6B$Du<Ab8$O(?}rTwxCZXlkEEMB4}>B9lYF?>#A^_F9L@!z%z?
z8=^Grib61<{tBlhQ13Md*rS)t-fh5w?`qaOMnuo#f2z7IDT8il@kQ#CYKC<Sz~$O_
zt49_VQVr`Y0T1Kss{1iZLJ9OENTc3sny659c4qjZvs5g~SIw}bV>wsYBkd&XKtF{Q
z8Uyim05cujJzFk+T&W-K>+95)y{inq(onNC0^M{}<pvfOeg?MLY=6%>t)2mJ9!%dU
z!xPR@an6r$1B8K)XA(9`%nv+5jzH4@%og4k89b~oN=*JwnuPT<*)rxNn8E`&F2$SO
b|L?#*#u5cSqPsW100000NkvXXu0mjf7RF>1

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/Contents.json b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/Contents.json
new file mode 100644
index 00000000..9fd1950a
--- /dev/null
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_taxi.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/img_taxi.png b/examples/latest/navigate/ios/IndoorMap/IndoorMap/Assets.xcassets/img_taxi.imageset/img_taxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..19746dfe35888b4a01e529e7ed30e1cc02d3c8d0
GIT binary patch
literal 748
zcmV<I0u%j-P)<h;3K|Lk000e1NJLTq000~S000;W1^@s6>71Q{00001b5ch_0Itp)
z=>Px%rb$FWR7gv$mP=?8Q51&%leG2Gnki^At(ztzhz3-!3O*K!NO7%ID(FHN7FX&<
z5ehC;s0&@VD!R~x4}2j=L9hlNh%U4UQY;kAO<h=LQf+RvWMMl;Cz%Y5lgCZStmg5b
z|GWRa=U#@OaJA~jDQ3P>OiIA5v?UHJ*kmPCS=iO6g@4WhXe^}-P+;A(`DL`SmjbY*
zqjPO=KJdAm8G{bZSc%(p0cv4mAHWaGnlUcQl<2PuFr-KOiE+My*&}I*o|=KnmPgi5
z1N9JNI|J(pSXser2853Ud;;)1ZHgzQ^uDGEwHuqs=GOogtBkm)hIl}l$+IQ8y70B8
zN8f|7$$dKt!Ve`dXFGmtzMD&RZb3p#H+F-0*xfJ>q$v(4!CX;mdt@iu^dkGnxF=Jh
z_y77rU^o&7XqO|J58AQclM`dr03EFsj=pu1+7#eb>F>$pLJ#^U=qAuM29^MP+Wj~z
zEzw;q%+ZJRNG~znb!+1Udc(wjq}h21csb_)Qvg;JjDm3iL5|k~WSg85X$U}5VLcz0
zR&vk*=BJ<*f8`otI+{);Ze-U`3r9Wx)TLZqz3{TM#2KeGiUFSy=w05E!RJ)`i7^DC
zkz9vzkO?ONwB%~JPg==q&YcfvH#D~W`Zhk5hiKs_s{lbbCQWhOtJ94EFgvLniucV2
z3;-LZE#Vwd*-II?Acb4^6u_Q}2?2ZsL3pVcJCqUv;~-4tW)O=2Z1L*+35^keH!2#}
zAS<(mJ~zTEB?6-Z!0MvfY7$CIDEx+Gw^koOgT)8uPk0BQgFZ21Or}IkC85?9-4DY3
zVp@W|H*HNk_O^wt>&+Q^>5%}Dcf>K<nK`1Hvz9PbfQZGKw5iMq0yP)t2{LUat~#6E
e11cHTN%R+S7W)|^KH<dx0000<MNUMnLSTY=ibT`^

literal 0
HcmV?d00001

diff --git a/examples/latest/navigate/ios/IndoorMap/IndoorMap/VenueTapHandler.swift b/examples/latest/navigate/ios/IndoorMap/IndoorMap/VenueTapHandler.swift
index 97c5097f..9ad12345 100644
--- a/examples/latest/navigate/ios/IndoorMap/IndoorMap/VenueTapHandler.swift
+++ b/examples/latest/navigate/ios/IndoorMap/IndoorMap/VenueTapHandler.swift
@@ -28,15 +28,19 @@ public class VenueTapHandler {
     var marker: MapMarker?
     var selectedVenue: Venue?
     var selectedGeometry: VenueGeometry?
+    var selectedTopology: VenueTopology?
     var isGeometryTapped: Bool = false
+    var popupView: UIView!
 
     let selectedColor = UIColor(red: 0.282, green: 0.733, blue: 0.96, alpha: 1.0)
     let selectedOutlineColor = UIColor(red: 0.117, green: 0.666, blue: 0.921, alpha: 1.0)
     let selectedTextColor = UIColor.white
     let selectedTextOutlineColor = UIColor(red: 0.0, green: 0.51, blue: 0.764, alpha: 1.0)
+    let selectedTopologyColor = UIColor(red: 0.3529, green: 0.7686, blue: 0.7569, alpha: 1.0)
 
     let geometryStyle: VenueGeometryStyle
     let labelStyle: VenueLabelStyle
+    let topologyStyle: VenueGeometryStyle
 
     public init(venueEngine: VenueEngine, mapView: MapView, geometryLabel: UILabel) {
         self.venueEngine = venueEngine
@@ -48,6 +52,8 @@ public class VenueTapHandler {
             mainColor: selectedColor, outlineColor: selectedOutlineColor, outlineWidth: 1)
         labelStyle = VenueLabelStyle(
             fillColor: selectedTextColor, outlineColor: selectedTextOutlineColor, outlineWidth: 1, maxFont: 28)
+        topologyStyle = VenueGeometryStyle(
+            mainColor: selectedColor, outlineColor: selectedTopologyColor, outlineWidth: 4.0)
 
         let venueMap = venueEngine.venueMap
         venueMap.addVenueSelectionDelegate(self)
@@ -63,21 +69,34 @@ public class VenueTapHandler {
     }
 
     public func onTap(origin: Point2D) {
-        deselectGeometry()
+        
+        if (selectedGeometry != nil) {
+            deselectGeometry()
+            selectedGeometry = nil
+        }
+        
+        if(selectedTopology != nil) {
+            deselectTopology()
+            selectedTopology = nil
+        }
 
         let venueMap = venueEngine.venueMap
         // Get geo coordinates of the tapped point.
         if let position = mapView.viewToGeoCoordinates(viewCoordinates: origin) {
-            // If the tap point was inside a selected venue, try to pick a geometry inside.
-            // Otherwise try to select an another venue, if the tap point was on top of one of them.
-            if let selectedVenue = venueMap.selectedVenue, let geometry = venueMap.getGeometry(position: position) {
-                selectGeometry(venue: selectedVenue, geometry: geometry, center: false)
-                isGeometryTapped = true
-            } else if let venue = venueMap.getVenue(position: position) {
-                venueMap.selectedVenue = venue
-                isGeometryTapped = false
+            if let selectedVenue = venueMap.selectedVenue, let topology = venueMap.getTopology(position: position) {
+                selectTopology(topology: topology, position: position)
             } else {
-                isGeometryTapped = false
+                // If the tap point was inside a selected venue, try to pick a geometry inside.
+                // Otherwise try to select an another venue, if the tap point was on top of one of them.
+                if let selectedVenue = venueMap.selectedVenue, let geometry = venueMap.getGeometry(position: position) {
+                    selectGeometry(venue: selectedVenue, geometry: geometry, center: false)
+                    isGeometryTapped = true
+                } else if let venue = venueMap.getVenue(position: position) {
+                    venueMap.selectedVenue = venue
+                    isGeometryTapped = false
+                } else {
+                    isGeometryTapped = false
+                }
             }
         }
     }
@@ -110,6 +129,218 @@ public class VenueTapHandler {
             mapView.camera.lookAt(point: geometry.center)
         }
     }
+    
+    func getTopologyInfo(topology: VenueTopology) -> [NSAttributedString] {
+        var attributedTexts = [NSAttributedString]()
+        let pedestrianText = NSMutableAttributedString()
+        var vehicleGroups = [VenueTopology.TopologyDirectionality: [String]]()
+        var pedestrianDirectionality: VenueTopology.TopologyDirectionality?
+
+        let directionDescriptions: [VenueTopology.TopologyDirectionality: String] = [
+            .toStart: "TO_START",
+            .fromStart: "FROM_START",
+            .bidirectional: "BIDIRECTIONAL",
+            .undefined: "UNDEFINED"
+        ]
+
+        let textStyle = NSMutableParagraphStyle()
+        textStyle.alignment = .right
+
+        let idText = NSAttributedString(string: "\(topology.identifier)", attributes: [.paragraphStyle: textStyle, .font: UIFont.boldSystemFont(ofSize: 16)])
+        attributedTexts.append(idText)
+
+        for access in topology.accessibility {
+            let mode = access.mode
+            let imageName: String
+            
+            switch mode {
+            case .auto:
+                imageName = "img_car"
+            case .taxi:
+                imageName = "img_taxi"
+            case .motorcycle:
+                imageName = "img_bike"
+            case .emergencyVehicle:
+                imageName = "img_ambulance"
+            case .pedestrian:
+                imageName = "img_pedestrian"
+                pedestrianDirectionality = access.direction
+            default:
+                imageName = ""
+            }
+
+            if mode == .pedestrian, let image = UIImage(named: imageName) {
+                let imageAttachment = NSTextAttachment()
+                imageAttachment.image = image
+                let imageString = NSAttributedString(attachment: imageAttachment)
+                pedestrianText.append(imageString)
+
+                let numberOfIcons = 1 // Pedestrian row always has one icon
+                let spaces = getSpaces(for: numberOfIcons)
+                pedestrianText.append(NSAttributedString(string: spaces))
+
+                if let dir = pedestrianDirectionality, let description = directionDescriptions[dir] {
+                    pedestrianText.append(NSAttributedString(string: description, attributes: [.paragraphStyle: textStyle]))
+                }
+            } else if !imageName.isEmpty {
+                if vehicleGroups[access.direction] == nil {
+                    vehicleGroups[access.direction] = []
+                }
+                vehicleGroups[access.direction]?.append(imageName)
+            }
+        }
+
+        if pedestrianText.length > 0 {
+            attributedTexts.append(pedestrianText)
+        }
+
+        for (direction, imageNames) in vehicleGroups {
+            let vehicleText = NSMutableAttributedString()
+            
+            let numberOfIcons = imageNames.count
+            let spaces = getSpaces(for: numberOfIcons)
+            
+            for imageName in imageNames {
+                if let image = UIImage(named: imageName) {
+                    let imageAttachment = NSTextAttachment()
+                    imageAttachment.image = image
+                    let imageString = NSAttributedString(attachment: imageAttachment)
+                    vehicleText.append(imageString)
+                    vehicleText.append(NSAttributedString(string: " "))
+                }
+            }
+
+            vehicleText.append(NSAttributedString(string: spaces))
+
+            if let description = directionDescriptions[direction] {
+                vehicleText.append(NSAttributedString(string: description, attributes: [.paragraphStyle: textStyle]))
+            }
+
+            attributedTexts.append(vehicleText)
+        }
+
+        return attributedTexts
+    }
+
+    private func getSpaces(for iconCount: Int) -> String {
+        switch iconCount {
+        case 1:
+            return String(repeating: " ", count: 33)
+        case 2:
+            return String(repeating: " ", count: 24)
+        case 3:
+            return String(repeating: " ", count: 18)
+        case 4:
+            return String(repeating: " ", count: 10)
+        default:
+            return ""
+        }
+    }
+
+    public func selectTopology(topology: VenueTopology, position: GeoCoordinates) {
+
+        let attributedTexts = getTopologyInfo(topology: topology)
+        deselectTopology()
+        showTopologyPopup(with: attributedTexts)
+        self.selectedTopology = topology
+
+        if (self.selectedTopology != nil) {
+            selectedVenue?.setCustomStyle(topologies: [topology], style: topologyStyle)
+        }
+                    
+        // Update the map view, if needed
+        mapView.camera.lookAt(point: position)
+    }
+    
+    func showTopologyPopup(with attributedTexts: [NSAttributedString]) {
+        guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+              let topController = windowScene.windows.first?.rootViewController else { return }
+
+        popupView = UIView()
+        popupView.backgroundColor = UIColor.white
+        popupView.layer.cornerRadius = 10
+        popupView.layer.shadowColor = UIColor.black.cgColor
+        popupView.layer.shadowOpacity = 0.3
+        popupView.layer.shadowOffset = CGSize(width: 0, height: 2)
+        popupView.layer.shadowRadius = 4
+
+        let stackView = UIStackView()
+        stackView.axis = .vertical
+        stackView.alignment = .fill
+        stackView.spacing = 10
+        stackView.distribution = .fill
+        stackView.translatesAutoresizingMaskIntoConstraints = false
+
+        for text in attributedTexts {
+            let label = UILabel()
+            label.attributedText = text
+            label.numberOfLines = 0
+            label.textAlignment = .left
+
+            let containerView = UIView()
+            containerView.addSubview(label)
+            label.translatesAutoresizingMaskIntoConstraints = false
+            NSLayoutConstraint.activate([
+                label.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 10),
+                label.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+                label.topAnchor.constraint(equalTo: containerView.topAnchor),
+                label.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+            ])
+
+            stackView.addArrangedSubview(containerView)
+        }
+
+        popupView.addSubview(stackView)
+        topController.view.addSubview(popupView)
+        popupView.translatesAutoresizingMaskIntoConstraints = false
+
+        let rowCount = attributedTexts.count
+        let bottomConstant: CGFloat
+        let baseHeight: CGFloat = 200
+        let extraHeightPerRow: CGFloat = 40
+        let height: CGFloat
+
+        switch rowCount {
+        case 1, 2:
+            bottomConstant = -130
+            height = baseHeight
+        case 3:
+            bottomConstant = -90
+            height = baseHeight
+        case 4:
+            bottomConstant = -50
+            height = baseHeight
+        default:
+            bottomConstant = -10
+            height = baseHeight + (CGFloat(rowCount - 4) * extraHeightPerRow)
+        }
+
+        NSLayoutConstraint.activate([
+            popupView.leadingAnchor.constraint(equalTo: topController.view.leadingAnchor),
+            popupView.trailingAnchor.constraint(equalTo: topController.view.trailingAnchor),
+            popupView.bottomAnchor.constraint(equalTo: topController.view.safeAreaLayoutGuide.bottomAnchor, constant: 25),
+            popupView.heightAnchor.constraint(equalToConstant: height),
+            stackView.topAnchor.constraint(equalTo: popupView.topAnchor, constant: 10),
+            stackView.bottomAnchor.constraint(equalTo: popupView.bottomAnchor, constant: bottomConstant),
+            stackView.leadingAnchor.constraint(equalTo: popupView.leadingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: popupView.trailingAnchor)
+        ])
+
+        popupView.transform = CGAffineTransform(translationX: 0, y: topController.view.frame.height)
+        UIView.animate(withDuration: 0.3) {
+            self.popupView.transform = .identity
+        }
+    }
+
+
+    func hidePopup() {
+        guard let popupView = self.popupView else { return }
+        UIView.animate(withDuration: 0.3, animations: {
+            popupView.transform = CGAffineTransform(translationX: 0, y: popupView.frame.height)
+        }) { _ in
+            popupView.removeFromSuperview()
+        }
+    }
 
     func deselectGeometry() {
         // If the map marker is already on the screen, remove it.
@@ -125,6 +356,14 @@ public class VenueTapHandler {
         // Reset a geometry name in the UILabel.
         geometryLabel.text = ""
     }
+    
+    func deselectTopology() {
+        if let topology = self.selectedTopology {
+            selectedVenue?.setCustomStyle(topologies: [topology], style: nil)
+            self.selectedTopology = nil
+        }
+        hidePopup()
+    }
 
     func getMarkerImage() -> MapImage? {
         if let image = markerImage {
diff --git a/examples/latest/navigate/ios/Routing/Routing/Base.lproj/Main.storyboard b/examples/latest/navigate/ios/Routing/Routing/Base.lproj/Main.storyboard
index d1e17998..fa2f536a 100644
--- a/examples/latest/navigate/ios/Routing/Routing/Base.lproj/Main.storyboard
+++ b/examples/latest/navigate/ios/Routing/Routing/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?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="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,12 +19,24 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jv9-0R-Tz9" customClass="MapView" customModule="heresdk">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yhR-d4-nO0">
+                                        <rect key="frame" x="8" y="53" width="170" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" red="0.0" green="0.71372549019999998" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <state key="normal" title="Traffic Optimization -On "/>
+                                        <connections>
+                                            <action selector="toggleTraffic:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GOB-VV-rkF"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="eu1-QJ-vBV">
                                 <rect key="frame" x="8" y="28" width="359" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Bv-Tp-mIo">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Bv-Tp-mIo">
                                         <rect key="frame" x="0.0" y="0.0" width="114.5" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -35,7 +45,7 @@
                                             <action selector="onAddRouteButtonClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dMJ-B7-5zw"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IDY-a8-cO4">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IDY-a8-cO4">
                                         <rect key="frame" x="122.5" y="0.0" width="114" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -44,7 +54,7 @@
                                             <action selector="onAddWaypointsButtonClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="TbN-U1-8lZ"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dqL-zX-9qE">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dqL-zX-9qE">
                                         <rect key="frame" x="244.5" y="0.0" width="114.5" height="30"/>
                                         <color key="backgroundColor" red="0.0" green="0.71372549019607845" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -59,6 +69,7 @@
                                 </constraints>
                             </stackView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="7yx-63-l25"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="eu1-QJ-vBV" firstAttribute="top" secondItem="7yx-63-l25" secondAttribute="top" constant="8" id="1NJ-EX-MTG"/>
@@ -69,7 +80,6 @@
                             <constraint firstItem="jv9-0R-Tz9" firstAttribute="leading" secondItem="d7N-t3-PMt" secondAttribute="leading" id="qOE-QK-qnt"/>
                             <constraint firstItem="7yx-63-l25" firstAttribute="trailing" secondItem="eu1-QJ-vBV" secondAttribute="trailing" constant="8" id="xbd-jw-H4Z"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="7yx-63-l25"/>
                     </view>
                     <connections>
                         <outlet property="mapView" destination="jv9-0R-Tz9" id="NWv-T2-utS"/>