From 4110d5570c36b1637ff2b0aba1653175ae828d8d Mon Sep 17 00:00:00 2001 From: SotoiGhost Date: Mon, 26 Sep 2016 19:32:39 -0500 Subject: [PATCH] [google][maps] Updated to version 2.1.0 --- Google.Maps/component/component.yaml | 4 +-- Google.Maps/externals/Podfile | 6 ++-- .../nuget/Xamarin.Google.iOS.Maps.nuspec | 2 +- .../GoogleMapsAdvSample/AppDelegate.cs | 3 +- .../source/Google.Maps/ApiDefinition.cs | 32 +++++++++++++++++++ .../source/Google.Maps/Google.Maps.targets | 12 +++---- 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Google.Maps/component/component.yaml b/Google.Maps/component/component.yaml index 0efaef2ad..20cf8e696 100755 --- a/Google.Maps/component/component.yaml +++ b/Google.Maps/component/component.yaml @@ -1,4 +1,4 @@ -version: 1.13.2.2 +version: 2.1.0.0 name: Google Maps for iOS id: googleiosmaps publisher: Xamarin Inc. @@ -15,7 +15,7 @@ libraries: is_shell: true packages: ios-unified: - - Xamarin.Google.iOS.Maps, Version=1.13.2.2 + - Xamarin.Google.iOS.Maps, Version=2.1.0.0 samples: - name: "Google Maps Sample" path: ../samples/GoogleMapsSample/GoogleMapsSample.sln diff --git a/Google.Maps/externals/Podfile b/Google.Maps/externals/Podfile index 63c8f0603..e86f58d01 100644 --- a/Google.Maps/externals/Podfile +++ b/Google.Maps/externals/Podfile @@ -4,7 +4,7 @@ platform :ios, '7.0' install! 'cocoapods', :integrate_targets => false target 'GoogleMaps' do - pod 'GoogleMaps', '2.0.1' - pod 'GooglePlaces', '2.0.1' - pod 'GooglePlacePicker', '2.0.1' + pod 'GoogleMaps', '2.1.0' + pod 'GooglePlaces', '2.1.0' + pod 'GooglePlacePicker', '2.1.0' end diff --git a/Google.Maps/nuget/Xamarin.Google.iOS.Maps.nuspec b/Google.Maps/nuget/Xamarin.Google.iOS.Maps.nuspec index 1b65f280b..41fb58704 100644 --- a/Google.Maps/nuget/Xamarin.Google.iOS.Maps.nuspec +++ b/Google.Maps/nuget/Xamarin.Google.iOS.Maps.nuspec @@ -3,7 +3,7 @@ Xamarin.Google.iOS.Maps Google APIs Maps iOS Library - 1.13.2.2 + 2.1.0.0 Xamarin Inc. Xamarin Inc. false diff --git a/Google.Maps/samples/GoogleMapsAdvSample/GoogleMapsAdvSample/AppDelegate.cs b/Google.Maps/samples/GoogleMapsAdvSample/GoogleMapsAdvSample/AppDelegate.cs index cdef79775..ec0d349ba 100644 --- a/Google.Maps/samples/GoogleMapsAdvSample/GoogleMapsAdvSample/AppDelegate.cs +++ b/Google.Maps/samples/GoogleMapsAdvSample/GoogleMapsAdvSample/AppDelegate.cs @@ -20,8 +20,7 @@ public partial class AppDelegate : UIApplicationDelegate DVCMenu dvc; UINavigationController navController; - //const string MapsApiKey = ""; - const string MapsApiKey = "AIzaSyD73QX07I6Wni2y0sIg-H7iTDl0eZ9i93w"; + const string MapsApiKey = ""; // // This method is invoked when the application has loaded and is ready to run. In this diff --git a/Google.Maps/source/Google.Maps/ApiDefinition.cs b/Google.Maps/source/Google.Maps/ApiDefinition.cs index 6dc161419..167bf5f82 100644 --- a/Google.Maps/source/Google.Maps/ApiDefinition.cs +++ b/Google.Maps/source/Google.Maps/ApiDefinition.cs @@ -835,6 +835,24 @@ interface MapLayer double CameraViewingAngle { get; set; } } + // @interface GMSMapStyle : NSObject + [DisableDefaultCtor] + [BaseType (typeof (NSObject), Name = "GMSMapStyle")] + interface MapStyle + { + // + (GMS_NULLABLE_INSTANCETYPE)styleWithJSONString:(NSString *)style error:(NSError* __autoreleasing GMS_NULLABLE_PTR*)error; + [Static] + [return: NullAllowed] + [Export ("styleWithJSONString:error:")] + MapStyle FromJson (string jsonStyle, [NullAllowed] NSError error); + + // (GMS_NULLABLE_INSTANCETYPE) styleWithContentsOfFileURL:(NSURL*)fileURL error:(NSError* __autoreleasing GMS_NULLABLE_PTR*)error; + [Static] + [return: NullAllowed] + [Export ("styleWithContentsOfFileURL:error:")] + MapStyle FromUrl (NSUrl fileUrl, [NullAllowed] NSError error); + } + interface IMapViewDelegate { @@ -873,6 +891,10 @@ interface MapViewDelegate [Export ("mapView:didTapOverlay:"), EventArgs ("GMSOverlayEvent"), EventName ("OverlayTapped")] void DidTapOverlay (MapView mapView, Overlay overlay); + // - (void)mapView:(GMSMapView *)mapView didTapPOIWithPlaceID:(NSString*)placeID name:(NSString*)name location:(CLLocationCoordinate2D)location; + [Export ("mapView:didTapPOIWithPlaceID:name:location:"), EventArgs ("GMSPoiWithPlaceIdEvent"), EventName ("PoiWithPlaceIdTapped")] + void DidTapPoiWithPlaceId (MapView mapView, string placeId, string name, CLLocationCoordinate2D location); + [Export ("mapView:markerInfoWindow:"), DelegateName ("GMSInfoFor"), DefaultValue (null)] UIView MarkerInfoWindow (MapView mapView, Marker marker); @@ -943,6 +965,11 @@ interface MapView [Export ("mapType", ArgumentSemantic.Assign)] MapViewType MapType { get; set; } + // @property(nonatomic, strong, nullable) GMSMapStyle *mapStyle; + [NullAllowed] + [Export ("mapStyle", ArgumentSemantic.Strong)] + MapStyle MapStyle { get; set; } + [Export ("minZoom", ArgumentSemantic.Assign)] float MinZoom { get; } @@ -999,6 +1026,10 @@ interface MapView [Export ("moveCamera:")] void MoveCamera (CameraUpdate update); + + // - (BOOL)areEqualForRenderingPosition:(GMSCameraPosition *)position position:(GMSCameraPosition*)otherPosition; + [Export ("areEqualForRenderingPosition:position:")] + bool Equals (CameraPosition position, CameraPosition otherPosition); } [BaseType (typeof (MapView))] @@ -1041,6 +1072,7 @@ interface Marker UIImage Icon { get; set; } // @property(nonatomic, strong) UIView *iconView; + [NullAllowed] [Export ("iconView", ArgumentSemantic.Strong)] UIView IconView { get; set; } diff --git a/Google.Maps/source/Google.Maps/Google.Maps.targets b/Google.Maps/source/Google.Maps/Google.Maps.targets index 57e144908..0e03dd3ad 100644 --- a/Google.Maps/source/Google.Maps/Google.Maps.targets +++ b/Google.Maps/source/Google.Maps/Google.Maps.targets @@ -3,22 +3,22 @@ <_GoogleMapsAssemblyName>Google.Maps, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_GoogleMapsItemsFolder>GMps-2.0.1 - <_GooglePlacesItemsFolder>GPlcs-2.0.1 - <_GooglePlacePickerItemsFolder>GPlcP-2.0.1 + <_GoogleMapsItemsFolder>GMps-2.1.0 + <_GooglePlacesItemsFolder>GPlcs-2.1.0 + <_GooglePlacePickerItemsFolder>GPlcP-2.1.0 - https://www.gstatic.com/cpdc/5a212b0fa429156f-GoogleMaps-2.0.1.tar.gz + https://dl.google.com/dl/cpdc/7afc1a08cd75f719/GoogleMaps-2.1.0.tar.gz Tgz - https://www.gstatic.com/cpdc/2b9e8b99fc05d124-GooglePlaces-2.0.1.tar.gz + https://dl.google.com/dl/cpdc/1204948f0f6ac434/GooglePlaces-2.1.0.tar.gz Tgz - https://www.gstatic.com/cpdc/58e6bc3d698639c1-GooglePlacePicker-2.0.1.tar.gz + https://dl.google.com/dl/cpdc/0b221e876f036871/GooglePlacePicker-2.1.0.tar.gz Tgz