Merge pull request #117 from heremaps/esd/41020

Update example apps for release 4.10.2.0

README.md

@@ -21,7 +21,7 @@ For an overview of the existing features, please check the _Developer's Guide_ f
 
 > 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.10.1.0)
+## List of Available Example Apps (Version 4.10.2.0)
 In this repository you can find the [latest example apps](examples/latest) that show key features of the HERE SDK in ready-to-use applications:
 
 - **HelloMap**: Shows the classic 'Hello World'.

examples/latest/README.md

@@ -1,4 +1,4 @@
-This folder contains the HERE SDK examples apps for version: 4.10.1.0
+This folder contains the HERE SDK examples apps for version: 4.10.2.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/))

examples/latest/explore/android/CustomRasterLayers/README.md

@@ -1,4 +1,4 @@
-This example app shows how to load custom raster layers. You can find how this is done in [CustomRasterLayersExample.java](app/src/main/java/com/here/customrasterlayers/CustomRasterLayersExample.java).
+This example app shows how to load custom raster layers. You can find how this is done in [CustomRasterLayersExample.java](app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java). 
 
 Build instructions:
 -------------------

examples/latest/explore/android/EVRouting/app/src/main/java/com/here/evrouting/EVRoutingExample.java

@@ -244,14 +244,7 @@ private void logRouteViolations(Route route) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,
@@ -270,7 +263,7 @@ private void searchAlongARoute(Route route) {
         // We specify here that we only want to include results
         // within a max distance of xx meters from any point of the route.
         int halfWidthInMeters = 200;
-        GeoCorridor routeCorridor = new GeoCorridor(route.getPolyline(), halfWidthInMeters);
+        GeoCorridor routeCorridor = new GeoCorridor(route.getGeometry().vertices, halfWidthInMeters);
         TextQuery textQuery = new TextQuery("charging station", routeCorridor,
                 mapView.getCamera().getState().targetCoordinates);
 

examples/latest/explore/android/PublicTransit/app/src/main/java/com/here/routing/PublicTransportRoutingExample.java

@@ -20,9 +20,10 @@
 package com.here.routing;
 
 import android.content.Context;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import android.util.Log;
 
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
@@ -140,14 +141,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,

examples/latest/explore/android/Routing/app/src/main/java/com/here/routing/RoutingExample.java

@@ -20,9 +20,10 @@
 package com.here.routing;
 
 import android.content.Context;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import android.util.Log;
 
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
@@ -143,14 +144,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,

examples/latest/explore/flutter/ev_routing_app/lib/EVRoutingExample.dart

@@ -215,7 +215,7 @@ class EVRoutingExample {
     // We specify here that we only want to include results
     // within a max distance of xx meters from any point of the route.
     int halfWidthInMeters = 200;
-    GeoCorridor routeCorridor = GeoCorridor(route.polyline, halfWidthInMeters);
+    GeoCorridor routeCorridor = GeoCorridor(route.geometry.vertices, halfWidthInMeters);
     TextQuery textQuery = TextQuery.withCorridorAreaAndAreaCenter(
         "charging station", routeCorridor, _hereMapController.camera.state.targetCoordinates);
 
@@ -329,11 +329,9 @@ class EVRoutingExample {
 
   _showRouteOnMap(here.Route route) {
     // Show route as polyline.
-    GeoPolyline routeGeoPolyline = GeoPolyline(route.polyline);
-
+    GeoPolyline routeGeoPolyline = route.geometry;
     double widthInPixels = 20;
     MapPolyline routeMapPolyline = MapPolyline(routeGeoPolyline, widthInPixels, Color.fromARGB(160, 0, 144, 138));
-
     _hereMapController.mapScene.addMapPolyline(routeMapPolyline);
     _mapPolylines.add(routeMapPolyline);
 

examples/latest/explore/flutter/public_transit_app/lib/PublicTransportRoutingExample.dart

@@ -129,11 +129,9 @@ class PublicTransportRoutingExample {
 
   _showRouteOnMap(here.Route route) {
     // Show route as polyline.
-    GeoPolyline routeGeoPolyline = GeoPolyline(route.polyline);
-
+    GeoPolyline routeGeoPolyline = route.geometry;
     double widthInPixels = 20;
     MapPolyline routeMapPolyline = MapPolyline(routeGeoPolyline, widthInPixels, Color.fromARGB(160, 0, 144, 138));
-
     _hereMapController.mapScene.addMapPolyline(routeMapPolyline);
     _mapPolylines.add(routeMapPolyline);
   }

examples/latest/explore/flutter/routing_app/lib/RoutingExample.dart

@@ -114,11 +114,9 @@ class RoutingExample {
 
   _showRouteOnMap(here.Route route) {
     // Show route as polyline.
-    GeoPolyline routeGeoPolyline = GeoPolyline(route.polyline);
-
+    GeoPolyline routeGeoPolyline = route.geometry;
     double widthInPixels = 20;
     MapPolyline routeMapPolyline = MapPolyline(routeGeoPolyline, widthInPixels, Color.fromARGB(160, 0, 144, 138));
-
     _hereMapController.mapScene.addMapPolyline(routeMapPolyline);
     _mapPolylines.add(routeMapPolyline);
   }

examples/latest/explore/ios/EVRouting/EVRouting/RoutingExample.swift

@@ -181,7 +181,7 @@ class RoutingExample {
 
     private func showRouteOnMap(route: Route) {
         // Show route as polyline.
-        let routeGeoPolyline = try! GeoPolyline(vertices: route.polyline)
+        let routeGeoPolyline = route.geometry
         let routeMapPolyline = MapPolyline(geometry: routeGeoPolyline,
                                            widthInPixels: 20,
                                            color: UIColor(red: 0,
@@ -200,7 +200,7 @@ class RoutingExample {
     private func searchAlongARoute(route: Route) {
         // We specify here that we only want to include results
         // within a max distance of xx meters from any point of the route.
-        let routeCorridor = GeoCorridor(polyline: route.polyline,
+        let routeCorridor = GeoCorridor(polyline: route.geometry.vertices,
                                         halfWidthInMeters: Int32(200))
         let textQuery = TextQuery("charging station",
                                   in: routeCorridor,

examples/latest/explore/ios/PublicTransit/PublicTransit/PublicTransportRoutingExample.swift

@@ -110,7 +110,7 @@ class PublicTranportRoutingExample {
 
     private func showRouteOnMap(route: Route) {
         // Show route as polyline.
-        let routeGeoPolyline = try! GeoPolyline(vertices: route.polyline)
+        let routeGeoPolyline = route.geometry
         let routeMapPolyline = MapPolyline(geometry: routeGeoPolyline,
                                            widthInPixels: 20,
                                            color: UIColor(red: 0,

examples/latest/explore/ios/Routing/Routing/RoutingExample.swift

@@ -106,7 +106,7 @@ class RoutingExample {
 
     private func showRouteOnMap(route: Route) {
         // Show route as polyline.
-        let routeGeoPolyline = try! GeoPolyline(vertices: route.polyline)
+        let routeGeoPolyline = route.geometry
         let routeMapPolyline = MapPolyline(geometry: routeGeoPolyline,
                                            widthInPixels: 20,
                                            color: UIColor(red: 0,

examples/latest/lite/android/RoutingLite/app/src/main/java/com/here/routing/RoutingExample.java

@@ -133,13 +133,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that the route polyline contains less than two vertices.
-            return;
-        }
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         MapPolylineStyle mapPolylineStyle = new MapPolylineStyle();
         mapPolylineStyle.setColor(0x00908AA0, PixelFormat.RGBA_8888);
         mapPolylineStyle.setWidthInPixels(10);

examples/latest/lite/ios/RoutingLite/RoutingLite/RoutingExample.swift

@@ -94,7 +94,7 @@ class RoutingExample {
 
     private func showRouteOnMap(route: Route) {
         // Show route as polyline.
-        let routeGeoPolyline = try! GeoPolyline(vertices: route.polyline)
+        let routeGeoPolyline = route.geometry
         let mapPolylineStyle = MapPolylineStyleLite()
         mapPolylineStyle.setColor(0x00908AA0, encoding: .rgba8888)
         mapPolylineStyle.setWidthInPixels(inPixels: 10)

examples/latest/navigate/android/CustomRasterLayers/README.md

@@ -1,4 +1,4 @@
-This example app shows how to load custom raster layers. You can find how this is done in [CustomRasterLayersExample.java](app/src/main/java/com/here/customrasterlayers/CustomRasterLayersExample.java).
+This example app shows how to load custom raster layers. You can find how this is done in [CustomRasterLayersExample.java](app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java). 
 
 Build instructions:
 -------------------

examples/latest/navigate/android/EVRouting/app/src/main/java/com/here/evrouting/EVRoutingExample.java

@@ -244,14 +244,7 @@ private void logRouteViolations(Route route) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,
@@ -270,7 +263,7 @@ private void searchAlongARoute(Route route) {
         // We specify here that we only want to include results
         // within a max distance of xx meters from any point of the route.
         int halfWidthInMeters = 200;
-        GeoCorridor routeCorridor = new GeoCorridor(route.getPolyline(), halfWidthInMeters);
+        GeoCorridor routeCorridor = new GeoCorridor(route.getGeometry().vertices, halfWidthInMeters);
         TextQuery textQuery = new TextQuery("charging station", routeCorridor,
                 mapView.getCamera().getState().targetCoordinates);
 

examples/latest/navigate/android/Navigation/app/src/main/java/com/here/navigation/App.java

@@ -21,12 +21,13 @@
 
 import android.content.Context;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
 import com.here.sdk.core.GeoPolyline;
 import com.here.sdk.core.Location;
-import com.here.sdk.core.errors.InstantiationErrorException;
 import com.here.sdk.gestures.GestureState;
 import com.here.sdk.mapview.MapImage;
 import com.here.sdk.mapview.MapImageFactory;
@@ -40,8 +41,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import androidx.appcompat.app.AlertDialog;
-
 // An app that allows to calculate a route and start navigation, using either platform positioning or
 // simulated locations.
 public class App {
@@ -174,14 +173,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that the route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,

examples/latest/navigate/android/Navigation/app/src/main/java/com/here/navigation/NavigationExample.java

@@ -265,7 +265,7 @@ public void onSpeedLimitUpdated(@NonNull SpeedLimit speedLimit) {
                 Double currentSpeedLimit = getCurrentSpeedLimit(speedLimit);
 
                 if (currentSpeedLimit == null) {
-                    Log.d(TAG, "Warning: Speed limits unkown, data could not be retrieved.");
+                    Log.d(TAG, "Warning: Speed limits unknown, data could not be retrieved.");
                 } else if (currentSpeedLimit == 0) {
                     Log.d(TAG, "No speed limits on this road! Drive as fast as you feel safe ...");
                 } else {

examples/latest/navigate/android/NavigationCustom/app/src/main/java/com/here/navigationcustom/MainActivity.java

@@ -275,7 +275,7 @@ private void animateToRouteStart(Route route) {
         double tiltInDegrees = 70;
         mapView.getCamera().flyTo(
                 // The first coordinate marks the start location of the route.
-                route.getPolyline().get(0),
+                route.getGeometry().vertices.get(0),
                 new GeoOrientationUpdate(bearingInDegrees, tiltInDegrees),
                 50,
                 new FlyToOptions(),

examples/latest/navigate/android/PublicTransit/app/src/main/java/com/here/routing/PublicTransportRoutingExample.java

@@ -20,9 +20,10 @@
 package com.here.routing;
 
 import android.content.Context;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import android.util.Log;
 
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
@@ -140,14 +141,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,

examples/latest/navigate/android/Routing/app/src/main/java/com/here/routing/RoutingExample.java

@@ -20,9 +20,10 @@
 package com.here.routing;
 
 import android.content.Context;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import android.util.Log;
 
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
@@ -143,14 +144,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,

examples/latest/navigate/android/RoutingHybrid/app/src/main/java/com/here/routinghybrid/RoutingExample.java

@@ -20,11 +20,12 @@
 package com.here.routinghybrid;
 
 import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
 import com.here.sdk.core.Color;
 import com.here.sdk.core.GeoCoordinates;
 import com.here.sdk.core.GeoPolyline;
@@ -163,14 +164,7 @@ private String formatLength(int meters) {
 
     private void showRouteOnMap(Route route) {
         // Show route as polyline.
-        GeoPolyline routeGeoPolyline;
-        try {
-            routeGeoPolyline = new GeoPolyline(route.getPolyline());
-        } catch (InstantiationErrorException e) {
-            // It should never happen that a route polyline contains less than two vertices.
-            return;
-        }
-
+        GeoPolyline routeGeoPolyline = route.getGeometry();
         float widthInPixels = 20;
         MapPolyline routeMapPolyline = new MapPolyline(routeGeoPolyline,
                 widthInPixels,