Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[google_maps_flutter] Semi-convert remaining iOS host API calls to Pigeon #7079

Merged
merged 9 commits into from
Jul 9, 2024
Merged

[google_maps_flutter] Semi-convert remaining iOS host API calls to Pigeon #7079

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c997c9
Native implementation updates
stuartmorgan Jul 2, 2024
01a38c9
Native unit test updates, and unused method cleanup
stuartmorgan Jul 2, 2024
2b5ccf3
Dart implementation conversion, mostly from Android
stuartmorgan Jul 2, 2024
ab74668
Bring updated and expanded Dart unit tests over from Android
stuartmorgan Jul 2, 2024
be8fc0f
Fix androidism copy/paste
stuartmorgan Jul 2, 2024
988cab6
Remove unused copypasta class
stuartmorgan Jul 2, 2024
644de67
Version bump
stuartmorgan Jul 8, 2024
1eceb94
Fix test case
stuartmorgan Jul 8, 2024
7ced721
Improve generated selector
stuartmorgan Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.9.0

* Converts additional platform calls to Pigeon.

## 2.8.2

* Converts inspector interface platform calls to Pigeon.
Expand Down
83 changes: 39 additions & 44 deletions ...ps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,26 @@ - (void)testDictionaryFromPosition {
XCTAssertEqualObjects(dictionary[@"tilt"], @75.0);
}

- (void)testDictionaryFromPoint {
- (void)testPigeonPointForGCPoint {
CGPoint point = CGPointMake(10, 20);
NSDictionary *dictionary = [FLTGoogleMapJSONConversions dictionaryFromPoint:point];
const CGFloat accuracy = 0.0001;
XCTAssertEqualWithAccuracy([dictionary[@"x"] floatValue], point.x, accuracy);
XCTAssertEqualWithAccuracy([dictionary[@"y"] floatValue], point.y, accuracy);
FGMPlatformPoint *pigeonPoint = FGMGetPigeonPointForCGPoint(point);
XCTAssertEqualWithAccuracy(pigeonPoint.x, point.x, DBL_EPSILON);
XCTAssertEqualWithAccuracy(pigeonPoint.y, point.y, DBL_EPSILON);
}

- (void)testDictionaryFromCoordinateBounds {
XCTAssertNil([FLTGoogleMapJSONConversions dictionaryFromCoordinateBounds:nil]);

- (void)testPigeonLatLngBoundsForCoordinateBounds {
GMSCoordinateBounds *bounds =
[[GMSCoordinateBounds alloc] initWithCoordinate:CLLocationCoordinate2DMake(10, 20)
coordinate:CLLocationCoordinate2DMake(30, 40)];
NSDictionary *dictionary = [FLTGoogleMapJSONConversions dictionaryFromCoordinateBounds:bounds];
NSArray *southwest = @[ @10, @20 ];
NSArray *northeast = @[ @30, @40 ];
XCTAssertEqualObjects(dictionary[@"southwest"], southwest);
XCTAssertEqualObjects(dictionary[@"northeast"], northeast);
FGMPlatformLatLngBounds *pigeonBounds = FGMGetPigeonLatLngBoundsForCoordinateBounds(bounds);
XCTAssertEqualWithAccuracy(pigeonBounds.southwest.latitude, bounds.southWest.latitude,
DBL_EPSILON);
XCTAssertEqualWithAccuracy(pigeonBounds.southwest.longitude, bounds.southWest.longitude,
DBL_EPSILON);
XCTAssertEqualWithAccuracy(pigeonBounds.northeast.latitude, bounds.northEast.latitude,
DBL_EPSILON);
XCTAssertEqualWithAccuracy(pigeonBounds.northeast.longitude, bounds.northEast.longitude,
DBL_EPSILON);
}

- (void)testCameraPostionFromDictionary {
Expand All @@ -151,19 +152,13 @@ - (void)testCameraPostionFromDictionary {
XCTAssertEqualWithAccuracy(cameraPosition.viewingAngle, 5, accuracy);
}

- (void)testPointFromDictionary {
XCTAssertNil([FLTGoogleMapJSONConversions cameraPostionFromDictionary:nil]);
- (void)testCGPointForPigeonPoint {
FGMPlatformPoint *pigeonPoint = [FGMPlatformPoint makeWithX:1.0 y:2.0];

NSDictionary *dictionary = @{
@"x" : @1,
@"y" : @2,
};
CGPoint point = FGMGetCGPointForPigeonPoint(pigeonPoint);

CGPoint point = [FLTGoogleMapJSONConversions pointFromDictionary:dictionary];

const CGFloat accuracy = 0.001;
XCTAssertEqualWithAccuracy(point.x, 1, accuracy);
XCTAssertEqualWithAccuracy(point.y, 2, accuracy);
XCTAssertEqualWithAccuracy(pigeonPoint.x, point.x, DBL_EPSILON);
XCTAssertEqualWithAccuracy(pigeonPoint.y, point.y, DBL_EPSILON);
}

- (void)testCoordinateBoundsFromLatLongs {
Expand All @@ -188,18 +183,18 @@ - (void)testMapViewTypeFromTypeValue {
XCTAssertEqual(kGMSTypeNone, [FLTGoogleMapJSONConversions mapViewTypeFromTypeValue:@5]);
}

- (void)testCameraUpdateFromChannelValueNewCameraPosition {
- (void)testcameraUpdateFromArrayNewCameraPosition {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit

Suggested change
- (void)testcameraUpdateFromArrayNewCameraPosition {
- (void)testCameraUpdateFromArrayNewCameraPosition {

NSArray *channelValue = @[
@"newCameraPosition", @{@"target" : @[ @1, @2 ], @"zoom" : @3, @"bearing" : @4, @"tilt" : @5}
];
id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValue];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValue];
[[classMockCameraUpdate expect]
setCamera:[FLTGoogleMapJSONConversions cameraPostionFromDictionary:channelValue[1]]];
[classMockCameraUpdate stopMocking];
}

// TODO(cyanglaz): Fix the test for CameraUpdateFromChannelValue with the "NewLatlng" key.
// TODO(cyanglaz): Fix the test for cameraUpdateFromArray with the "NewLatlng" key.
// 2 approaches have been tried and neither worked for the tests.
//
// 1. Use OCMock to vefiry that [GMSCameraUpdate setTarget:] is triggered with the correct value.
Expand All @@ -213,10 +208,10 @@ - (void)testCameraUpdateFromChannelValueNewCameraPosition {
// verified.
//
// The code in below test uses the 2nd approach.
- (void)skip_testCameraUpdateFromChannelValueNewLatLong {
- (void)skip_testcameraUpdateFromArrayNewLatLong {
stuartmorgan marked this conversation as resolved.
Show resolved Hide resolved
NSArray *channelValue = @[ @"newLatLng", @[ @1, @2 ] ];

GMSCameraUpdate *update = [FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValue];
GMSCameraUpdate *update = [FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValue];

GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
options.frame = CGRectZero;
Expand All @@ -230,81 +225,81 @@ - (void)skip_testCameraUpdateFromChannelValueNewLatLong {
accuracy); // mapView.camera.target.longitude is still 6.
}

- (void)testCameraUpdateFromChannelValueNewLatLngBounds {
- (void)testcameraUpdateFromArrayNewLatLngBounds {
NSArray<NSNumber *> *latlong1 = @[ @1, @2 ];
NSArray<NSNumber *> *latlong2 = @[ @(3), @(4) ];
GMSCoordinateBounds *bounds =
[FLTGoogleMapJSONConversions coordinateBoundsFromLatLongs:@[ latlong1, latlong2 ]];

NSArray *channelValue = @[ @"newLatLngBounds", @[ latlong1, latlong2 ], @20 ];
id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValue];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValue];

[[classMockCameraUpdate expect] fitBounds:bounds withPadding:20];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueNewLatLngZoom {
- (void)testcameraUpdateFromArrayNewLatLngZoom {
NSArray *channelValue = @[ @"newLatLngZoom", @[ @1, @2 ], @3 ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValue];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValue];

[[classMockCameraUpdate expect] setTarget:CLLocationCoordinate2DMake(1, 2) zoom:3];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueScrollBy {
- (void)testcameraUpdateFromArrayScrollBy {
NSArray *channelValue = @[ @"scrollBy", @1, @2 ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValue];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValue];

[[classMockCameraUpdate expect] scrollByX:1 Y:2];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueZoomBy {
- (void)testcameraUpdateFromArrayZoomBy {
NSArray *channelValueNoPoint = @[ @"zoomBy", @1 ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValueNoPoint];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValueNoPoint];

[[classMockCameraUpdate expect] zoomBy:1];

NSArray *channelValueWithPoint = @[ @"zoomBy", @1, @[ @2, @3 ] ];

[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValueWithPoint];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValueWithPoint];

[[classMockCameraUpdate expect] zoomBy:1 atPoint:CGPointMake(2, 3)];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueZoomIn {
- (void)testcameraUpdateFromArrayZoomIn {
NSArray *channelValueNoPoint = @[ @"zoomIn" ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValueNoPoint];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValueNoPoint];

[[classMockCameraUpdate expect] zoomIn];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueZoomOut {
- (void)testcameraUpdateFromArrayZoomOut {
NSArray *channelValueNoPoint = @[ @"zoomOut" ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValueNoPoint];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValueNoPoint];

[[classMockCameraUpdate expect] zoomOut];
[classMockCameraUpdate stopMocking];
}

- (void)testCameraUpdateFromChannelValueZoomTo {
- (void)testcameraUpdateFromArrayZoomTo {
NSArray *channelValueNoPoint = @[ @"zoomTo", @1 ];

id classMockCameraUpdate = OCMClassMock([GMSCameraUpdate class]);
[FLTGoogleMapJSONConversions cameraUpdateFromChannelValue:channelValueNoPoint];
[FLTGoogleMapJSONConversions cameraUpdateFromArray:channelValueNoPoint];

[[classMockCameraUpdate expect] zoomTo:1];
[classMockCameraUpdate stopMocking];
Expand Down
23 changes: 19 additions & 4 deletions ...ges/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,29 @@
#import <Flutter/Flutter.h>
#import <GoogleMaps/GoogleMaps.h>

#import "messages.g.h"

NS_ASSUME_NONNULL_BEGIN

/// Returns dict[key], or nil if dict[key] is NSNull.
extern id _Nullable FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key);

/// Creates a CGPoint from its Pigeon equivalent.
extern CGPoint FGMGetCGPointForPigeonPoint(FGMPlatformPoint *point);

/// Converts a CGPoint to its Pigeon equivalent.
extern FGMPlatformPoint *FGMGetPigeonPointForCGPoint(CGPoint point);

/// Creates a CLLocationCoordinate2D from its Pigeon representation.
extern CLLocationCoordinate2D FGMGetCoordinateForPigeonLatLng(FGMPlatformLatLng *latLng);

/// Converts a CLLocationCoordinate2D to its Pigeon representation.
extern FGMPlatformLatLng *FGMGetPigeonLatLngForCoordinate(CLLocationCoordinate2D coord);

/// Converts a GMSCoordinateBounds to its Pigeon representation.
extern FGMPlatformLatLngBounds *FGMGetPigeonLatLngBoundsForCoordinateBounds(
GMSCoordinateBounds *bounds);

@interface FLTGoogleMapJSONConversions : NSObject

+ (CLLocationCoordinate2D)locationFromLatLong:(NSArray *)latlong;
Expand All @@ -20,13 +38,10 @@ extern id _Nullable FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key);
+ (NSArray<NSArray<CLLocation *> *> *)holesFromPointsArray:(NSArray *)data;
+ (nullable NSDictionary<NSString *, id> *)dictionaryFromPosition:
(nullable GMSCameraPosition *)position;
+ (NSDictionary<NSString *, NSNumber *> *)dictionaryFromPoint:(CGPoint)point;
+ (nullable NSDictionary *)dictionaryFromCoordinateBounds:(nullable GMSCoordinateBounds *)bounds;
+ (nullable GMSCameraPosition *)cameraPostionFromDictionary:(nullable NSDictionary *)channelValue;
+ (CGPoint)pointFromDictionary:(NSDictionary *)dictionary;
+ (GMSCoordinateBounds *)coordinateBoundsFromLatLongs:(NSArray *)latlongs;
+ (GMSMapViewType)mapViewTypeFromTypeValue:(NSNumber *)value;
+ (nullable GMSCameraUpdate *)cameraUpdateFromChannelValue:(NSArray *)channelValue;
+ (nullable GMSCameraUpdate *)cameraUpdateFromArray:(NSArray *)channelValue;

/// Return GMS strokestyle object array populated using the patterns and stroke colors passed in.
///
Expand Down
47 changes: 23 additions & 24 deletions ...ges/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,28 @@ id FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key) {
return value == [NSNull null] ? nil : value;
}

CGPoint FGMGetCGPointForPigeonPoint(FGMPlatformPoint *point) {
return CGPointMake(point.x, point.y);
}

FGMPlatformPoint *FGMGetPigeonPointForCGPoint(CGPoint point) {
return [FGMPlatformPoint makeWithX:point.x y:point.y];
}

CLLocationCoordinate2D FGMGetCoordinateForPigeonLatLng(FGMPlatformLatLng *latLng) {
return CLLocationCoordinate2DMake(latLng.latitude, latLng.longitude);
}

FGMPlatformLatLng *FGMGetPigeonLatLngForCoordinate(CLLocationCoordinate2D coord) {
return [FGMPlatformLatLng makeWithLatitude:coord.latitude longitude:coord.longitude];
}

FGMPlatformLatLngBounds *FGMGetPigeonLatLngBoundsForCoordinateBounds(GMSCoordinateBounds *bounds) {
return
[FGMPlatformLatLngBounds makeWithNortheast:FGMGetPigeonLatLngForCoordinate(bounds.northEast)
southwest:FGMGetPigeonLatLngForCoordinate(bounds.southWest)];
}

@implementation FLTGoogleMapJSONConversions

+ (CLLocationCoordinate2D)locationFromLatLong:(NSArray *)latlong {
Expand Down Expand Up @@ -67,23 +89,6 @@ + (UIColor *)colorFromRGBA:(NSNumber *)numberColor {
};
}

+ (NSDictionary<NSString *, NSNumber *> *)dictionaryFromPoint:(CGPoint)point {
return @{
@"x" : @(lroundf(point.x)),
@"y" : @(lroundf(point.y)),
};
}

+ (nullable NSDictionary *)dictionaryFromCoordinateBounds:(GMSCoordinateBounds *)bounds {
if (!bounds) {
return nil;
}
return @{
@"southwest" : [FLTGoogleMapJSONConversions arrayFromLocation:[bounds southWest]],
@"northeast" : [FLTGoogleMapJSONConversions arrayFromLocation:[bounds northEast]],
};
}

+ (nullable GMSCameraPosition *)cameraPostionFromDictionary:(nullable NSDictionary *)data {
if (!data) {
return nil;
Expand All @@ -95,12 +100,6 @@ + (nullable GMSCameraPosition *)cameraPostionFromDictionary:(nullable NSDictiona
viewingAngle:[data[@"tilt"] doubleValue]];
}

+ (CGPoint)pointFromDictionary:(NSDictionary *)dictionary {
double x = [dictionary[@"x"] doubleValue];
double y = [dictionary[@"y"] doubleValue];
return CGPointMake(x, y);
}

+ (GMSCoordinateBounds *)coordinateBoundsFromLatLongs:(NSArray *)latlongs {
return [[GMSCoordinateBounds alloc]
initWithCoordinate:[FLTGoogleMapJSONConversions locationFromLatLong:latlongs[0]]
Expand All @@ -112,7 +111,7 @@ + (GMSMapViewType)mapViewTypeFromTypeValue:(NSNumber *)typeValue {
return (GMSMapViewType)(value == 0 ? 5 : value);
}

+ (nullable GMSCameraUpdate *)cameraUpdateFromChannelValue:(NSArray *)channelValue {
+ (nullable GMSCameraUpdate *)cameraUpdateFromArray:(NSArray *)channelValue {
NSString *update = channelValue[0];
if ([update isEqualToString:@"newCameraPosition"]) {
return [GMSCameraUpdate
Expand Down
9 changes: 6 additions & 3 deletions ...ogle_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#import <Flutter/Flutter.h>
#import <GoogleMaps/GoogleMaps.h>

#import "messages.g.h"

NS_ASSUME_NONNULL_BEGIN

@interface FLTGoogleMapTileOverlayController : NSObject
Expand All @@ -28,9 +30,10 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)init:(FlutterMethodChannel *)methodChannel
mapView:(GMSMapView *)mapView
registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
- (void)addTileOverlays:(NSArray *)tileOverlaysToAdd;
- (void)changeTileOverlays:(NSArray *)tileOverlaysToChange;
- (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers;
- (void)addJSONTileOverlays:(NSArray<NSDictionary<NSString *, id> *> *)tileOverlaysToAdd;
- (void)addTileOverlays:(NSArray<FGMPlatformTileOverlay *> *)tileOverlaysToAdd;
- (void)changeTileOverlays:(NSArray<FGMPlatformTileOverlay *> *)tileOverlaysToChange;
- (void)removeTileOverlayWithIdentifiers:(NSArray<NSString *> *)identifiers;
- (void)clearTileCacheWithIdentifier:(NSString *)identifier;
- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier;
@end
Expand Down
Loading