06-22-2018

Flutter

* Added bearing and tilt for camera position.
* cameraPositionChanged will now bring bearing and tilt in the returned object.

Android

* Added bearing and tilt when setting the camera for the map.
* Added bearing and tilt to the returned map in the callback (cameraPositionChanged) when the camera is updated.

iOS

* Incomplete changes regarding camera position update.

Author: LJaraCastillo

android/src/main/kotlin/com/apptreesoftware/mapview/MapActivity.kt

@@ -10,7 +10,6 @@ import android.os.Bundle
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import com.google.android.gms.maps.CameraUpdateFactory
@@ -134,9 +133,14 @@ class MapActivity : AppCompatActivity(),
         get() = googleMap?.cameraPosition?.target ?: LatLng(0.0,
                 0.0)
 
-    fun setCamera(target: LatLng, zoom: Float) {
-        googleMap?.animateCamera(
-                CameraUpdateFactory.newLatLngZoom(target, zoom))
+    fun setCamera(target: LatLng, zoom: Float, bearing: Float, tilt: Float) {
+        val cameraPosition = CameraPosition.Builder()
+                .target(target)
+                .zoom(zoom)
+                .bearing(bearing)
+                .tilt(tilt)
+                .build()
+        googleMap?.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
     }
 
     fun setAnnotations(annotations: List<MapAnnotation>) {
@@ -411,7 +415,6 @@ class MapActivity : AppCompatActivity(),
                 exception.printStackTrace()
             }
         }
-        Log.d("Bitmap", "${bitmap}")
         if (bitmap != null) {
             markerOptions.icon(BitmapDescriptorFactory.fromBitmap(bitmap))
         } else {

android/src/main/kotlin/com/apptreesoftware/mapview/MapViewPlugin.kt

@@ -123,7 +123,9 @@ class MapViewPlugin(val activity: Activity) : MethodCallHandler {
             this.channel.invokeMethod("cameraPositionChanged", mapOf(
                     "latitude" to pos.target.latitude,
                     "longitude" to pos.target.longitude,
-                    "zoom" to pos.zoom
+                    "zoom" to pos.zoom,
+                    "bearing" to pos.bearing,
+                    "tilt" to pos.tilt
             ))
         }
 
@@ -278,7 +280,9 @@ class MapViewPlugin(val activity: Activity) : MethodCallHandler {
         val lat = map["latitude"] as Double
         val lng = map["longitude"] as Double
         val zoom = map["zoom"] as Double
-        mapActivity?.setCamera(LatLng(lat, lng), zoom.toFloat())
+        val bearing = map["bearing"] as Double
+        val tilt = map["tilt"] as Double
+        mapActivity?.setCamera(LatLng(lat, lng), zoom.toFloat(), bearing.toFloat(), tilt.toFloat())
     }
 
     fun handleZoomToAnnotations(map: Map<String, Any>) {

example/lib/main.dart

@@ -203,8 +203,13 @@ class _MyAppState extends State<MyApp> {
       mapView.zoomToFit(padding: 100);
     });
     compositeSubscription.add(sub);
-    sub = mapView.onLocationUpdated
-        .listen((location) => print("Location updated $location"));
+    sub = mapView.onLocationUpdated.listen((location) {
+      print("Location updated $location");
+      mapView.setCameraPosition(new CameraPosition(
+        new Location(location.latitude, location.longitude),
+        18.0,
+      ));
+    });
     compositeSubscription.add(sub);
     sub = mapView.onTouchAnnotation
         .listen((annotation) => print("annotation ${annotation.id} tapped"));

ios/Classes/MapViewController.h

@@ -21,7 +21,7 @@
       cameraPosition:(GMSCameraPosition *)cameraPosition;
 
 - (void)shutdown;
-- (void)setCamera:(CLLocationCoordinate2D)location zoom:(float)zoom;
+- (void)setCamera:(CLLocationCoordinate2D)location zoom:(float)zoom bearing:(CLLocationDirection)bearing tilt:(double)tilt;
 
 - (void)updateAnnotations:(NSArray *)annotations;
 - (void)clearAnnotations;

ios/Classes/MapViewPlugin.m

@@ -270,6 +270,8 @@ - (void)cameraPositionChanged:(GMSCameraPosition *)position {
     [self.channel invokeMethod:@"cameraPositionChanged" arguments:@{
             @"latitude": @(position.target.latitude),
             @"longitude": @(position.target.longitude),
+            @"bearing": @(position.bearing),
+            @"tilt": @(position.viewingAngle),
             @"zoom": @(position.zoom)
     }];
 }

lib/camera_position.dart

@@ -3,16 +3,22 @@ import 'package:map_view/location.dart';
 class CameraPosition {
   final Location center;
   final double zoom;
+  final double bearing;
+  final double tilt;
 
-  const CameraPosition(this.center, this.zoom);
+  const CameraPosition(this.center, this.zoom,
+      {this.bearing = 0.0, this.tilt = 0.0});
 
   factory CameraPosition.fromMap(Map map) {
-    return new CameraPosition(new Location.fromMap(map), map["zoom"]);
+    return new CameraPosition(new Location.fromMap(map), map["zoom"],
+        bearing: map["bearing"], tilt: map["tilt"]);
   }
 
   Map toMap() {
     Map map = center.toMap();
     map["zoom"] = zoom;
+    map["bearing"] = bearing;
+    map["tilt"] = tilt;
     return map;
   }
 }

lib/map_view.dart

@@ -191,9 +191,8 @@ class MapView {
         'zoomToPolygons', {"polygons": polygonsIds, "padding": padding});
   }
 
-  void setCameraPosition(double latitude, double longitude, double zoom) {
-    _channel.invokeMethod("setCamera",
-        {"latitude": latitude, "longitude": longitude, "zoom": zoom});
+  void setCameraPosition(CameraPosition cameraPosition) {
+    _channel.invokeMethod("setCamera", cameraPosition.toMap());
   }
 
   Future<Location> get centerLocation async {