Skip to content

[google_maps_flutter_android] Convert PlatformCameraUpdate to pigeon. #7507

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

Merged
yaakovschectman merged 25 commits into from
Sep 12, 2024
Merged

[google_maps_flutter_android] Convert PlatformCameraUpdate to pigeon. #7507

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e0762a1
Path based deps
yaakovschectman Aug 22, 2024
e52567b
Define pigeon classes
yaakovschectman Aug 22, 2024
c59b6f4
Gross quasi union type
yaakovschectman Aug 22, 2024
8bfcb9b
Port dart
yaakovschectman Aug 26, 2024
68b1cdf
Refactor out zoom subtypes
yaakovschectman Aug 26, 2024
2b612b9
Formatting
yaakovschectman Aug 26, 2024
6b75ce6
Upgrade Pigeon
yaakovschectman Aug 30, 2024
a0f9bab
Update pigeons
yaakovschectman Aug 30, 2024
e54cc9d
Java
yaakovschectman Aug 30, 2024
d951404
Update package for platform interface change
yaakovschectman Aug 30, 2024
497af2a
Format
yaakovschectman Aug 30, 2024
0c81c8c
Comment on Object field
yaakovschectman Sep 4, 2024
312aeb4
Update Convert.java
yaakovschectman Sep 5, 2024
ff1e466
Remove dead code
yaakovschectman Sep 9, 2024
69c361c
Expand unit tests to PlatformCameraUpdate cases
yaakovschectman Sep 9, 2024
b2a664d
Formatting
yaakovschectman Sep 9, 2024
0ee9e29
Remove path dependency
yaakovschectman Sep 9, 2024
cdecbae
Remove path dep
yaakovschectman Sep 9, 2024
e80cae6
Formatting
yaakovschectman Sep 9, 2024
f507163
Merge branch 'main' into pigeon_cam_update
yaakovschectman Sep 9, 2024
e28d715
Versioning
yaakovschectman Sep 9, 2024
a798791
Rename unit tests
yaakovschectman Sep 10, 2024
686b2d6
Merge branch 'main' into pigeon_cam_update
yaakovschectman Sep 10, 2024
0fe823a
Merge branch 'main' into pigeon_cam_update
yaakovschectman Sep 11, 2024
5fea8f4
Update interface dependency
yaakovschectman Sep 11, 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
Prev Previous commit
Next Next commit
Java
  • Loading branch information
@yaakovschectman
yaakovschectman committed Sep 9, 2024
commit e54cc9dbc7bc4933a5d72e667742aa5cc11c1a02
37 changes: 18 additions & 19 deletions ...gle_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,47 +341,46 @@ static CameraPosition toCameraPosition(Object o) {
}

static CameraUpdate cameraUpdateFromPigeon(Messages.PlatformCameraUpdate update, float density) {
Messages.PlatformNewCameraPosition newCameraPosition = update.getNewCameraPosition();
if (newCameraPosition != null) {
Object cameraUpdate = update.getCameraUpdate();
if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewCameraPosition) {
Messages.PlatformCameraUpdateNewCameraPosition newCameraPosition = (Messages.PlatformCameraUpdateNewCameraPosition) cameraUpdate;
return CameraUpdateFactory.newCameraPosition(
cameraPositionFromPigeon(newCameraPosition.getCameraPosition()));
}
Messages.PlatformNewLatLng newLatLng = update.getNewLatLng();
if (newLatLng != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLng) {
Messages.PlatformCameraUpdateNewLatLng newLatLng = (Messages.PlatformCameraUpdateNewLatLng) cameraUpdate;
return CameraUpdateFactory.newLatLng(latLngFromPigeon(newLatLng.getLatLng()));
Copy link
Contributor

@reidbaker reidbaker Aug 26, 2024

Choose a reason for hiding this comment

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

I may not be following the types here but is it possible to make this CameraUpdateFactory.newLatLng(latLngFromPigeon(newLatLng); It seems, based on names alone that we should not need so many unboxing/reboxing of lat long data.

Copy link
Contributor Author

@yaakovschectman yaakovschectman Aug 27, 2024

Choose a reason for hiding this comment

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

newLatLng is an instance of PlatformNewLatLng, which represents the camera move update to the new position. latLngFromPigeon accepts a PlatformLatLng, which is just a boxed pair of numeric coordinates, not a PlatformNewLatLng. I intend to add a CameraUpdate prefix to the relevant classes, including PlatformNewLatLng, as per Stuart's comment, which I believe will make this more clear.

}
Messages.PlatformNewLatLngZoom newLatLngZoom = update.getNewLatLngZoom();
if (newLatLngZoom != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLngZoom) {
Messages.PlatformCameraUpdateNewLatLngZoom newLatLngZoom = (Messages.PlatformCameraUpdateNewLatLngZoom) cameraUpdate;
return CameraUpdateFactory.newLatLngZoom(
latLngFromPigeon(newLatLngZoom.getLatLng()), newLatLngZoom.getZoom().floatValue());
}
Messages.PlatformNewLatLngBounds newLatLngBounds = update.getNewLatLngBounds();
if (newLatLngBounds != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLngBounds) {
Messages.PlatformCameraUpdateNewLatLngBounds newLatLngBounds = (Messages.PlatformCameraUpdateNewLatLngBounds) cameraUpdate;
return CameraUpdateFactory.newLatLngBounds(
latLngBoundsFromPigeon(newLatLngBounds.getBounds()),
(int) (newLatLngBounds.getPadding() * density));
}
Messages.PlatformScrollBy scrollBy = update.getScrollBy();
if (scrollBy != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateScrollBy) {
Messages.PlatformCameraUpdateScrollBy scrollBy = (Messages.PlatformCameraUpdateScrollBy) cameraUpdate;
return CameraUpdateFactory.scrollBy(
scrollBy.getDx().floatValue() * density, scrollBy.getDy().floatValue() * density);
}
Messages.PlatformZoomBy zoomBy = update.getZoomBy();
if (zoomBy != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateZoomBy) {
Messages.PlatformCameraUpdateZoomBy zoomBy = (Messages.PlatformCameraUpdateZoomBy) cameraUpdate;
final Point focus = pointFromPigeon(zoomBy.getFocus(), density);
return (focus != null)
? CameraUpdateFactory.zoomBy(zoomBy.getAmount().floatValue(), focus)
: CameraUpdateFactory.zoomBy(zoomBy.getAmount().floatValue());
}
Messages.PlatformZoomTo zoomTo = update.getZoomTo();
if (zoomTo != null) {
if (cameraUpdate instanceof Messages.PlatformCameraUpdateZoomTo) {
Messages.PlatformCameraUpdateZoomTo zoomTo = (Messages.PlatformCameraUpdateZoomTo) cameraUpdate;
return CameraUpdateFactory.zoomTo(zoomTo.getZoom().floatValue());
}
if (update.getZoomIn()) {
return CameraUpdateFactory.zoomIn();
}
if (update.getZoomOut()) {
return CameraUpdateFactory.zoomOut();
if (cameraUpdate instanceof Messages.PlatformCameraUpdateZoom) {
Messages.PlatformCameraUpdateZoom zoom = (Messages.PlatformCameraUpdateZoom) cameraUpdate;
return (zoom.getOut()) ? CameraUpdateFactory.zoomOut() : CameraUpdateFactory.zoomIn();
}
throw new IllegalArgumentException("PlatformCameraUpdate must have one non-null member.");
}
Expand Down