Merge pull request #304 from heremaps/esd/41740

Update example apps for release 4.17.4.0

Author: HERE-SDK-Support-Team

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.17.3.0)
+## List of Available Example Apps (Version 4.17.4.0)
 
 - **HelloMap**: Shows the classic 'Hello World'.
 - **HelloMapKotlin**: Shows the classic 'Hello World' using Kotlin language (Android only).

examples/latest/README.md

@@ -1,4 +1,4 @@
-This folder contains the HERE SDK examples apps for version: 4.17.3.0
+This folder contains the HERE SDK examples apps for version: 4.17.4.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/app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java

@@ -69,10 +69,6 @@ public void onMapSceneLoaded(MapView mapView, Context context) {
 
          // Add a POI marker
          addPOIMapMarker(new GeoCoordinates(52.530932, 13.384915));
-
-         // Users of the Navigate Edition can set the visibility for all the POI categories to hidden.
-         // List<String> categoryIds = new ArrayList<>();
-         // MapScene.setPoiVisibility(categoryIds, VisibilityState.HIDDEN);
      }
 
      public void enableButtonClicked() {
@@ -116,8 +112,10 @@ private RasterDataSource createRasterDataSource(String dataSourceName) {
      }
 
      private MapLayer createMapLayer(String dataSourceName) {
-         // The layer should be rendered on top of other layers except the labels layer so that we don't overlap raster layer over POI markers.
-         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedLast().renderedBeforeLayer("labels").build();
+         // The layer should be rendered on top of other layers except the "labels" layer
+         // so that we don't overlap the raster layer over POI markers.
+         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedBeforeLayer("labels").build();
+
          // And it should be visible for all zoom levels.
          MapLayerVisibilityRange range = new MapLayerVisibilityRange(0, 22 + 1);
 

examples/latest/explore/flutter/custom_raster_layers_app/lib/CustomRasterLayersExample.dart

@@ -42,10 +42,6 @@ class CustomRasterLayersExample {
 
     // Add a POI marker
     _addPOIMapMarker(GeoCoordinates(52.530932, 13.384915), 1);
-
-    // Users of the Navigate Edition can set the visibility for all the POI categories to hidden.
-    // List<String> categoryIds = [];
-    // MapScene.setPoiVisibility(categoryIds, VisibilityState.hidden);
   }
 
   void enableButtonClicked() {
@@ -88,8 +84,10 @@ class CustomRasterLayersExample {
   }
 
   MapLayer _createMapLayer(String dataSourceName) {
-    // The layer should be rendered on top of other layers except the labels layer so that we don't overlap raster layer over POI markers.
-    MapLayerPriority priority = MapLayerPriorityBuilder().renderedLast().renderedBeforeLayer("labels").build();
+    // The layer should be rendered on top of other layers except for the "labels" layer
+    // so that we don't overlap the raster layer over POI markers.
+    MapLayerPriority priority = MapLayerPriorityBuilder().renderedBeforeLayer("labels").build();
+
     // And it should be visible for all zoom levels.
     MapLayerVisibilityRange range = MapLayerVisibilityRange(0, 22 + 1);
 

examples/latest/explore/ios/CustomRasterLayers/CustomRasterLayers/CustomRasterLayersExample.swift

@@ -40,13 +40,9 @@ class CustomRasterLayersExample {
 
         // We want to start with the default map style.
         rasterMapLayerStyle.setEnabled(false)
-        
+
         // Add a POI marker
         addPOIMapMarker(geoCoordinates: GeoCoordinates(latitude: 52.530932, longitude: 13.384915))
-        
-        // Users of the Navigate Edition can set the visibility for all the POI categories to hidden.
-        // let categoryIds: [String] = []
-        // MapScene.setPoiVisibility(categoryIds: categoryIds, visibility: VisibilityState.hidden)
     }
 
     func onEnableButtonClicked() {
@@ -68,17 +64,17 @@ class CustomRasterLayersExample {
         // Maps © www.thunderforest.com, Data © www.osm.org/copyright.
         // Alternatively, choose another tile provider or use the (customizable) map styles provided by HERE.
         let templateUrl = "https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png"
-        
+
         // The storage levels available for this data source. Supported range [0, 31].
         let storageLevels: [Int32] = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
         var rasterProviderConfig = RasterDataSourceConfiguration.Provider(
             urlProvider: TileUrlProviderFactory.fromXyzUrlTemplate(templateUrl)!,
             tilingScheme: TilingScheme.quadTreeMercator,
-            storageLevels: storageLevels)            
-        
+            storageLevels: storageLevels)
+
         // If you want to add transparent layers then set this to true.
         rasterProviderConfig.hasAlphaChannel = false
-        
+
         // Raster tiles are stored in a separate cache on the device.
         let path = "cache/raster/mycustomlayer"
         let maxDiskSizeInBytes: Int64 = 1024 * 1024 * 128 // 128 MB
@@ -91,10 +87,12 @@ class CustomRasterLayersExample {
                                                                              provider: rasterProviderConfig,
                                                                              cache: cacheConfig))
     }
-    
+
     private func createMapLayer(dataSourceName: String) -> MapLayer {
-        // The layer should be rendered on top of other layers except the labels layer so that we don't overlap raster layer over POI markers.
-        let priority = MapLayerPriorityBuilder().renderedLast().renderedBeforeLayer(named: "labels").build()
+        // The layer should be rendered on top of other layers except for the "labels" layer
+        // so that we don't overlap the raster layer over POI markers.
+        let priority = MapLayerPriorityBuilder().renderedBeforeLayer(named: "labels").build()
+        
         // And it should be visible for all zoom levels.
         let range = MapLayerVisibilityRange(minimumZoomLevel: 0, maximumZoomLevel: 22 + 1)
 
@@ -115,7 +113,7 @@ class CustomRasterLayersExample {
             fatalError("MapLayer creation failed Cause: \(InstantiationException)")
         }
     }
-    
+
     private func addPOIMapMarker(geoCoordinates: GeoCoordinates) {
         guard
             let image = UIImage(named: "poi.png"),

examples/latest/navigate/android/CustomRasterLayers/app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java

@@ -69,10 +69,6 @@ public void onMapSceneLoaded(MapView mapView, Context context) {
 
          // Add a POI marker
          addPOIMapMarker(new GeoCoordinates(52.530932, 13.384915));
-
-         // Users of the Navigate Edition can set the visibility for all the POI categories to hidden.
-         // List<String> categoryIds = new ArrayList<>();
-         // MapScene.setPoiVisibility(categoryIds, VisibilityState.HIDDEN);
      }
 
      public void enableButtonClicked() {
@@ -116,8 +112,10 @@ private RasterDataSource createRasterDataSource(String dataSourceName) {
      }
 
      private MapLayer createMapLayer(String dataSourceName) {
-         // The layer should be rendered on top of other layers except the labels layer so that we don't overlap raster layer over POI markers.
-         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedLast().renderedBeforeLayer("labels").build();
+         // The layer should be rendered on top of other layers except the "labels" layer
+         // so that we don't overlap the raster layer over POI markers.
+         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedBeforeLayer("labels").build();
+
          // And it should be visible for all zoom levels.
          MapLayerVisibilityRange range = new MapLayerVisibilityRange(0, 22 + 1);
 

examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/DrawingSwitcher.java

@@ -167,8 +167,8 @@ private void setVenue(Venue venue) {
                         .makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
                 height += childView.getMeasuredHeight();
             }
-            Log.d("DrawingSwitcher", "marginTop:" + margin.topMargin + "height: " + height);
-            margin.setMargins(margin.leftMargin, 1500 - height, margin.rightMargin, margin.bottomMargin);
+            Log.d("DrawingSwitcher", "marginTop:" + margin.topMargin + " height: " + height);
+            margin.setMargins(margin.leftMargin, 1550 - height, margin.rightMargin, margin.bottomMargin);
             setCollapsed(true);
             setVisible(true);
         }

examples/latest/navigate/android/IndoorMap/app/src/main/java/com/here/sdk/examples/venues/MainActivity.java

@@ -272,9 +272,7 @@ private void loadMapScene() {
         // Load a scene from the HERE SDK to render the map with a map scheme.
         mapView.getMapScene().loadScene(MapScheme.NORMAL_DAY, mapError -> {
             if (mapError == null) {
-                Anchor2D anchor = new Anchor2D(0,0);
-                Point2D offset = new Point2D(0, 1800);
-                mapView.setWatermarkLocation(anchor, offset);
+                setWatermark(1800);
                 double distanceInMeters = 1000 * 10;
                 MapMeasure mapMeasureZoom = new MapMeasure(MapMeasure.Kind.DISTANCE, distanceInMeters);
                 mapView.getCamera().lookAt(
@@ -389,6 +387,7 @@ public void onGetVenueCompleted(int venueId, @Nullable VenueModel venueModel, bo
             } else {
                 mapLoadDone = true;
                 mapView.getCamera().zoomTo(18);
+                setWatermark(1600);
                 geometryList = venueModel.getGeometriesByName();
                 venueTapController.setGeometries(geometryList);
                 recyclerView.setAdapter(new SpaceAdapter(getApplicationContext(), geometryList, MainActivity.this));
@@ -415,12 +414,17 @@ public void onGetVenueCompleted(int venueId, @Nullable VenueModel venueModel, bo
                     mapView.getCamera().lookAt(
                             new GeoCoordinates(venueCenter.latitude, venueCenter.longitude),
                             mapMeasureZoom);
+                    setWatermark(1600);
 
                     // Venue selection is done, enable back the button for the venue selection
                     // to be able to select another venue.
                     progressBar.setVisibility(View.GONE);
                     mapLoadDone = true;
                     header.setVisibility(View.VISIBLE);
+                    if(!selectedVenue.getVenueModel().getTopologies().isEmpty())
+                        topologyButton.setVisibility(View.VISIBLE);
+                    else
+                        topologyButton.setVisibility((View.GONE));
                 }
             };
 
@@ -467,6 +471,13 @@ public void onVenueLoadError(VenueErrorCode venueLoadError) {
         alert.show();
     }
 
+    void setWatermark(int off)
+    {
+        Anchor2D anchor = new Anchor2D(0,0);
+        Point2D offset = new Point2D(0, off);
+        mapView.setWatermarkLocation(anchor, offset);
+    }
+
     // Hide a keyboard.
     public void hideKeyboard() {
         try {
@@ -540,6 +551,7 @@ private void removeVenue() {
         venue_search.setHint("Search for Venues");
         loadMapScene();
         header.setVisibility(View.GONE);
+        topologyButton.setVisibility(View.GONE);
         levelSwitcher.setVisible(false);
         drawingSwitcher.setVisible(false);
         VenueMap venueMap = venueEngine.getVenueMap();

examples/latest/navigate/android/IndoorMap/app/src/main/res/drawable/drawing_listview_background.xml

@@ -4,9 +4,7 @@
     <solid android:color="#FFFFFF" />
     <padding
         android:left="16dp"
-        android:right="16dp"
-        android:bottom="16dp"
-        android:top="16dp"/>
+        />
     <corners
         android:radius="4dp" />
 </shape>

examples/latest/navigate/android/IndoorMap/app/src/main/res/layout/activity_main.xml

@@ -23,6 +23,8 @@
             android:id="@+id/header"
             android:gravity="center"
             android:background="@android:color/white"
+            android:orientation="horizontal"
+            android:weightSum="100"
             android:elevation="3dp">
             <ImageButton
                 android:layout_width="wrap_content"