Implemented some maps functionality

Author: LuisThein

lib/platform_maps_flutter.dart

@@ -11,3 +11,5 @@ import 'package:apple_maps_flutter/apple_maps_flutter.dart' as appleMaps;
 part 'src/camera.dart';
 part 'src/platform_maps.dart';
 part 'src/location.dart';
+part 'src/marker.dart';
+part 'src/map_type.dart';

lib/src/camera.dart

@@ -7,29 +7,28 @@ part of flutter_platform_maps;
 /// The position of the map "camera", the view point from which the world is
 /// shown in the map view. Aggregates the camera's [target] geographical
 /// location, its [zoom] level, [pitch] angle, and [heading].
-class CameraPosition
-    implements googleMaps.CameraPosition, appleMaps.CameraPosition {
+class CameraPosition {
   const CameraPosition({
     @required this.target,
-    this.heading = 0.0,
-    this.pitch = 0.0,
+    this.bearing = 0.0,
+    this.tilt = 0.0,
     this.zoom = 0,
   })  : assert(target != null),
-        assert(heading != null),
-        assert(pitch != null),
+        assert(bearing != null),
+        assert(tilt != null),
         assert(zoom != null);
 
   /// The camera's bearing in degrees, measured clockwise from north.
   ///
   /// A bearing of 0.0, the default, means the camera points north.
   /// A bearing of 90.0 means the camera points east.
-  final double heading;
+  final double bearing;
 
   /// The geographical location that the camera is pointing at.
   final LatLng target;
 
   // In degrees where 0 is looking straight down. Pitch may be clamped to an appropriate value.
-  final double pitch;
+  final double tilt;
 
   /// The zoom level of the camera.
   ///
@@ -45,21 +44,21 @@ class CameraPosition
   /// will be silently clamped to the supported range.
   final double zoom;
 
-  @override
-  String toString() =>
-      'CameraPosition(bearing: $heading, target: $target, tilt: $pitch, zoom: $zoom)';
-
-  @override
-  // TODO: implement bearing
-  double get bearing => null;
-
-  @override
-  // TODO: implement tilt
-  double get tilt => null;
+  appleMaps.CameraPosition appleMapsCameraPosition() {
+    return appleMaps.CameraPosition(
+      target: this.target.appleLatLng,
+      heading: this.bearing,
+      pitch: this.tilt,
+      zoom: this.zoom,
+    );
+  }
 
-  @override
-  toMap() {
-    // TODO: implement toMap
-    return null;
+  googleMaps.CameraPosition googleMapsCameraPosition() {
+    return googleMaps.CameraPosition(
+      target: this.target.googleLatLng,
+      bearing: this.bearing,
+      tilt: this.tilt,
+      zoom: this.zoom,
+    );
   }
 }

lib/src/location.dart

@@ -5,7 +5,7 @@
 part of flutter_platform_maps;
 
 /// A pair of latitude and longitude coordinates, stored as degrees.
-class LatLng implements googleMaps.LatLng, appleMaps.LatLng {
+class LatLng {
   /// Creates a geographical location specified in degrees [latitude] and
   /// [longitude].
   ///
@@ -26,17 +26,6 @@ class LatLng implements googleMaps.LatLng, appleMaps.LatLng {
   /// The longitude in degrees between -180.0 (inclusive) and 180.0 (exclusive).
   final double longitude;
 
-  dynamic _toJson() {
-    return <double>[latitude, longitude];
-  }
-
-  static LatLng _fromJson(dynamic json) {
-    if (json == null) {
-      return null;
-    }
-    return LatLng(json[0], json[1]);
-  }
-
   @override
   String toString() => '$runtimeType($latitude, $longitude)';
 
@@ -45,79 +34,13 @@ class LatLng implements googleMaps.LatLng, appleMaps.LatLng {
     return o is LatLng && o.latitude == latitude && o.longitude == longitude;
   }
 
-  @override
-  int get hashCode => hashValues(latitude, longitude);
-}
-
-/// A latitude/longitude aligned rectangle.
-///
-/// The rectangle conceptually includes all points (lat, lng) where
-/// * lat ∈ [`southwest.latitude`, `northeast.latitude`]
-/// * lng ∈ [`southwest.longitude`, `northeast.longitude`],
-///   if `southwest.longitude` ≤ `northeast.longitude`,
-/// * lng ∈ [-180, `northeast.longitude`] ∪ [`southwest.longitude`, 180[,
-///   if `northeast.longitude` < `southwest.longitude`
-class LatLngBounds {
-  /// Creates geographical bounding box with the specified corners.
-  ///
-  /// The latitude of the southwest corner cannot be larger than the
-  /// latitude of the northeast corner.
-  LatLngBounds({@required this.southwest, @required this.northeast})
-      : assert(southwest != null),
-        assert(northeast != null),
-        assert(southwest.latitude <= northeast.latitude);
-
-  /// The southwest corner of the rectangle.
-  final LatLng southwest;
-
-  /// The northeast corner of the rectangle.
-  final LatLng northeast;
-
-  dynamic _toList() {
-    return <dynamic>[southwest._toJson(), northeast._toJson()];
-  }
-
-  /// Returns whether this rectangle contains the given [LatLng].
-  bool contains(LatLng point) {
-    return _containsLatitude(point.latitude) &&
-        _containsLongitude(point.longitude);
-  }
-
-  bool _containsLatitude(double lat) {
-    return (southwest.latitude <= lat) && (lat <= northeast.latitude);
-  }
-
-  bool _containsLongitude(double lng) {
-    if (southwest.longitude <= northeast.longitude) {
-      return southwest.longitude <= lng && lng <= northeast.longitude;
-    } else {
-      return southwest.longitude <= lng || lng <= northeast.longitude;
-    }
-  }
-
-  @visibleForTesting
-  static LatLngBounds fromList(dynamic json) {
-    if (json == null) {
-      return null;
-    }
-    return LatLngBounds(
-      southwest: LatLng._fromJson(json[0]),
-      northeast: LatLng._fromJson(json[1]),
-    );
-  }
-
-  @override
-  String toString() {
-    return '$runtimeType($southwest, $northeast)';
-  }
+  appleMaps.LatLng get appleLatLng => appleMaps.LatLng(
+        this.latitude,
+        this.longitude,
+      );
 
-  @override
-  bool operator ==(Object o) {
-    return o is LatLngBounds &&
-        o.southwest == southwest &&
-        o.northeast == northeast;
-  }
-
-  @override
-  int get hashCode => hashValues(southwest, northeast);
+  googleMaps.LatLng get googleLatLng => googleMaps.LatLng(
+        this.latitude,
+        this.longitude,
+      );
 }

lib/src/map_type.dart

@@ -0,0 +1,27 @@
+part of flutter_platform_maps;
+
+class MapType {
+  static get normal {
+    if (Platform.isIOS) {
+      return appleMaps.MapType.standard;
+    } else if (Platform.isAndroid) {
+      return googleMaps.MapType.normal;
+    }
+  }
+
+  static get satallite {
+    if (Platform.isIOS) {
+      return appleMaps.MapType.satellite;
+    } else if (Platform.isAndroid) {
+      return googleMaps.MapType.satellite;
+    }
+  }
+
+  static get hybrid {
+    if (Platform.isAndroid) {
+      return appleMaps.MapType.hybrid;
+    } else if (Platform.isIOS) {
+      return googleMaps.MapType.hybrid;
+    }
+  }
+}

lib/src/marker.dart

@@ -0,0 +1,145 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of flutter_platform_maps;
+
+dynamic _offsetToJson(Offset offset) {
+  if (offset == null) {
+    return null;
+  }
+  return <dynamic>[offset.dx, offset.dy];
+}
+
+/// Text labels for a [Marker] info window.
+class InfoWindow {
+  const InfoWindow({
+    this.title,
+    this.snippet,
+    this.onTap,
+  });
+
+  /// Text labels specifying that no text is to be displayed.
+  static const InfoWindow noText = InfoWindow();
+
+  /// Text displayed in an info window when the user taps the marker.
+  ///
+  /// A null value means no title.
+  final String title;
+
+  /// Additional text displayed below the [title].
+  ///
+  /// A null value means no additional text.
+  final String snippet;
+
+  /// onTap callback for this [InfoWindow].
+  final VoidCallback onTap;
+
+  appleMaps.InfoWindow get appleMapsInfoWindow => appleMaps.InfoWindow(
+        anchor: Offset(0, 0),
+        onTap: this.onTap,
+        snippet: this.snippet,
+        title: this.title,
+      );
+
+  googleMaps.InfoWindow get googleMapsInfoWindow => googleMaps.InfoWindow(
+        anchor: Offset(0, 0),
+        onTap: this.onTap,
+        snippet: this.snippet,
+        title: this.title,
+      );
+}
+
+/// Uniquely identifies a [Marker] among [GoogleMap] markers.
+///
+/// This does not have to be globally unique, only unique among the list.
+@immutable
+class MarkerId {
+  MarkerId(this.value) : assert(value != null);
+
+  /// value of the [MarkerId].
+  final String value;
+
+  appleMaps.AnnotationId get appleMapsAnnoationId => appleMaps.AnnotationId(
+        this.value,
+      );
+
+  googleMaps.MarkerId get googleMapsMarkerId => googleMaps.MarkerId(
+        this.value,
+      );
+}
+
+/// Marks a geographical location on the map.
+///
+/// A marker icon is drawn oriented against the device's screen rather than
+/// the map's surface; that is, it will not necessarily change orientation
+/// due to map rotations, tilting, or zooming.
+@immutable
+class Marker {
+  /// Creates a set of marker configuration options.
+  ///
+  /// Default marker options.
+  ///
+  /// Specifies a marker that
+  /// * is fully opaque; [alpha] is 1.0
+  /// * uses icon bottom center to indicate map position; [anchor] is (0.5, 1.0)
+  /// * has default tap handling; [consumeTapEvents] is false
+  /// * is stationary; [draggable] is false
+  /// * is drawn against the screen, not the map; [flat] is false
+  /// * has a default icon; [icon] is `BitmapDescriptor.defaultMarker`
+  /// * anchors the info window at top center; [infoWindowAnchor] is (0.5, 0.0)
+  /// * has no info window text; [infoWindowText] is `InfoWindowText.noText`
+  /// * is positioned at 0, 0; [position] is `LatLng(0.0, 0.0)`
+  /// * has an axis-aligned icon; [rotation] is 0.0
+  /// * is visible; [visible] is true
+  /// * is placed at the base of the drawing order; [zIndex] is 0.0
+  const Marker({
+    @required this.markerId,
+    this.alpha = 1.0,
+    this.consumeTapEvents = false,
+    this.draggable = false,
+    // this.icon = BitmapDescriptor.defaultMarker,
+    this.infoWindow = InfoWindow.noText,
+    this.position = const LatLng(0.0, 0.0),
+    this.onTap,
+  }) : assert(alpha == null || (0.0 <= alpha && alpha <= 1.0));
+
+  /// Uniquely identifies a [Marker].
+  final MarkerId markerId;
+
+  /// The opacity of the marker, between 0.0 and 1.0 inclusive.
+  ///
+  /// 0.0 means fully transparent, 1.0 means fully opaque.
+  final double alpha;
+
+  /// True if the marker icon consumes tap events. If not, the map will perform
+  /// default tap handling by centering the map on the marker and displaying its
+  /// info window.
+  final bool consumeTapEvents;
+
+  /// True if the marker is draggable by user touch events.
+  final bool draggable;
+
+  /// A description of the bitmap used to draw the marker icon.
+  // final BitmapDescriptor icon;
+
+  /// A Google Maps InfoWindow.
+  ///
+  /// The window is displayed when the marker is tapped.
+  final InfoWindow infoWindow;
+
+  /// Geographical location of the marker.
+  final LatLng position;
+
+  /// Callbacks to receive tap events for markers placed on this map.
+  final VoidCallback onTap;
+
+  appleMaps.Annotation get appleMapsAnnotation => appleMaps.Annotation(
+        annotationId: this.markerId.appleMapsAnnoationId,
+        alpha: this.alpha,
+        draggable: this.draggable,
+        infoWindow: this.infoWindow.appleMapsInfoWindow,
+        onTap: this.onTap,
+        position: this.position.appleLatLng,
+      );
+}