fix : fix show marker icon of interestPoint (liodali#229)

* when interestPoint marker is not null should be override default icon
vmwsree · Mar 8, 2022 · 81ccd53 · 81ccd53
1 parent f9727e6
commit 81ccd53
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/FlutterOsmView.kt b/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/FlutterOsmView.kt
@@ -1049,13 +1049,12 @@ class FlutterOsmView(
         if (clearPreviousRoad) {
             folderRoad.items.clear()
         }
-        var bitmapIconInterestPoints :Bitmap? = null
-        if (iconInterestPoints != null){
+        var bitmapIconInterestPoints: Bitmap? = null
+        if (iconInterestPoints != null) {
             bitmapIconInterestPoints = getBitmap(bytes = iconInterestPoints!!)
         }
 
 
-
         val route = PolylineEncoder.decode(encodedWayPoints, 10, false)
         val listInterestPoints = when (interestPointsEncoded != null) {
             true -> PolylineEncoder.decode(interestPointsEncoded, 10, false)
@@ -1604,11 +1603,21 @@ class FlutterOsmView(
         polyLine.outlinePaint.color = colorRoad ?: Color.GREEN
 
         val iconsRoads = customRoadMarkerIcon
-        if (iconsRoads.isEmpty() && bitmapIcon != null) {
-            iconsRoads[Constants.STARTPOSITIONROAD] = bitmapIcon
-            iconsRoads[Constants.MIDDLEPOSITIONROAD] = bitmapIcon
-            iconsRoads[Constants.ENDPOSITIONROAD] = bitmapIcon
-
+        when {
+            (iconsRoads.isEmpty() && bitmapIcon != null) -> {
+                iconsRoads[Constants.STARTPOSITIONROAD] = bitmapIcon
+                iconsRoads[Constants.MIDDLEPOSITIONROAD] = bitmapIcon
+                iconsRoads[Constants.ENDPOSITIONROAD] = bitmapIcon
+            }
+            iconsRoads.isNotEmpty() && bitmapIcon != null -> {
+                iconsRoads[Constants.MIDDLEPOSITIONROAD] = bitmapIcon
+                if (!iconsRoads.containsKey(Constants.STARTPOSITIONROAD)) {
+                    iconsRoads[Constants.STARTPOSITIONROAD] = bitmapIcon
+                }
+                if (!iconsRoads.containsKey(Constants.ENDPOSITIONROAD)) {
+                    iconsRoads[Constants.ENDPOSITIONROAD] = bitmapIcon
+                }
+            }
         }
         val flutterRoad = FlutterRoad(
             context,

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -82,14 +82,14 @@ packages:
       path: "../flutter_osm_interface"
       relative: true
     source: path
-    version: "0.1.18"
+    version: "0.1.19"
   flutter_osm_plugin:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.31.0"
+    version: "0.32.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:

diff --git a/flutter_osm_interface/pubspec.lock b/flutter_osm_interface/pubspec.lock
@@ -88,6 +88,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -176,7 +183,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:

diff --git a/pubspec.lock b/pubspec.lock
@@ -75,7 +75,7 @@ packages:
       path: flutter_osm_interface
       relative: true
     source: path
-    version: "0.1.18"
+    version: "0.1.19"
   flutter_plugin_android_lifecycle:
     dependency: "direct main"
     description: