Merge branch 'master' of https://github.com/TradeMe/MapMe

TradeMe · Jul 5, 2018 · cf7811b · cf7811b
2 parents 9a35ba0 + 0d8bbca
commit cf7811b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.iml
+/.idea
 .gradle
 /local.properties
 /.idea/workspace.xml

diff --git a/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMarkerAnnotation.kt b/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMarkerAnnotation.kt
@@ -32,6 +32,10 @@ class GoogleMapMarkerAnnotation(latLng: LatLng,
         nativeMarker?.alpha = alpha
     }
 
+    override fun onUpdateAnchor(anchorUV: Pair<Float, Float>) {
+        nativeMarker?.setAnchor(anchorUV.first, anchorUV.second)
+    }
+
     private var nativeMarker: Marker? = null
 
     override fun annotatesObject(objec: Any): Boolean {

diff --git a/mapbox/src/main/java/nz/co/trademe/mapme/mapbox/MapboxMarkerAnnotation.kt b/mapbox/src/main/java/nz/co/trademe/mapme/mapbox/MapboxMarkerAnnotation.kt
@@ -14,7 +14,6 @@ class MapboxMarkerAnnotation(latLng: LatLng,
                              title: String?,
                              icon: Bitmap? = null) : MarkerAnnotation(latLng, title, icon) {
 
-
     override fun onUpdateIcon(icon: Bitmap?) {
         nativeMarker?.let {
             if (icon != null) {
@@ -41,6 +40,10 @@ class MapboxMarkerAnnotation(latLng: LatLng,
         Log.w(MapboxMarkerAnnotation::class.simpleName, "alpha not supported on MapboxMarkerAnnotations")
     }
 
+    override fun onUpdateAnchor(anchorUV: Pair<Float, Float>) {
+        Log.w(MapboxMarkerAnnotation::class.simpleName, "anchor not supported on MapboxMarkerAnnotations")
+    }
+
     private var nativeMarker: Marker? = null
 
     override fun annotatesObject(objec: Any): Boolean {

diff --git a/mapme/src/main/java/nz/co/trademe/mapme/annotations/MarkerAnnotation.kt b/mapme/src/main/java/nz/co/trademe/mapme/annotations/MarkerAnnotation.kt
@@ -4,10 +4,11 @@ import android.graphics.Bitmap
 import nz.co.trademe.mapme.LatLng
 
 abstract class MarkerAnnotation(latLng: LatLng,
-                                      title: String? = null,
-                                      icon: Bitmap? = null,
-                                      zIndex: Float = 0f,
-                                      alpha: Float = 1f) : MapAnnotation() {
+                                title: String? = null,
+                                icon: Bitmap? = null,
+                                zIndex: Float = 0f,
+                                alpha: Float = 1f,
+                                anchorUV: Pair<Float, Float> = Pair(0.5f, 1.0f)) : MapAnnotation() {
 
     var latLng: LatLng = latLng
         set(value) {
@@ -39,6 +40,12 @@ abstract class MarkerAnnotation(latLng: LatLng,
             onUpdateAlpha(value)
         }
 
+    var anchor: Pair<Float, Float> = anchorUV
+        set(value) {
+            field = value
+            onUpdateAnchor(value)
+        }
+
     /**
      * Called when an icon has been set on the annotation.
      *
@@ -74,8 +81,16 @@ abstract class MarkerAnnotation(latLng: LatLng,
      */
     abstract protected fun onUpdateAlpha(alpha: Float)
 
+    /**
+     * Called when an anchor has been set on the annotation.
+     *
+     * Update the native marker with the [anchor]
+     */
+    abstract protected fun onUpdateAnchor(anchorUV: Pair<Float, Float>)
+
+
     override fun toString(): String {
-        return "MarkerAnnotation(latLng=$latLng, title=$title, icon=$icon, zIndex=$zIndex, alpha=$alpha)"
+        return "MarkerAnnotation(latLng=$latLng, title=$title, icon=$icon, zIndex=$zIndex, alpha=$alpha, anchor(U,V)=${anchor.first},${anchor.second})"
     }
 
 }
diff --git a/mapme/src/test/java/nz/co/trademe/mapme/util/TestAnnotation.kt b/mapme/src/test/java/nz/co/trademe/mapme/util/TestAnnotation.kt
@@ -1,7 +1,6 @@
 package nz.co.trademe.mapme.util
 
-class TestAnnotation : nz.co.trademe.mapme.annotations.MarkerAnnotation(nz.co.trademe.mapme.LatLng(0.0, 0.0), "", null, 0f, 1f) {
-
+class TestAnnotation : nz.co.trademe.mapme.annotations.MarkerAnnotation(nz.co.trademe.mapme.LatLng(0.0, 0.0), "", null, 0f, 1f, Pair(0.5f, 1f)) {
     override fun annotatesObject(nativeObject: Any): Boolean {
         return false
     }
@@ -27,10 +26,10 @@ class TestAnnotation : nz.co.trademe.mapme.annotations.MarkerAnnotation(nz.co.tr
     override fun onUpdateAlpha(alpha: Float) {
     }
 
+    override fun onUpdateAnchor(anchorUV: Pair<Float, Float>) {
+    }
+
     override fun toString(): String {
         return "TestAnnotation( position = $position)"
-
     }
-
-
 }