diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index 3225fee21a8..43817fca9e4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.14.6 + +* Converts 'PlatformCameraUpdate' to pigeon. + ## 2.14.5 * Converts `JointType` to enum. diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java index 9c75e1d0d5e..fd86e0f3e3f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java @@ -44,7 +44,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -316,10 +315,6 @@ public static BitmapDescriptor getBitmapFromAsset( return bitmapDescriptorFactory.fromAsset(assetKey); } - private static boolean toBoolean(Object o) { - return (Boolean) o; - } - static @NonNull CameraPosition cameraPositionFromPigeon( @NonNull Messages.PlatformCameraPosition position) { final CameraPosition.Builder builder = CameraPosition.builder(); @@ -330,47 +325,57 @@ private static boolean toBoolean(Object o) { return builder.build(); } - static CameraPosition toCameraPosition(Object o) { - final Map data = toMap(o); - final CameraPosition.Builder builder = CameraPosition.builder(); - builder.bearing(toFloat(data.get("bearing"))); - builder.target(toLatLng(data.get("target"))); - builder.tilt(toFloat(data.get("tilt"))); - builder.zoom(toFloat(data.get("zoom"))); - return builder.build(); - } - - static CameraUpdate toCameraUpdate(Object o, float density) { - final List data = toList(o); - switch (toString(data.get(0))) { - case "newCameraPosition": - return CameraUpdateFactory.newCameraPosition(toCameraPosition(data.get(1))); - case "newLatLng": - return CameraUpdateFactory.newLatLng(toLatLng(data.get(1))); - case "newLatLngBounds": - return CameraUpdateFactory.newLatLngBounds( - toLatLngBounds(data.get(1)), toPixels(data.get(2), density)); - case "newLatLngZoom": - return CameraUpdateFactory.newLatLngZoom(toLatLng(data.get(1)), toFloat(data.get(2))); - case "scrollBy": - return CameraUpdateFactory.scrollBy( // - toFractionalPixels(data.get(1), density), // - toFractionalPixels(data.get(2), density)); - case "zoomBy": - if (data.size() == 2) { - return CameraUpdateFactory.zoomBy(toFloat(data.get(1))); - } else { - return CameraUpdateFactory.zoomBy(toFloat(data.get(1)), toPoint(data.get(2), density)); - } - case "zoomIn": - return CameraUpdateFactory.zoomIn(); - case "zoomOut": - return CameraUpdateFactory.zoomOut(); - case "zoomTo": - return CameraUpdateFactory.zoomTo(toFloat(data.get(1))); - default: - throw new IllegalArgumentException("Cannot interpret " + o + " as CameraUpdate"); - } + static CameraUpdate cameraUpdateFromPigeon(Messages.PlatformCameraUpdate update, float density) { + Object cameraUpdate = update.getCameraUpdate(); + if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewCameraPosition) { + Messages.PlatformCameraUpdateNewCameraPosition newCameraPosition = + (Messages.PlatformCameraUpdateNewCameraPosition) cameraUpdate; + return CameraUpdateFactory.newCameraPosition( + cameraPositionFromPigeon(newCameraPosition.getCameraPosition())); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLng) { + Messages.PlatformCameraUpdateNewLatLng newLatLng = + (Messages.PlatformCameraUpdateNewLatLng) cameraUpdate; + return CameraUpdateFactory.newLatLng(latLngFromPigeon(newLatLng.getLatLng())); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLngZoom) { + Messages.PlatformCameraUpdateNewLatLngZoom newLatLngZoom = + (Messages.PlatformCameraUpdateNewLatLngZoom) cameraUpdate; + return CameraUpdateFactory.newLatLngZoom( + latLngFromPigeon(newLatLngZoom.getLatLng()), newLatLngZoom.getZoom().floatValue()); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateNewLatLngBounds) { + Messages.PlatformCameraUpdateNewLatLngBounds newLatLngBounds = + (Messages.PlatformCameraUpdateNewLatLngBounds) cameraUpdate; + return CameraUpdateFactory.newLatLngBounds( + latLngBoundsFromPigeon(newLatLngBounds.getBounds()), + (int) (newLatLngBounds.getPadding() * density)); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateScrollBy) { + Messages.PlatformCameraUpdateScrollBy scrollBy = + (Messages.PlatformCameraUpdateScrollBy) cameraUpdate; + return CameraUpdateFactory.scrollBy( + scrollBy.getDx().floatValue() * density, scrollBy.getDy().floatValue() * density); + } + 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()); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateZoomTo) { + Messages.PlatformCameraUpdateZoomTo zoomTo = + (Messages.PlatformCameraUpdateZoomTo) cameraUpdate; + return CameraUpdateFactory.zoomTo(zoomTo.getZoom().floatValue()); + } + if (cameraUpdate instanceof Messages.PlatformCameraUpdateZoom) { + Messages.PlatformCameraUpdateZoom zoom = (Messages.PlatformCameraUpdateZoom) cameraUpdate; + return (zoom.getOut()) ? CameraUpdateFactory.zoomOut() : CameraUpdateFactory.zoomIn(); + } + throw new IllegalArgumentException( + "PlatformCameraUpdate's cameraUpdate field must be one of the PlatformCameraUpdate... case classes."); } private static double toDouble(Object o) { @@ -494,16 +499,16 @@ static Point pointFromPigeon(Messages.PlatformPoint point) { return new Point(point.getX().intValue(), point.getY().intValue()); } - static Messages.PlatformPoint pointToPigeon(Point point) { - return new Messages.PlatformPoint.Builder().setX((long) point.x).setY((long) point.y).build(); - } - - private static LatLngBounds toLatLngBounds(Object o) { - if (o == null) { + @Nullable + static Point pointFromPigeon(@Nullable Messages.PlatformOffset point, float density) { + if (point == null) { return null; } - final List data = toList(o); - return new LatLngBounds(toLatLng(data.get(0)), toLatLng(data.get(1))); + return new Point((int) (point.getDx() * density), (int) (point.getDy() * density)); + } + + static Messages.PlatformPoint pointToPigeon(Point point) { + return new Messages.PlatformPoint.Builder().setX((long) point.x).setY((long) point.y).build(); } private static List toList(Object o) { @@ -514,26 +519,6 @@ private static List toList(Object o) { return (Map) o; } - private static Map toObjectMap(Object o) { - Map hashMap = new HashMap<>(); - Map map = (Map) o; - for (Object key : map.keySet()) { - Object object = map.get(key); - if (object != null) { - hashMap.put((String) key, object); - } - } - return hashMap; - } - - private static float toFractionalPixels(Object o, float density) { - return toFloat(o) * density; - } - - private static int toPixels(Object o, float density) { - return (int) toFractionalPixels(o, density); - } - private static Bitmap toBitmap(Object o) { byte[] bmpData = (byte[]) o; Bitmap bitmap = BitmapFactory.decodeByteArray(bmpData, 0, bmpData.length); @@ -563,11 +548,6 @@ private static Bitmap toScaledBitmap(Bitmap bitmap, int width, int height) { return bitmap; } - private static Point toPoint(Object o, float density) { - final List data = toList(o); - return new Point(toPixels(data.get(0), density), toPixels(data.get(1), density)); - } - private static String toString(Object o) { return (String) o; } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java index 56120671786..140938ea047 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java @@ -933,7 +933,7 @@ public void moveCamera(@NonNull Messages.PlatformCameraUpdate cameraUpdate) { throw new FlutterError( "GoogleMap uninitialized", "moveCamera called prior to map initialization", null); } - googleMap.moveCamera(Convert.toCameraUpdate(cameraUpdate.getJson(), density)); + googleMap.moveCamera(Convert.cameraUpdateFromPigeon(cameraUpdate, density)); } @Override @@ -942,7 +942,7 @@ public void animateCamera(@NonNull Messages.PlatformCameraUpdate cameraUpdate) { throw new FlutterError( "GoogleMap uninitialized", "animateCamera called prior to map initialization", null); } - googleMap.animateCamera(Convert.toCameraUpdate(cameraUpdate.getJson(), density)); + googleMap.animateCamera(Convert.cameraUpdateFromPigeon(cameraUpdate, density)); } @Override diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Messages.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Messages.java index 3fcc74f3c69..db1edfe11dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Messages.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Messages.java @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v20.0.2), do not edit directly. +// Autogenerated from Pigeon (v22.3.0), do not edit directly. // See also: https://pub.dev/packages/pigeon package io.flutter.plugins.googlemaps; @@ -49,7 +49,7 @@ public FlutterError(@NonNull String code, @Nullable String message, @Nullable Ob @NonNull protected static ArrayList wrapError(@NonNull Throwable exception) { - ArrayList errorList = new ArrayList(3); + ArrayList errorList = new ArrayList<>(3); if (exception instanceof FlutterError) { FlutterError error = (FlutterError) exception; errorList.add(error.code); @@ -84,7 +84,7 @@ public enum PlatformMapType { final int index; - private PlatformMapType(final int index) { + PlatformMapType(final int index) { this.index = index; } } @@ -95,11 +95,12 @@ public enum PlatformRendererType { final int index; - private PlatformRendererType(final int index) { + PlatformRendererType(final int index) { this.index = index; } } + /** Join types for polyline joints. */ public enum PlatformJointType { MITERED(0), BEVEL(1), @@ -107,7 +108,7 @@ public enum PlatformJointType { final int index; - private PlatformJointType(final int index) { + PlatformJointType(final int index) { this.index = index; } } @@ -239,7 +240,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(4); + ArrayList toListResult = new ArrayList<>(4); toListResult.add(bearing); toListResult.add(target); toListResult.add(tilt); @@ -247,15 +248,15 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformCameraPosition fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformCameraPosition fromList(@NonNull ArrayList pigeonVar_list) { PlatformCameraPosition pigeonResult = new PlatformCameraPosition(); - Object bearing = __pigeon_list.get(0); + Object bearing = pigeonVar_list.get(0); pigeonResult.setBearing((Double) bearing); - Object target = __pigeon_list.get(1); + Object target = pigeonVar_list.get(1); pigeonResult.setTarget((PlatformLatLng) target); - Object tilt = __pigeon_list.get(2); + Object tilt = pigeonVar_list.get(2); pigeonResult.setTilt((Double) tilt); - Object zoom = __pigeon_list.get(3); + Object zoom = pigeonVar_list.get(3); pigeonResult.setZoom((Double) zoom); return pigeonResult; } @@ -268,25 +269,545 @@ ArrayList toList() { */ public static final class PlatformCameraUpdate { /** - * The update data, as JSON. This should only be set from CameraUpdate.toJson, and the native - * code must interpret it according to the internal implementation details of the CameraUpdate - * class. + * This Object shall be any of the below classes prefixed with PlatformCameraUpdate. Each such + * class represents a different type of camera update, and each holds a different set of data, + * preventing the use of a single unified class. Pigeon does not support inheritance, which + * prevents a more strict type bound. See https://github.com/flutter/flutter/issues/117819. */ - private @NonNull Object json; + private @NonNull Object cameraUpdate; - public @NonNull Object getJson() { - return json; + public @NonNull Object getCameraUpdate() { + return cameraUpdate; + } + + public void setCameraUpdate(@NonNull Object setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"cameraUpdate\" is null."); + } + this.cameraUpdate = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdate() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdate that = (PlatformCameraUpdate) o; + return cameraUpdate.equals(that.cameraUpdate); + } + + @Override + public int hashCode() { + return Objects.hash(cameraUpdate); + } + + public static final class Builder { + + private @Nullable Object cameraUpdate; + + @CanIgnoreReturnValue + public @NonNull Builder setCameraUpdate(@NonNull Object setterArg) { + this.cameraUpdate = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdate build() { + PlatformCameraUpdate pigeonReturn = new PlatformCameraUpdate(); + pigeonReturn.setCameraUpdate(cameraUpdate); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(cameraUpdate); + return toListResult; + } + + static @NonNull PlatformCameraUpdate fromList(@NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdate pigeonResult = new PlatformCameraUpdate(); + Object cameraUpdate = pigeonVar_list.get(0); + pigeonResult.setCameraUpdate(cameraUpdate); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of NewCameraPosition + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateNewCameraPosition { + private @NonNull PlatformCameraPosition cameraPosition; + + public @NonNull PlatformCameraPosition getCameraPosition() { + return cameraPosition; + } + + public void setCameraPosition(@NonNull PlatformCameraPosition setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"cameraPosition\" is null."); + } + this.cameraPosition = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateNewCameraPosition() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateNewCameraPosition that = (PlatformCameraUpdateNewCameraPosition) o; + return cameraPosition.equals(that.cameraPosition); + } + + @Override + public int hashCode() { + return Objects.hash(cameraPosition); + } + + public static final class Builder { + + private @Nullable PlatformCameraPosition cameraPosition; + + @CanIgnoreReturnValue + public @NonNull Builder setCameraPosition(@NonNull PlatformCameraPosition setterArg) { + this.cameraPosition = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateNewCameraPosition build() { + PlatformCameraUpdateNewCameraPosition pigeonReturn = + new PlatformCameraUpdateNewCameraPosition(); + pigeonReturn.setCameraPosition(cameraPosition); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(cameraPosition); + return toListResult; + } + + static @NonNull PlatformCameraUpdateNewCameraPosition fromList( + @NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateNewCameraPosition pigeonResult = + new PlatformCameraUpdateNewCameraPosition(); + Object cameraPosition = pigeonVar_list.get(0); + pigeonResult.setCameraPosition((PlatformCameraPosition) cameraPosition); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of NewLatLng + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateNewLatLng { + private @NonNull PlatformLatLng latLng; + + public @NonNull PlatformLatLng getLatLng() { + return latLng; + } + + public void setLatLng(@NonNull PlatformLatLng setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"latLng\" is null."); + } + this.latLng = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateNewLatLng() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateNewLatLng that = (PlatformCameraUpdateNewLatLng) o; + return latLng.equals(that.latLng); + } + + @Override + public int hashCode() { + return Objects.hash(latLng); + } + + public static final class Builder { + + private @Nullable PlatformLatLng latLng; + + @CanIgnoreReturnValue + public @NonNull Builder setLatLng(@NonNull PlatformLatLng setterArg) { + this.latLng = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateNewLatLng build() { + PlatformCameraUpdateNewLatLng pigeonReturn = new PlatformCameraUpdateNewLatLng(); + pigeonReturn.setLatLng(latLng); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(latLng); + return toListResult; + } + + static @NonNull PlatformCameraUpdateNewLatLng fromList( + @NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateNewLatLng pigeonResult = new PlatformCameraUpdateNewLatLng(); + Object latLng = pigeonVar_list.get(0); + pigeonResult.setLatLng((PlatformLatLng) latLng); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of NewLatLngBounds + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateNewLatLngBounds { + private @NonNull PlatformLatLngBounds bounds; + + public @NonNull PlatformLatLngBounds getBounds() { + return bounds; + } + + public void setBounds(@NonNull PlatformLatLngBounds setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"bounds\" is null."); + } + this.bounds = setterArg; + } + + private @NonNull Double padding; + + public @NonNull Double getPadding() { + return padding; + } + + public void setPadding(@NonNull Double setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"padding\" is null."); + } + this.padding = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateNewLatLngBounds() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateNewLatLngBounds that = (PlatformCameraUpdateNewLatLngBounds) o; + return bounds.equals(that.bounds) && padding.equals(that.padding); + } + + @Override + public int hashCode() { + return Objects.hash(bounds, padding); + } + + public static final class Builder { + + private @Nullable PlatformLatLngBounds bounds; + + @CanIgnoreReturnValue + public @NonNull Builder setBounds(@NonNull PlatformLatLngBounds setterArg) { + this.bounds = setterArg; + return this; + } + + private @Nullable Double padding; + + @CanIgnoreReturnValue + public @NonNull Builder setPadding(@NonNull Double setterArg) { + this.padding = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateNewLatLngBounds build() { + PlatformCameraUpdateNewLatLngBounds pigeonReturn = + new PlatformCameraUpdateNewLatLngBounds(); + pigeonReturn.setBounds(bounds); + pigeonReturn.setPadding(padding); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(2); + toListResult.add(bounds); + toListResult.add(padding); + return toListResult; + } + + static @NonNull PlatformCameraUpdateNewLatLngBounds fromList( + @NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateNewLatLngBounds pigeonResult = new PlatformCameraUpdateNewLatLngBounds(); + Object bounds = pigeonVar_list.get(0); + pigeonResult.setBounds((PlatformLatLngBounds) bounds); + Object padding = pigeonVar_list.get(1); + pigeonResult.setPadding((Double) padding); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of NewLatLngZoom + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateNewLatLngZoom { + private @NonNull PlatformLatLng latLng; + + public @NonNull PlatformLatLng getLatLng() { + return latLng; + } + + public void setLatLng(@NonNull PlatformLatLng setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"latLng\" is null."); + } + this.latLng = setterArg; + } + + private @NonNull Double zoom; + + public @NonNull Double getZoom() { + return zoom; + } + + public void setZoom(@NonNull Double setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"zoom\" is null."); + } + this.zoom = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateNewLatLngZoom() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateNewLatLngZoom that = (PlatformCameraUpdateNewLatLngZoom) o; + return latLng.equals(that.latLng) && zoom.equals(that.zoom); + } + + @Override + public int hashCode() { + return Objects.hash(latLng, zoom); + } + + public static final class Builder { + + private @Nullable PlatformLatLng latLng; + + @CanIgnoreReturnValue + public @NonNull Builder setLatLng(@NonNull PlatformLatLng setterArg) { + this.latLng = setterArg; + return this; + } + + private @Nullable Double zoom; + + @CanIgnoreReturnValue + public @NonNull Builder setZoom(@NonNull Double setterArg) { + this.zoom = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateNewLatLngZoom build() { + PlatformCameraUpdateNewLatLngZoom pigeonReturn = new PlatformCameraUpdateNewLatLngZoom(); + pigeonReturn.setLatLng(latLng); + pigeonReturn.setZoom(zoom); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(2); + toListResult.add(latLng); + toListResult.add(zoom); + return toListResult; + } + + static @NonNull PlatformCameraUpdateNewLatLngZoom fromList( + @NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateNewLatLngZoom pigeonResult = new PlatformCameraUpdateNewLatLngZoom(); + Object latLng = pigeonVar_list.get(0); + pigeonResult.setLatLng((PlatformLatLng) latLng); + Object zoom = pigeonVar_list.get(1); + pigeonResult.setZoom((Double) zoom); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of ScrollBy + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateScrollBy { + private @NonNull Double dx; + + public @NonNull Double getDx() { + return dx; + } + + public void setDx(@NonNull Double setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"dx\" is null."); + } + this.dx = setterArg; + } + + private @NonNull Double dy; + + public @NonNull Double getDy() { + return dy; + } + + public void setDy(@NonNull Double setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"dy\" is null."); + } + this.dy = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateScrollBy() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateScrollBy that = (PlatformCameraUpdateScrollBy) o; + return dx.equals(that.dx) && dy.equals(that.dy); + } + + @Override + public int hashCode() { + return Objects.hash(dx, dy); + } + + public static final class Builder { + + private @Nullable Double dx; + + @CanIgnoreReturnValue + public @NonNull Builder setDx(@NonNull Double setterArg) { + this.dx = setterArg; + return this; + } + + private @Nullable Double dy; + + @CanIgnoreReturnValue + public @NonNull Builder setDy(@NonNull Double setterArg) { + this.dy = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateScrollBy build() { + PlatformCameraUpdateScrollBy pigeonReturn = new PlatformCameraUpdateScrollBy(); + pigeonReturn.setDx(dx); + pigeonReturn.setDy(dy); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(2); + toListResult.add(dx); + toListResult.add(dy); + return toListResult; + } + + static @NonNull PlatformCameraUpdateScrollBy fromList( + @NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateScrollBy pigeonResult = new PlatformCameraUpdateScrollBy(); + Object dx = pigeonVar_list.get(0); + pigeonResult.setDx((Double) dx); + Object dy = pigeonVar_list.get(1); + pigeonResult.setDy((Double) dy); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of ZoomBy + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateZoomBy { + private @NonNull Double amount; + + public @NonNull Double getAmount() { + return amount; } - public void setJson(@NonNull Object setterArg) { + public void setAmount(@NonNull Double setterArg) { if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"json\" is null."); + throw new IllegalStateException("Nonnull field \"amount\" is null."); } - this.json = setterArg; + this.amount = setterArg; + } + + private @Nullable PlatformOffset focus; + + public @Nullable PlatformOffset getFocus() { + return focus; + } + + public void setFocus(@Nullable PlatformOffset setterArg) { + this.focus = setterArg; } /** Constructor is non-public to enforce null safety; use Builder. */ - PlatformCameraUpdate() {} + PlatformCameraUpdateZoomBy() {} @Override public boolean equals(Object o) { @@ -296,43 +817,197 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - PlatformCameraUpdate that = (PlatformCameraUpdate) o; - return json.equals(that.json); + PlatformCameraUpdateZoomBy that = (PlatformCameraUpdateZoomBy) o; + return amount.equals(that.amount) && Objects.equals(focus, that.focus); } @Override public int hashCode() { - return Objects.hash(json); + return Objects.hash(amount, focus); } public static final class Builder { - private @Nullable Object json; + private @Nullable Double amount; @CanIgnoreReturnValue - public @NonNull Builder setJson(@NonNull Object setterArg) { - this.json = setterArg; + public @NonNull Builder setAmount(@NonNull Double setterArg) { + this.amount = setterArg; return this; } - public @NonNull PlatformCameraUpdate build() { - PlatformCameraUpdate pigeonReturn = new PlatformCameraUpdate(); - pigeonReturn.setJson(json); + private @Nullable PlatformOffset focus; + + @CanIgnoreReturnValue + public @NonNull Builder setFocus(@Nullable PlatformOffset setterArg) { + this.focus = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateZoomBy build() { + PlatformCameraUpdateZoomBy pigeonReturn = new PlatformCameraUpdateZoomBy(); + pigeonReturn.setAmount(amount); + pigeonReturn.setFocus(focus); return pigeonReturn; } } @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(1); - toListResult.add(json); + ArrayList toListResult = new ArrayList<>(2); + toListResult.add(amount); + toListResult.add(focus); return toListResult; } - static @NonNull PlatformCameraUpdate fromList(@NonNull ArrayList __pigeon_list) { - PlatformCameraUpdate pigeonResult = new PlatformCameraUpdate(); - Object json = __pigeon_list.get(0); - pigeonResult.setJson(json); + static @NonNull PlatformCameraUpdateZoomBy fromList(@NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateZoomBy pigeonResult = new PlatformCameraUpdateZoomBy(); + Object amount = pigeonVar_list.get(0); + pigeonResult.setAmount((Double) amount); + Object focus = pigeonVar_list.get(1); + pigeonResult.setFocus((PlatformOffset) focus); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of ZoomIn/ZoomOut + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateZoom { + private @NonNull Boolean out; + + public @NonNull Boolean getOut() { + return out; + } + + public void setOut(@NonNull Boolean setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"out\" is null."); + } + this.out = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateZoom() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateZoom that = (PlatformCameraUpdateZoom) o; + return out.equals(that.out); + } + + @Override + public int hashCode() { + return Objects.hash(out); + } + + public static final class Builder { + + private @Nullable Boolean out; + + @CanIgnoreReturnValue + public @NonNull Builder setOut(@NonNull Boolean setterArg) { + this.out = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateZoom build() { + PlatformCameraUpdateZoom pigeonReturn = new PlatformCameraUpdateZoom(); + pigeonReturn.setOut(out); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(out); + return toListResult; + } + + static @NonNull PlatformCameraUpdateZoom fromList(@NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateZoom pigeonResult = new PlatformCameraUpdateZoom(); + Object out = pigeonVar_list.get(0); + pigeonResult.setOut((Boolean) out); + return pigeonResult; + } + } + + /** + * Pigeon equivalent of ZoomTo + * + *

Generated class from Pigeon that represents data sent in messages. + */ + public static final class PlatformCameraUpdateZoomTo { + private @NonNull Double zoom; + + public @NonNull Double getZoom() { + return zoom; + } + + public void setZoom(@NonNull Double setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"zoom\" is null."); + } + this.zoom = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + PlatformCameraUpdateZoomTo() {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlatformCameraUpdateZoomTo that = (PlatformCameraUpdateZoomTo) o; + return zoom.equals(that.zoom); + } + + @Override + public int hashCode() { + return Objects.hash(zoom); + } + + public static final class Builder { + + private @Nullable Double zoom; + + @CanIgnoreReturnValue + public @NonNull Builder setZoom(@NonNull Double setterArg) { + this.zoom = setterArg; + return this; + } + + public @NonNull PlatformCameraUpdateZoomTo build() { + PlatformCameraUpdateZoomTo pigeonReturn = new PlatformCameraUpdateZoomTo(); + pigeonReturn.setZoom(zoom); + return pigeonReturn; + } + } + + @NonNull + ArrayList toList() { + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(zoom); + return toListResult; + } + + static @NonNull PlatformCameraUpdateZoomTo fromList(@NonNull ArrayList pigeonVar_list) { + PlatformCameraUpdateZoomTo pigeonResult = new PlatformCameraUpdateZoomTo(); + Object zoom = pigeonVar_list.get(0); + pigeonResult.setZoom((Double) zoom); return pigeonResult; } } @@ -588,7 +1263,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(9); + ArrayList toListResult = new ArrayList<>(9); toListResult.add(consumeTapEvents); toListResult.add(fillColor); toListResult.add(strokeColor); @@ -601,34 +1276,25 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformCircle fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformCircle fromList(@NonNull ArrayList pigeonVar_list) { PlatformCircle pigeonResult = new PlatformCircle(); - Object consumeTapEvents = __pigeon_list.get(0); + Object consumeTapEvents = pigeonVar_list.get(0); pigeonResult.setConsumeTapEvents((Boolean) consumeTapEvents); - Object fillColor = __pigeon_list.get(1); - pigeonResult.setFillColor( - (fillColor == null) - ? null - : ((fillColor instanceof Integer) ? (Integer) fillColor : (Long) fillColor)); - Object strokeColor = __pigeon_list.get(2); - pigeonResult.setStrokeColor( - (strokeColor == null) - ? null - : ((strokeColor instanceof Integer) ? (Integer) strokeColor : (Long) strokeColor)); - Object visible = __pigeon_list.get(3); + Object fillColor = pigeonVar_list.get(1); + pigeonResult.setFillColor((Long) fillColor); + Object strokeColor = pigeonVar_list.get(2); + pigeonResult.setStrokeColor((Long) strokeColor); + Object visible = pigeonVar_list.get(3); pigeonResult.setVisible((Boolean) visible); - Object strokeWidth = __pigeon_list.get(4); - pigeonResult.setStrokeWidth( - (strokeWidth == null) - ? null - : ((strokeWidth instanceof Integer) ? (Integer) strokeWidth : (Long) strokeWidth)); - Object zIndex = __pigeon_list.get(5); + Object strokeWidth = pigeonVar_list.get(4); + pigeonResult.setStrokeWidth((Long) strokeWidth); + Object zIndex = pigeonVar_list.get(5); pigeonResult.setZIndex((Double) zIndex); - Object center = __pigeon_list.get(6); + Object center = pigeonVar_list.get(6); pigeonResult.setCenter((PlatformLatLng) center); - Object radius = __pigeon_list.get(7); + Object radius = pigeonVar_list.get(7); pigeonResult.setRadius((Double) radius); - Object circleId = __pigeon_list.get(8); + Object circleId = pigeonVar_list.get(8); pigeonResult.setCircleId((String) circleId); return pigeonResult; } @@ -696,14 +1362,14 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(1); + ArrayList toListResult = new ArrayList<>(1); toListResult.add(json); return toListResult; } - static @NonNull PlatformHeatmap fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformHeatmap fromList(@NonNull ArrayList pigeonVar_list) { PlatformHeatmap pigeonResult = new PlatformHeatmap(); - Object json = __pigeon_list.get(0); + Object json = pigeonVar_list.get(0); pigeonResult.setJson((Map) json); return pigeonResult; } @@ -767,14 +1433,14 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(1); + ArrayList toListResult = new ArrayList<>(1); toListResult.add(identifier); return toListResult; } - static @NonNull PlatformClusterManager fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformClusterManager fromList(@NonNull ArrayList pigeonVar_list) { PlatformClusterManager pigeonResult = new PlatformClusterManager(); - Object identifier = __pigeon_list.get(0); + Object identifier = pigeonVar_list.get(0); pigeonResult.setIdentifier((String) identifier); return pigeonResult; } @@ -860,17 +1526,17 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(2); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(dx); toListResult.add(dy); return toListResult; } - static @NonNull PlatformOffset fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformOffset fromList(@NonNull ArrayList pigeonVar_list) { PlatformOffset pigeonResult = new PlatformOffset(); - Object dx = __pigeon_list.get(0); + Object dx = pigeonVar_list.get(0); pigeonResult.setDx((Double) dx); - Object dy = __pigeon_list.get(1); + Object dy = pigeonVar_list.get(1); pigeonResult.setDy((Double) dy); return pigeonResult; } @@ -974,20 +1640,20 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(3); + ArrayList toListResult = new ArrayList<>(3); toListResult.add(title); toListResult.add(snippet); toListResult.add(anchor); return toListResult; } - static @NonNull PlatformInfoWindow fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformInfoWindow fromList(@NonNull ArrayList pigeonVar_list) { PlatformInfoWindow pigeonResult = new PlatformInfoWindow(); - Object title = __pigeon_list.get(0); + Object title = pigeonVar_list.get(0); pigeonResult.setTitle((String) title); - Object snippet = __pigeon_list.get(1); + Object snippet = pigeonVar_list.get(1); pigeonResult.setSnippet((String) snippet); - Object anchor = __pigeon_list.get(2); + Object anchor = pigeonVar_list.get(2); pigeonResult.setAnchor((PlatformOffset) anchor); return pigeonResult; } @@ -1338,7 +2004,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(13); + ArrayList toListResult = new ArrayList<>(13); toListResult.add(alpha); toListResult.add(anchor); toListResult.add(consumeTapEvents); @@ -1355,33 +2021,33 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformMarker fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformMarker fromList(@NonNull ArrayList pigeonVar_list) { PlatformMarker pigeonResult = new PlatformMarker(); - Object alpha = __pigeon_list.get(0); + Object alpha = pigeonVar_list.get(0); pigeonResult.setAlpha((Double) alpha); - Object anchor = __pigeon_list.get(1); + Object anchor = pigeonVar_list.get(1); pigeonResult.setAnchor((PlatformOffset) anchor); - Object consumeTapEvents = __pigeon_list.get(2); + Object consumeTapEvents = pigeonVar_list.get(2); pigeonResult.setConsumeTapEvents((Boolean) consumeTapEvents); - Object draggable = __pigeon_list.get(3); + Object draggable = pigeonVar_list.get(3); pigeonResult.setDraggable((Boolean) draggable); - Object flat = __pigeon_list.get(4); + Object flat = pigeonVar_list.get(4); pigeonResult.setFlat((Boolean) flat); - Object icon = __pigeon_list.get(5); + Object icon = pigeonVar_list.get(5); pigeonResult.setIcon(icon); - Object infoWindow = __pigeon_list.get(6); + Object infoWindow = pigeonVar_list.get(6); pigeonResult.setInfoWindow((PlatformInfoWindow) infoWindow); - Object position = __pigeon_list.get(7); + Object position = pigeonVar_list.get(7); pigeonResult.setPosition((PlatformLatLng) position); - Object rotation = __pigeon_list.get(8); + Object rotation = pigeonVar_list.get(8); pigeonResult.setRotation((Double) rotation); - Object visible = __pigeon_list.get(9); + Object visible = pigeonVar_list.get(9); pigeonResult.setVisible((Boolean) visible); - Object zIndex = __pigeon_list.get(10); + Object zIndex = pigeonVar_list.get(10); pigeonResult.setZIndex((Double) zIndex); - Object markerId = __pigeon_list.get(11); + Object markerId = pigeonVar_list.get(11); pigeonResult.setMarkerId((String) markerId); - Object clusterManagerId = __pigeon_list.get(12); + Object clusterManagerId = pigeonVar_list.get(12); pigeonResult.setClusterManagerId((String) clusterManagerId); return pigeonResult; } @@ -1662,7 +2328,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(10); + ArrayList toListResult = new ArrayList<>(10); toListResult.add(polygonId); toListResult.add(consumesTapEvents); toListResult.add(fillColor); @@ -1676,40 +2342,28 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformPolygon fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformPolygon fromList(@NonNull ArrayList pigeonVar_list) { PlatformPolygon pigeonResult = new PlatformPolygon(); - Object polygonId = __pigeon_list.get(0); + Object polygonId = pigeonVar_list.get(0); pigeonResult.setPolygonId((String) polygonId); - Object consumesTapEvents = __pigeon_list.get(1); + Object consumesTapEvents = pigeonVar_list.get(1); pigeonResult.setConsumesTapEvents((Boolean) consumesTapEvents); - Object fillColor = __pigeon_list.get(2); - pigeonResult.setFillColor( - (fillColor == null) - ? null - : ((fillColor instanceof Integer) ? (Integer) fillColor : (Long) fillColor)); - Object geodesic = __pigeon_list.get(3); + Object fillColor = pigeonVar_list.get(2); + pigeonResult.setFillColor((Long) fillColor); + Object geodesic = pigeonVar_list.get(3); pigeonResult.setGeodesic((Boolean) geodesic); - Object points = __pigeon_list.get(4); + Object points = pigeonVar_list.get(4); pigeonResult.setPoints((List) points); - Object holes = __pigeon_list.get(5); + Object holes = pigeonVar_list.get(5); pigeonResult.setHoles((List>) holes); - Object visible = __pigeon_list.get(6); + Object visible = pigeonVar_list.get(6); pigeonResult.setVisible((Boolean) visible); - Object strokeColor = __pigeon_list.get(7); - pigeonResult.setStrokeColor( - (strokeColor == null) - ? null - : ((strokeColor instanceof Integer) ? (Integer) strokeColor : (Long) strokeColor)); - Object strokeWidth = __pigeon_list.get(8); - pigeonResult.setStrokeWidth( - (strokeWidth == null) - ? null - : ((strokeWidth instanceof Integer) ? (Integer) strokeWidth : (Long) strokeWidth)); - Object zIndex = __pigeon_list.get(9); - pigeonResult.setZIndex( - (zIndex == null) - ? null - : ((zIndex instanceof Integer) ? (Integer) zIndex : (Long) zIndex)); + Object strokeColor = pigeonVar_list.get(7); + pigeonResult.setStrokeColor((Long) strokeColor); + Object strokeWidth = pigeonVar_list.get(8); + pigeonResult.setStrokeWidth((Long) strokeWidth); + Object zIndex = pigeonVar_list.get(9); + pigeonResult.setZIndex((Long) zIndex); return pigeonResult; } } @@ -1772,11 +2426,7 @@ public void setGeodesic(@NonNull Boolean setterArg) { this.geodesic = setterArg; } - /** - * The joint type as an integer. This must be a value corresponding to one of the values defined - * in the platform interface package's JointType enum. The integer values specified in this enum - * must match those used by the native SDK. - */ + /** The joint type. */ private @NonNull PlatformJointType jointType; public @NonNull PlatformJointType getJointType() { @@ -2051,7 +2701,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(12); + ArrayList toListResult = new ArrayList<>(12); toListResult.add(polylineId); toListResult.add(consumesTapEvents); toListResult.add(color); @@ -2067,37 +2717,32 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformPolyline fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformPolyline fromList(@NonNull ArrayList pigeonVar_list) { PlatformPolyline pigeonResult = new PlatformPolyline(); - Object polylineId = __pigeon_list.get(0); + Object polylineId = pigeonVar_list.get(0); pigeonResult.setPolylineId((String) polylineId); - Object consumesTapEvents = __pigeon_list.get(1); + Object consumesTapEvents = pigeonVar_list.get(1); pigeonResult.setConsumesTapEvents((Boolean) consumesTapEvents); - Object color = __pigeon_list.get(2); - pigeonResult.setColor( - (color == null) ? null : ((color instanceof Integer) ? (Integer) color : (Long) color)); - Object geodesic = __pigeon_list.get(3); + Object color = pigeonVar_list.get(2); + pigeonResult.setColor((Long) color); + Object geodesic = pigeonVar_list.get(3); pigeonResult.setGeodesic((Boolean) geodesic); - Object jointType = __pigeon_list.get(4); + Object jointType = pigeonVar_list.get(4); pigeonResult.setJointType((PlatformJointType) jointType); - Object patterns = __pigeon_list.get(5); + Object patterns = pigeonVar_list.get(5); pigeonResult.setPatterns((List) patterns); - Object points = __pigeon_list.get(6); + Object points = pigeonVar_list.get(6); pigeonResult.setPoints((List) points); - Object startCap = __pigeon_list.get(7); + Object startCap = pigeonVar_list.get(7); pigeonResult.setStartCap(startCap); - Object endCap = __pigeon_list.get(8); + Object endCap = pigeonVar_list.get(8); pigeonResult.setEndCap(endCap); - Object visible = __pigeon_list.get(9); + Object visible = pigeonVar_list.get(9); pigeonResult.setVisible((Boolean) visible); - Object width = __pigeon_list.get(10); - pigeonResult.setWidth( - (width == null) ? null : ((width instanceof Integer) ? (Integer) width : (Long) width)); - Object zIndex = __pigeon_list.get(11); - pigeonResult.setZIndex( - (zIndex == null) - ? null - : ((zIndex instanceof Integer) ? (Integer) zIndex : (Long) zIndex)); + Object width = pigeonVar_list.get(10); + pigeonResult.setWidth((Long) width); + Object zIndex = pigeonVar_list.get(11); + pigeonResult.setZIndex((Long) zIndex); return pigeonResult; } } @@ -2163,9 +2808,9 @@ public boolean equals(Object o) { @Override public int hashCode() { - int __pigeon_result = Objects.hash(width, height); - __pigeon_result = 31 * __pigeon_result + Arrays.hashCode(data); - return __pigeon_result; + int pigeonVar_result = Objects.hash(width, height); + pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(data); + return pigeonVar_result; } public static final class Builder { @@ -2205,24 +2850,20 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(3); + ArrayList toListResult = new ArrayList<>(3); toListResult.add(width); toListResult.add(height); toListResult.add(data); return toListResult; } - static @NonNull PlatformTile fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformTile fromList(@NonNull ArrayList pigeonVar_list) { PlatformTile pigeonResult = new PlatformTile(); - Object width = __pigeon_list.get(0); - pigeonResult.setWidth( - (width == null) ? null : ((width instanceof Integer) ? (Integer) width : (Long) width)); - Object height = __pigeon_list.get(1); - pigeonResult.setHeight( - (height == null) - ? null - : ((height instanceof Integer) ? (Integer) height : (Long) height)); - Object data = __pigeon_list.get(2); + Object width = pigeonVar_list.get(0); + pigeonResult.setWidth((Long) width); + Object height = pigeonVar_list.get(1); + pigeonResult.setHeight((Long) height); + Object data = pigeonVar_list.get(2); pigeonResult.setData((byte[]) data); return pigeonResult; } @@ -2401,7 +3042,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(6); + ArrayList toListResult = new ArrayList<>(6); toListResult.add(tileOverlayId); toListResult.add(fadeIn); toListResult.add(transparency); @@ -2411,26 +3052,20 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformTileOverlay fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformTileOverlay fromList(@NonNull ArrayList pigeonVar_list) { PlatformTileOverlay pigeonResult = new PlatformTileOverlay(); - Object tileOverlayId = __pigeon_list.get(0); + Object tileOverlayId = pigeonVar_list.get(0); pigeonResult.setTileOverlayId((String) tileOverlayId); - Object fadeIn = __pigeon_list.get(1); + Object fadeIn = pigeonVar_list.get(1); pigeonResult.setFadeIn((Boolean) fadeIn); - Object transparency = __pigeon_list.get(2); + Object transparency = pigeonVar_list.get(2); pigeonResult.setTransparency((Double) transparency); - Object zIndex = __pigeon_list.get(3); - pigeonResult.setZIndex( - (zIndex == null) - ? null - : ((zIndex instanceof Integer) ? (Integer) zIndex : (Long) zIndex)); - Object visible = __pigeon_list.get(4); + Object zIndex = pigeonVar_list.get(3); + pigeonResult.setZIndex((Long) zIndex); + Object visible = pigeonVar_list.get(4); pigeonResult.setVisible((Boolean) visible); - Object tileSize = __pigeon_list.get(5); - pigeonResult.setTileSize( - (tileSize == null) - ? null - : ((tileSize instanceof Integer) ? (Integer) tileSize : (Long) tileSize)); + Object tileSize = pigeonVar_list.get(5); + pigeonResult.setTileSize((Long) tileSize); return pigeonResult; } } @@ -2562,7 +3197,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(4); + ArrayList toListResult = new ArrayList<>(4); toListResult.add(top); toListResult.add(bottom); toListResult.add(left); @@ -2570,15 +3205,15 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformEdgeInsets fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformEdgeInsets fromList(@NonNull ArrayList pigeonVar_list) { PlatformEdgeInsets pigeonResult = new PlatformEdgeInsets(); - Object top = __pigeon_list.get(0); + Object top = pigeonVar_list.get(0); pigeonResult.setTop((Double) top); - Object bottom = __pigeon_list.get(1); + Object bottom = pigeonVar_list.get(1); pigeonResult.setBottom((Double) bottom); - Object left = __pigeon_list.get(2); + Object left = pigeonVar_list.get(2); pigeonResult.setLeft((Double) left); - Object right = __pigeon_list.get(3); + Object right = pigeonVar_list.get(3); pigeonResult.setRight((Double) right); return pigeonResult; } @@ -2664,17 +3299,17 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(2); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(latitude); toListResult.add(longitude); return toListResult; } - static @NonNull PlatformLatLng fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformLatLng fromList(@NonNull ArrayList pigeonVar_list) { PlatformLatLng pigeonResult = new PlatformLatLng(); - Object latitude = __pigeon_list.get(0); + Object latitude = pigeonVar_list.get(0); pigeonResult.setLatitude((Double) latitude); - Object longitude = __pigeon_list.get(1); + Object longitude = pigeonVar_list.get(1); pigeonResult.setLongitude((Double) longitude); return pigeonResult; } @@ -2760,17 +3395,17 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(2); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(northeast); toListResult.add(southwest); return toListResult; } - static @NonNull PlatformLatLngBounds fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformLatLngBounds fromList(@NonNull ArrayList pigeonVar_list) { PlatformLatLngBounds pigeonResult = new PlatformLatLngBounds(); - Object northeast = __pigeon_list.get(0); + Object northeast = pigeonVar_list.get(0); pigeonResult.setNortheast((PlatformLatLng) northeast); - Object southwest = __pigeon_list.get(1); + Object southwest = pigeonVar_list.get(1); pigeonResult.setSouthwest((PlatformLatLng) southwest); return pigeonResult; } @@ -2903,7 +3538,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(4); + ArrayList toListResult = new ArrayList<>(4); toListResult.add(clusterManagerId); toListResult.add(position); toListResult.add(bounds); @@ -2911,15 +3546,15 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformCluster fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformCluster fromList(@NonNull ArrayList pigeonVar_list) { PlatformCluster pigeonResult = new PlatformCluster(); - Object clusterManagerId = __pigeon_list.get(0); + Object clusterManagerId = pigeonVar_list.get(0); pigeonResult.setClusterManagerId((String) clusterManagerId); - Object position = __pigeon_list.get(1); + Object position = pigeonVar_list.get(1); pigeonResult.setPosition((PlatformLatLng) position); - Object bounds = __pigeon_list.get(2); + Object bounds = pigeonVar_list.get(2); pigeonResult.setBounds((PlatformLatLngBounds) bounds); - Object markerIds = __pigeon_list.get(3); + Object markerIds = pigeonVar_list.get(3); pigeonResult.setMarkerIds((List) markerIds); return pigeonResult; } @@ -2980,14 +3615,14 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(1); + ArrayList toListResult = new ArrayList<>(1); toListResult.add(bounds); return toListResult; } - static @NonNull PlatformCameraTargetBounds fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformCameraTargetBounds fromList(@NonNull ArrayList pigeonVar_list) { PlatformCameraTargetBounds pigeonResult = new PlatformCameraTargetBounds(); - Object bounds = __pigeon_list.get(0); + Object bounds = pigeonVar_list.get(0); pigeonResult.setBounds((PlatformLatLngBounds) bounds); return pigeonResult; } @@ -3245,7 +3880,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(9); + ArrayList toListResult = new ArrayList<>(9); toListResult.add(initialCameraPosition); toListResult.add(mapConfiguration); toListResult.add(initialCircles); @@ -3259,25 +3894,25 @@ ArrayList toList() { } static @NonNull PlatformMapViewCreationParams fromList( - @NonNull ArrayList __pigeon_list) { + @NonNull ArrayList pigeonVar_list) { PlatformMapViewCreationParams pigeonResult = new PlatformMapViewCreationParams(); - Object initialCameraPosition = __pigeon_list.get(0); + Object initialCameraPosition = pigeonVar_list.get(0); pigeonResult.setInitialCameraPosition((PlatformCameraPosition) initialCameraPosition); - Object mapConfiguration = __pigeon_list.get(1); + Object mapConfiguration = pigeonVar_list.get(1); pigeonResult.setMapConfiguration((PlatformMapConfiguration) mapConfiguration); - Object initialCircles = __pigeon_list.get(2); + Object initialCircles = pigeonVar_list.get(2); pigeonResult.setInitialCircles((List) initialCircles); - Object initialMarkers = __pigeon_list.get(3); + Object initialMarkers = pigeonVar_list.get(3); pigeonResult.setInitialMarkers((List) initialMarkers); - Object initialPolygons = __pigeon_list.get(4); + Object initialPolygons = pigeonVar_list.get(4); pigeonResult.setInitialPolygons((List) initialPolygons); - Object initialPolylines = __pigeon_list.get(5); + Object initialPolylines = pigeonVar_list.get(5); pigeonResult.setInitialPolylines((List) initialPolylines); - Object initialHeatmaps = __pigeon_list.get(6); + Object initialHeatmaps = pigeonVar_list.get(6); pigeonResult.setInitialHeatmaps((List) initialHeatmaps); - Object initialTileOverlays = __pigeon_list.get(7); + Object initialTileOverlays = pigeonVar_list.get(7); pigeonResult.setInitialTileOverlays((List) initialTileOverlays); - Object initialClusterManagers = __pigeon_list.get(8); + Object initialClusterManagers = pigeonVar_list.get(8); pigeonResult.setInitialClusterManagers((List) initialClusterManagers); return pigeonResult; } @@ -3736,7 +4371,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(20); + ArrayList toListResult = new ArrayList<>(20); toListResult.add(compassEnabled); toListResult.add(cameraTargetBounds); toListResult.add(mapType); @@ -3760,47 +4395,47 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformMapConfiguration fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformMapConfiguration fromList(@NonNull ArrayList pigeonVar_list) { PlatformMapConfiguration pigeonResult = new PlatformMapConfiguration(); - Object compassEnabled = __pigeon_list.get(0); + Object compassEnabled = pigeonVar_list.get(0); pigeonResult.setCompassEnabled((Boolean) compassEnabled); - Object cameraTargetBounds = __pigeon_list.get(1); + Object cameraTargetBounds = pigeonVar_list.get(1); pigeonResult.setCameraTargetBounds((PlatformCameraTargetBounds) cameraTargetBounds); - Object mapType = __pigeon_list.get(2); + Object mapType = pigeonVar_list.get(2); pigeonResult.setMapType((PlatformMapType) mapType); - Object minMaxZoomPreference = __pigeon_list.get(3); + Object minMaxZoomPreference = pigeonVar_list.get(3); pigeonResult.setMinMaxZoomPreference((PlatformZoomRange) minMaxZoomPreference); - Object mapToolbarEnabled = __pigeon_list.get(4); + Object mapToolbarEnabled = pigeonVar_list.get(4); pigeonResult.setMapToolbarEnabled((Boolean) mapToolbarEnabled); - Object rotateGesturesEnabled = __pigeon_list.get(5); + Object rotateGesturesEnabled = pigeonVar_list.get(5); pigeonResult.setRotateGesturesEnabled((Boolean) rotateGesturesEnabled); - Object scrollGesturesEnabled = __pigeon_list.get(6); + Object scrollGesturesEnabled = pigeonVar_list.get(6); pigeonResult.setScrollGesturesEnabled((Boolean) scrollGesturesEnabled); - Object tiltGesturesEnabled = __pigeon_list.get(7); + Object tiltGesturesEnabled = pigeonVar_list.get(7); pigeonResult.setTiltGesturesEnabled((Boolean) tiltGesturesEnabled); - Object trackCameraPosition = __pigeon_list.get(8); + Object trackCameraPosition = pigeonVar_list.get(8); pigeonResult.setTrackCameraPosition((Boolean) trackCameraPosition); - Object zoomControlsEnabled = __pigeon_list.get(9); + Object zoomControlsEnabled = pigeonVar_list.get(9); pigeonResult.setZoomControlsEnabled((Boolean) zoomControlsEnabled); - Object zoomGesturesEnabled = __pigeon_list.get(10); + Object zoomGesturesEnabled = pigeonVar_list.get(10); pigeonResult.setZoomGesturesEnabled((Boolean) zoomGesturesEnabled); - Object myLocationEnabled = __pigeon_list.get(11); + Object myLocationEnabled = pigeonVar_list.get(11); pigeonResult.setMyLocationEnabled((Boolean) myLocationEnabled); - Object myLocationButtonEnabled = __pigeon_list.get(12); + Object myLocationButtonEnabled = pigeonVar_list.get(12); pigeonResult.setMyLocationButtonEnabled((Boolean) myLocationButtonEnabled); - Object padding = __pigeon_list.get(13); + Object padding = pigeonVar_list.get(13); pigeonResult.setPadding((PlatformEdgeInsets) padding); - Object indoorViewEnabled = __pigeon_list.get(14); + Object indoorViewEnabled = pigeonVar_list.get(14); pigeonResult.setIndoorViewEnabled((Boolean) indoorViewEnabled); - Object trafficEnabled = __pigeon_list.get(15); + Object trafficEnabled = pigeonVar_list.get(15); pigeonResult.setTrafficEnabled((Boolean) trafficEnabled); - Object buildingsEnabled = __pigeon_list.get(16); + Object buildingsEnabled = pigeonVar_list.get(16); pigeonResult.setBuildingsEnabled((Boolean) buildingsEnabled); - Object liteModeEnabled = __pigeon_list.get(17); + Object liteModeEnabled = pigeonVar_list.get(17); pigeonResult.setLiteModeEnabled((Boolean) liteModeEnabled); - Object cloudMapId = __pigeon_list.get(18); + Object cloudMapId = pigeonVar_list.get(18); pigeonResult.setCloudMapId((String) cloudMapId); - Object style = __pigeon_list.get(19); + Object style = pigeonVar_list.get(19); pigeonResult.setStyle((String) style); return pigeonResult; } @@ -3886,18 +4521,18 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(2); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(x); toListResult.add(y); return toListResult; } - static @NonNull PlatformPoint fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformPoint fromList(@NonNull ArrayList pigeonVar_list) { PlatformPoint pigeonResult = new PlatformPoint(); - Object x = __pigeon_list.get(0); - pigeonResult.setX((x == null) ? null : ((x instanceof Integer) ? (Integer) x : (Long) x)); - Object y = __pigeon_list.get(1); - pigeonResult.setY((y == null) ? null : ((y instanceof Integer) ? (Integer) y : (Long) y)); + Object x = pigeonVar_list.get(0); + pigeonResult.setX((Long) x); + Object y = pigeonVar_list.get(1); + pigeonResult.setY((Long) y); return pigeonResult; } } @@ -4029,7 +4664,7 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(4); + ArrayList toListResult = new ArrayList<>(4); toListResult.add(visible); toListResult.add(fadeIn); toListResult.add(transparency); @@ -4037,15 +4672,15 @@ ArrayList toList() { return toListResult; } - static @NonNull PlatformTileLayer fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformTileLayer fromList(@NonNull ArrayList pigeonVar_list) { PlatformTileLayer pigeonResult = new PlatformTileLayer(); - Object visible = __pigeon_list.get(0); + Object visible = pigeonVar_list.get(0); pigeonResult.setVisible((Boolean) visible); - Object fadeIn = __pigeon_list.get(1); + Object fadeIn = pigeonVar_list.get(1); pigeonResult.setFadeIn((Boolean) fadeIn); - Object transparency = __pigeon_list.get(2); + Object transparency = pigeonVar_list.get(2); pigeonResult.setTransparency((Double) transparency); - Object zIndex = __pigeon_list.get(3); + Object zIndex = pigeonVar_list.get(3); pigeonResult.setZIndex((Double) zIndex); return pigeonResult; } @@ -4122,17 +4757,17 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(2); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(min); toListResult.add(max); return toListResult; } - static @NonNull PlatformZoomRange fromList(@NonNull ArrayList __pigeon_list) { + static @NonNull PlatformZoomRange fromList(@NonNull ArrayList pigeonVar_list) { PlatformZoomRange pigeonResult = new PlatformZoomRange(); - Object min = __pigeon_list.get(0); + Object min = pigeonVar_list.get(0); pigeonResult.setMin((Double) min); - Object max = __pigeon_list.get(1); + Object max = pigeonVar_list.get(1); pigeonResult.setMax((Double) max); return pigeonResult; } @@ -4147,64 +4782,82 @@ private PigeonCodec() {} protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { switch (type) { case (byte) 129: - return PlatformCameraPosition.fromList((ArrayList) readValue(buffer)); + { + Object value = readValue(buffer); + return value == null ? null : PlatformMapType.values()[((Long) value).intValue()]; + } case (byte) 130: - return PlatformCameraUpdate.fromList((ArrayList) readValue(buffer)); + { + Object value = readValue(buffer); + return value == null ? null : PlatformRendererType.values()[((Long) value).intValue()]; + } case (byte) 131: - return PlatformCircle.fromList((ArrayList) readValue(buffer)); + { + Object value = readValue(buffer); + return value == null ? null : PlatformJointType.values()[((Long) value).intValue()]; + } case (byte) 132: - return PlatformHeatmap.fromList((ArrayList) readValue(buffer)); + return PlatformCameraPosition.fromList((ArrayList) readValue(buffer)); case (byte) 133: - return PlatformClusterManager.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdate.fromList((ArrayList) readValue(buffer)); case (byte) 134: - return PlatformOffset.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateNewCameraPosition.fromList( + (ArrayList) readValue(buffer)); case (byte) 135: - return PlatformInfoWindow.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateNewLatLng.fromList((ArrayList) readValue(buffer)); case (byte) 136: - return PlatformMarker.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateNewLatLngBounds.fromList( + (ArrayList) readValue(buffer)); case (byte) 137: - return PlatformPolygon.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateNewLatLngZoom.fromList((ArrayList) readValue(buffer)); case (byte) 138: - return PlatformPolyline.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateScrollBy.fromList((ArrayList) readValue(buffer)); case (byte) 139: - return PlatformTile.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateZoomBy.fromList((ArrayList) readValue(buffer)); case (byte) 140: - return PlatformTileOverlay.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateZoom.fromList((ArrayList) readValue(buffer)); case (byte) 141: - return PlatformEdgeInsets.fromList((ArrayList) readValue(buffer)); + return PlatformCameraUpdateZoomTo.fromList((ArrayList) readValue(buffer)); case (byte) 142: - return PlatformLatLng.fromList((ArrayList) readValue(buffer)); + return PlatformCircle.fromList((ArrayList) readValue(buffer)); case (byte) 143: - return PlatformLatLngBounds.fromList((ArrayList) readValue(buffer)); + return PlatformHeatmap.fromList((ArrayList) readValue(buffer)); case (byte) 144: - return PlatformCluster.fromList((ArrayList) readValue(buffer)); + return PlatformClusterManager.fromList((ArrayList) readValue(buffer)); case (byte) 145: - return PlatformCameraTargetBounds.fromList((ArrayList) readValue(buffer)); + return PlatformOffset.fromList((ArrayList) readValue(buffer)); case (byte) 146: - return PlatformMapViewCreationParams.fromList((ArrayList) readValue(buffer)); + return PlatformInfoWindow.fromList((ArrayList) readValue(buffer)); case (byte) 147: - return PlatformMapConfiguration.fromList((ArrayList) readValue(buffer)); + return PlatformMarker.fromList((ArrayList) readValue(buffer)); case (byte) 148: - return PlatformPoint.fromList((ArrayList) readValue(buffer)); + return PlatformPolygon.fromList((ArrayList) readValue(buffer)); case (byte) 149: - return PlatformTileLayer.fromList((ArrayList) readValue(buffer)); + return PlatformPolyline.fromList((ArrayList) readValue(buffer)); case (byte) 150: - return PlatformZoomRange.fromList((ArrayList) readValue(buffer)); + return PlatformTile.fromList((ArrayList) readValue(buffer)); case (byte) 151: - { - Object value = readValue(buffer); - return value == null ? null : PlatformMapType.values()[(int) value]; - } + return PlatformTileOverlay.fromList((ArrayList) readValue(buffer)); case (byte) 152: - { - Object value = readValue(buffer); - return value == null ? null : PlatformRendererType.values()[(int) value]; - } + return PlatformEdgeInsets.fromList((ArrayList) readValue(buffer)); case (byte) 153: - { - Object value = readValue(buffer); - return value == null ? null : PlatformJointType.values()[(int) value]; - } + return PlatformLatLng.fromList((ArrayList) readValue(buffer)); + case (byte) 154: + return PlatformLatLngBounds.fromList((ArrayList) readValue(buffer)); + case (byte) 155: + return PlatformCluster.fromList((ArrayList) readValue(buffer)); + case (byte) 156: + return PlatformCameraTargetBounds.fromList((ArrayList) readValue(buffer)); + case (byte) 157: + return PlatformMapViewCreationParams.fromList((ArrayList) readValue(buffer)); + case (byte) 158: + return PlatformMapConfiguration.fromList((ArrayList) readValue(buffer)); + case (byte) 159: + return PlatformPoint.fromList((ArrayList) readValue(buffer)); + case (byte) 160: + return PlatformTileLayer.fromList((ArrayList) readValue(buffer)); + case (byte) 161: + return PlatformZoomRange.fromList((ArrayList) readValue(buffer)); default: return super.readValueOfType(type, buffer); } @@ -4212,81 +4865,105 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { @Override protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { - if (value instanceof PlatformCameraPosition) { + if (value instanceof PlatformMapType) { stream.write(129); + writeValue(stream, value == null ? null : ((PlatformMapType) value).index); + } else if (value instanceof PlatformRendererType) { + stream.write(130); + writeValue(stream, value == null ? null : ((PlatformRendererType) value).index); + } else if (value instanceof PlatformJointType) { + stream.write(131); + writeValue(stream, value == null ? null : ((PlatformJointType) value).index); + } else if (value instanceof PlatformCameraPosition) { + stream.write(132); writeValue(stream, ((PlatformCameraPosition) value).toList()); } else if (value instanceof PlatformCameraUpdate) { - stream.write(130); + stream.write(133); writeValue(stream, ((PlatformCameraUpdate) value).toList()); + } else if (value instanceof PlatformCameraUpdateNewCameraPosition) { + stream.write(134); + writeValue(stream, ((PlatformCameraUpdateNewCameraPosition) value).toList()); + } else if (value instanceof PlatformCameraUpdateNewLatLng) { + stream.write(135); + writeValue(stream, ((PlatformCameraUpdateNewLatLng) value).toList()); + } else if (value instanceof PlatformCameraUpdateNewLatLngBounds) { + stream.write(136); + writeValue(stream, ((PlatformCameraUpdateNewLatLngBounds) value).toList()); + } else if (value instanceof PlatformCameraUpdateNewLatLngZoom) { + stream.write(137); + writeValue(stream, ((PlatformCameraUpdateNewLatLngZoom) value).toList()); + } else if (value instanceof PlatformCameraUpdateScrollBy) { + stream.write(138); + writeValue(stream, ((PlatformCameraUpdateScrollBy) value).toList()); + } else if (value instanceof PlatformCameraUpdateZoomBy) { + stream.write(139); + writeValue(stream, ((PlatformCameraUpdateZoomBy) value).toList()); + } else if (value instanceof PlatformCameraUpdateZoom) { + stream.write(140); + writeValue(stream, ((PlatformCameraUpdateZoom) value).toList()); + } else if (value instanceof PlatformCameraUpdateZoomTo) { + stream.write(141); + writeValue(stream, ((PlatformCameraUpdateZoomTo) value).toList()); } else if (value instanceof PlatformCircle) { - stream.write(131); + stream.write(142); writeValue(stream, ((PlatformCircle) value).toList()); } else if (value instanceof PlatformHeatmap) { - stream.write(132); + stream.write(143); writeValue(stream, ((PlatformHeatmap) value).toList()); } else if (value instanceof PlatformClusterManager) { - stream.write(133); + stream.write(144); writeValue(stream, ((PlatformClusterManager) value).toList()); } else if (value instanceof PlatformOffset) { - stream.write(134); + stream.write(145); writeValue(stream, ((PlatformOffset) value).toList()); } else if (value instanceof PlatformInfoWindow) { - stream.write(135); + stream.write(146); writeValue(stream, ((PlatformInfoWindow) value).toList()); } else if (value instanceof PlatformMarker) { - stream.write(136); + stream.write(147); writeValue(stream, ((PlatformMarker) value).toList()); } else if (value instanceof PlatformPolygon) { - stream.write(137); + stream.write(148); writeValue(stream, ((PlatformPolygon) value).toList()); } else if (value instanceof PlatformPolyline) { - stream.write(138); + stream.write(149); writeValue(stream, ((PlatformPolyline) value).toList()); } else if (value instanceof PlatformTile) { - stream.write(139); + stream.write(150); writeValue(stream, ((PlatformTile) value).toList()); } else if (value instanceof PlatformTileOverlay) { - stream.write(140); + stream.write(151); writeValue(stream, ((PlatformTileOverlay) value).toList()); } else if (value instanceof PlatformEdgeInsets) { - stream.write(141); + stream.write(152); writeValue(stream, ((PlatformEdgeInsets) value).toList()); } else if (value instanceof PlatformLatLng) { - stream.write(142); + stream.write(153); writeValue(stream, ((PlatformLatLng) value).toList()); } else if (value instanceof PlatformLatLngBounds) { - stream.write(143); + stream.write(154); writeValue(stream, ((PlatformLatLngBounds) value).toList()); } else if (value instanceof PlatformCluster) { - stream.write(144); + stream.write(155); writeValue(stream, ((PlatformCluster) value).toList()); } else if (value instanceof PlatformCameraTargetBounds) { - stream.write(145); + stream.write(156); writeValue(stream, ((PlatformCameraTargetBounds) value).toList()); } else if (value instanceof PlatformMapViewCreationParams) { - stream.write(146); + stream.write(157); writeValue(stream, ((PlatformMapViewCreationParams) value).toList()); } else if (value instanceof PlatformMapConfiguration) { - stream.write(147); + stream.write(158); writeValue(stream, ((PlatformMapConfiguration) value).toList()); } else if (value instanceof PlatformPoint) { - stream.write(148); + stream.write(159); writeValue(stream, ((PlatformPoint) value).toList()); } else if (value instanceof PlatformTileLayer) { - stream.write(149); + stream.write(160); writeValue(stream, ((PlatformTileLayer) value).toList()); } else if (value instanceof PlatformZoomRange) { - stream.write(150); + stream.write(161); writeValue(stream, ((PlatformZoomRange) value).toList()); - } else if (value instanceof PlatformMapType) { - stream.write(151); - writeValue(stream, value == null ? null : ((PlatformMapType) value).index); - } else if (value instanceof PlatformRendererType) { - stream.write(152); - writeValue(stream, value == null ? null : ((PlatformRendererType) value).index); - } else if (value instanceof PlatformJointType) { - stream.write(153); - writeValue(stream, value == null ? null : ((PlatformJointType) value).index); } else { super.writeValue(stream, value); } @@ -4436,7 +5113,7 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); VoidResult resultCallback = new VoidResult() { public void success() { @@ -4466,15 +5143,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformMapConfiguration configurationArg = (PlatformMapConfiguration) args.get(0); try { api.updateMapConfiguration(configurationArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4492,7 +5168,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4501,8 +5177,7 @@ public void error(Throwable error) { api.updateCircles(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4520,7 +5195,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4529,8 +5204,7 @@ public void error(Throwable error) { api.updateHeatmaps(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4548,7 +5222,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List idsToRemoveArg = (List) args.get(1); @@ -4556,8 +5230,7 @@ public void error(Throwable error) { api.updateClusterManagers(toAddArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4575,7 +5248,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4584,8 +5257,7 @@ public void error(Throwable error) { api.updateMarkers(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4603,7 +5275,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4612,8 +5284,7 @@ public void error(Throwable error) { api.updatePolygons(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4631,7 +5302,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4640,8 +5311,7 @@ public void error(Throwable error) { api.updatePolylines(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4659,7 +5329,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; List toAddArg = (List) args.get(0); List toChangeArg = (List) args.get(1); @@ -4668,8 +5338,7 @@ public void error(Throwable error) { api.updateTileOverlays(toAddArg, toChangeArg, idsToRemoveArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4687,15 +5356,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformLatLng latLngArg = (PlatformLatLng) args.get(0); try { PlatformPoint output = api.getScreenCoordinate(latLngArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4713,15 +5381,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformPoint screenCoordinateArg = (PlatformPoint) args.get(0); try { PlatformLatLng output = api.getLatLng(screenCoordinateArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4739,13 +5406,12 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { PlatformLatLngBounds output = api.getVisibleRegion(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4763,15 +5429,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformCameraUpdate cameraUpdateArg = (PlatformCameraUpdate) args.get(0); try { api.moveCamera(cameraUpdateArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4789,15 +5454,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformCameraUpdate cameraUpdateArg = (PlatformCameraUpdate) args.get(0); try { api.animateCamera(cameraUpdateArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4815,13 +5479,12 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Double output = api.getZoomLevel(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4839,15 +5502,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String markerIdArg = (String) args.get(0); try { api.showInfoWindow(markerIdArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4865,15 +5527,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String markerIdArg = (String) args.get(0); try { api.hideInfoWindow(markerIdArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4891,15 +5552,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String markerIdArg = (String) args.get(0); try { Boolean output = api.isInfoWindowShown(markerIdArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4917,15 +5577,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String styleArg = (String) args.get(0); try { Boolean output = api.setStyle(styleArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4943,13 +5602,12 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.didLastStyleSucceed(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4967,15 +5625,14 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String tileOverlayIdArg = (String) args.get(0); try { api.clearTileCache(tileOverlayIdArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -4993,7 +5650,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); Result resultCallback = new Result() { public void success(byte[] result) { @@ -5030,8 +5687,7 @@ public MapsCallbackApi( this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; } - /** Public interface for sending reply. */ - /** The codec used by MapsCallbackApi. */ + /** Public interface for sending reply. The codec used by MapsCallbackApi. */ static @NonNull MessageCodec getCodec() { return PigeonCodec.INSTANCE; } @@ -5050,9 +5706,7 @@ public void onCameraMoveStarted(@NonNull VoidResult result) { if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5070,16 +5724,14 @@ public void onCameraMove( BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(cameraPositionArg)), + new ArrayList<>(Collections.singletonList(cameraPositionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5103,9 +5755,7 @@ public void onCameraIdle(@NonNull VoidResult result) { if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5122,16 +5772,14 @@ public void onTap(@NonNull PlatformLatLng positionArg, @NonNull VoidResult resul BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(positionArg)), + new ArrayList<>(Collections.singletonList(positionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5148,16 +5796,14 @@ public void onLongPress(@NonNull PlatformLatLng positionArg, @NonNull VoidResult BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(positionArg)), + new ArrayList<>(Collections.singletonList(positionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5174,16 +5820,14 @@ public void onMarkerTap(@NonNull String markerIdArg, @NonNull VoidResult result) BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(markerIdArg)), + new ArrayList<>(Collections.singletonList(markerIdArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5203,16 +5847,14 @@ public void onMarkerDragStart( BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Arrays.asList(markerIdArg, positionArg)), + new ArrayList<>(Arrays.asList(markerIdArg, positionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5232,16 +5874,14 @@ public void onMarkerDrag( BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Arrays.asList(markerIdArg, positionArg)), + new ArrayList<>(Arrays.asList(markerIdArg, positionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5261,16 +5901,14 @@ public void onMarkerDragEnd( BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Arrays.asList(markerIdArg, positionArg)), + new ArrayList<>(Arrays.asList(markerIdArg, positionArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5287,16 +5925,14 @@ public void onInfoWindowTap(@NonNull String markerIdArg, @NonNull VoidResult res BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(markerIdArg)), + new ArrayList<>(Collections.singletonList(markerIdArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5313,16 +5949,14 @@ public void onCircleTap(@NonNull String circleIdArg, @NonNull VoidResult result) BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(circleIdArg)), + new ArrayList<>(Collections.singletonList(circleIdArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5339,16 +5973,14 @@ public void onClusterTap(@NonNull PlatformCluster clusterArg, @NonNull VoidResul BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(clusterArg)), + new ArrayList<>(Collections.singletonList(clusterArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5365,16 +5997,14 @@ public void onPolygonTap(@NonNull String polygonIdArg, @NonNull VoidResult resul BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(polygonIdArg)), + new ArrayList<>(Collections.singletonList(polygonIdArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5391,16 +6021,14 @@ public void onPolylineTap(@NonNull String polylineIdArg, @NonNull VoidResult res BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(polylineIdArg)), + new ArrayList<>(Collections.singletonList(polylineIdArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else { result.success(); } @@ -5421,16 +6049,14 @@ public void getTileOverlayTile( BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Arrays.asList(tileOverlayIdArg, locationArg, zoomArg)), + new ArrayList<>(Arrays.asList(tileOverlayIdArg, locationArg, zoomArg)), channelReply -> { if (channelReply instanceof List) { List listReply = (List) channelReply; if (listReply.size() > 1) { result.error( new FlutterError( - (String) listReply.get(0), - (String) listReply.get(1), - (String) listReply.get(2))); + (String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); } else if (listReply.get(0) == null) { result.error( new FlutterError( @@ -5490,7 +6116,7 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformRendererType typeArg = (PlatformRendererType) args.get(0); Result resultCallback = @@ -5551,15 +6177,14 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PlatformMapViewCreationParams typeArg = (PlatformMapViewCreationParams) args.get(0); try { api.createView(typeArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5644,13 +6269,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areBuildingsEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5668,13 +6292,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areRotateGesturesEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5692,13 +6315,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areZoomControlsEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5716,13 +6338,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areScrollGesturesEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5740,13 +6361,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areTiltGesturesEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5764,13 +6384,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.areZoomGesturesEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5788,13 +6407,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.isCompassEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5812,13 +6430,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.isLiteModeEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5836,13 +6453,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.isMapToolbarEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5860,13 +6476,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.isMyLocationButtonEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5884,13 +6499,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Boolean output = api.isTrafficEnabled(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5908,15 +6522,14 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String tileOverlayIdArg = (String) args.get(0); try { PlatformTileLayer output = api.getTileOverlayInfo(tileOverlayIdArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5934,13 +6547,12 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { PlatformZoomRange output = api.getZoomRange(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -5958,15 +6570,14 @@ static void setUp( if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String clusterManagerIdArg = (String) args.get(0); try { List output = api.getClusters(clusterManagerIdArg); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index d73d83d7a0e..df183cfe2ac 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - google_maps_flutter_platform_interface: ^2.9.0 + google_maps_flutter_platform_interface: ^2.9.2 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart b/packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart index 551a1a74314..76d39e816a3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart +++ b/packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart @@ -362,7 +362,7 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform { required int mapId, }) { return _hostApi(mapId) - .animateCamera(PlatformCameraUpdate(json: cameraUpdate.toJson())); + .animateCamera(_platformCameraUpdateFromCameraUpdate(cameraUpdate)); } @override @@ -371,7 +371,7 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform { required int mapId, }) { return _hostApi(mapId) - .moveCamera(PlatformCameraUpdate(json: cameraUpdate.toJson())); + .moveCamera(_platformCameraUpdateFromCameraUpdate(cameraUpdate)); } @override @@ -799,6 +799,60 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform { tileSize: tileOverlay.tileSize, ); } + + static PlatformCameraUpdate _platformCameraUpdateFromCameraUpdate( + CameraUpdate update) { + switch (update.updateType) { + case CameraUpdateType.newCameraPosition: + update as CameraUpdateNewCameraPosition; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateNewCameraPosition( + cameraPosition: _platformCameraPositionFromCameraPosition( + update.cameraPosition))); + case CameraUpdateType.newLatLng: + update as CameraUpdateNewLatLng; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateNewLatLng( + latLng: _platformLatLngFromLatLng(update.latLng))); + case CameraUpdateType.newLatLngZoom: + update as CameraUpdateNewLatLngZoom; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateNewLatLngZoom( + latLng: _platformLatLngFromLatLng(update.latLng), + zoom: update.zoom)); + case CameraUpdateType.newLatLngBounds: + update as CameraUpdateNewLatLngBounds; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateNewLatLngBounds( + bounds: _platformLatLngBoundsFromLatLngBounds(update.bounds)!, + padding: update.padding)); + case CameraUpdateType.zoomTo: + update as CameraUpdateZoomTo; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateZoomTo(zoom: update.zoom)); + case CameraUpdateType.zoomBy: + update as CameraUpdateZoomBy; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateZoomBy( + amount: update.amount, + focus: update.focus == null + ? null + : _platformOffsetFromOffset(update.focus!))); + case CameraUpdateType.zoomIn: + update as CameraUpdateZoomIn; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateZoom(out: false)); + case CameraUpdateType.zoomOut: + update as CameraUpdateZoomOut; + return PlatformCameraUpdate( + cameraUpdate: PlatformCameraUpdateZoom(out: true)); + case CameraUpdateType.scrollBy: + update as CameraUpdateScrollBy; + return PlatformCameraUpdate( + cameraUpdate: + PlatformCameraUpdateScrollBy(dx: update.dx, dy: update.dy)); + } + } } /// Callback handler for map events from the platform host. diff --git a/packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart b/packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart index fae122579b7..62655d2dac8 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart +++ b/packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v20.0.2), do not edit directly. +// Autogenerated from Pigeon (v22.3.0), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -43,6 +43,7 @@ enum PlatformRendererType { latest, } +/// Join types for polyline joints. enum PlatformJointType { mitered, bevel, @@ -89,24 +90,223 @@ class PlatformCameraPosition { /// Pigeon representation of a CameraUpdate. class PlatformCameraUpdate { PlatformCameraUpdate({ - required this.json, + required this.cameraUpdate, }); - /// The update data, as JSON. This should only be set from - /// CameraUpdate.toJson, and the native code must interpret it according to the - /// internal implementation details of the CameraUpdate class. - Object json; + /// This Object shall be any of the below classes prefixed with + /// PlatformCameraUpdate. Each such class represents a different type of + /// camera update, and each holds a different set of data, preventing the + /// use of a single unified class. Pigeon does not support inheritance, which + /// prevents a more strict type bound. + /// See https://github.com/flutter/flutter/issues/117819. + Object cameraUpdate; Object encode() { return [ - json, + cameraUpdate, ]; } static PlatformCameraUpdate decode(Object result) { result as List; return PlatformCameraUpdate( - json: result[0]!, + cameraUpdate: result[0]!, + ); + } +} + +/// Pigeon equivalent of NewCameraPosition +class PlatformCameraUpdateNewCameraPosition { + PlatformCameraUpdateNewCameraPosition({ + required this.cameraPosition, + }); + + PlatformCameraPosition cameraPosition; + + Object encode() { + return [ + cameraPosition, + ]; + } + + static PlatformCameraUpdateNewCameraPosition decode(Object result) { + result as List; + return PlatformCameraUpdateNewCameraPosition( + cameraPosition: result[0]! as PlatformCameraPosition, + ); + } +} + +/// Pigeon equivalent of NewLatLng +class PlatformCameraUpdateNewLatLng { + PlatformCameraUpdateNewLatLng({ + required this.latLng, + }); + + PlatformLatLng latLng; + + Object encode() { + return [ + latLng, + ]; + } + + static PlatformCameraUpdateNewLatLng decode(Object result) { + result as List; + return PlatformCameraUpdateNewLatLng( + latLng: result[0]! as PlatformLatLng, + ); + } +} + +/// Pigeon equivalent of NewLatLngBounds +class PlatformCameraUpdateNewLatLngBounds { + PlatformCameraUpdateNewLatLngBounds({ + required this.bounds, + required this.padding, + }); + + PlatformLatLngBounds bounds; + + double padding; + + Object encode() { + return [ + bounds, + padding, + ]; + } + + static PlatformCameraUpdateNewLatLngBounds decode(Object result) { + result as List; + return PlatformCameraUpdateNewLatLngBounds( + bounds: result[0]! as PlatformLatLngBounds, + padding: result[1]! as double, + ); + } +} + +/// Pigeon equivalent of NewLatLngZoom +class PlatformCameraUpdateNewLatLngZoom { + PlatformCameraUpdateNewLatLngZoom({ + required this.latLng, + required this.zoom, + }); + + PlatformLatLng latLng; + + double zoom; + + Object encode() { + return [ + latLng, + zoom, + ]; + } + + static PlatformCameraUpdateNewLatLngZoom decode(Object result) { + result as List; + return PlatformCameraUpdateNewLatLngZoom( + latLng: result[0]! as PlatformLatLng, + zoom: result[1]! as double, + ); + } +} + +/// Pigeon equivalent of ScrollBy +class PlatformCameraUpdateScrollBy { + PlatformCameraUpdateScrollBy({ + required this.dx, + required this.dy, + }); + + double dx; + + double dy; + + Object encode() { + return [ + dx, + dy, + ]; + } + + static PlatformCameraUpdateScrollBy decode(Object result) { + result as List; + return PlatformCameraUpdateScrollBy( + dx: result[0]! as double, + dy: result[1]! as double, + ); + } +} + +/// Pigeon equivalent of ZoomBy +class PlatformCameraUpdateZoomBy { + PlatformCameraUpdateZoomBy({ + required this.amount, + this.focus, + }); + + double amount; + + PlatformOffset? focus; + + Object encode() { + return [ + amount, + focus, + ]; + } + + static PlatformCameraUpdateZoomBy decode(Object result) { + result as List; + return PlatformCameraUpdateZoomBy( + amount: result[0]! as double, + focus: result[1] as PlatformOffset?, + ); + } +} + +/// Pigeon equivalent of ZoomIn/ZoomOut +class PlatformCameraUpdateZoom { + PlatformCameraUpdateZoom({ + required this.out, + }); + + bool out; + + Object encode() { + return [ + out, + ]; + } + + static PlatformCameraUpdateZoom decode(Object result) { + result as List; + return PlatformCameraUpdateZoom( + out: result[0]! as bool, + ); + } +} + +/// Pigeon equivalent of ZoomTo +class PlatformCameraUpdateZoomTo { + PlatformCameraUpdateZoomTo({ + required this.zoom, + }); + + double zoom; + + Object encode() { + return [ + zoom, + ]; + } + + static PlatformCameraUpdateZoomTo decode(Object result) { + result as List; + return PlatformCameraUpdateZoomTo( + zoom: result[0]! as double, ); } } @@ -454,7 +654,7 @@ class PlatformPolyline { bool geodesic; - /// The joint type as an integer. This must be a value corresponding to one of the values defined in the platform interface package's JointType enum. The integer values specified in this enum must match those used by the native SDK. + /// The joint type. PlatformJointType jointType; /// The pattern data, as JSON. Each element in this list should be set only from PatternItem.toJson, and the native code must interpret it according to the internal implementation details of that method. @@ -1018,81 +1218,108 @@ class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is PlatformCameraPosition) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else if (value is PlatformMapType) { buffer.putUint8(129); - writeValue(buffer, value.encode()); - } else if (value is PlatformCameraUpdate) { + writeValue(buffer, value.index); + } else if (value is PlatformRendererType) { buffer.putUint8(130); - writeValue(buffer, value.encode()); - } else if (value is PlatformCircle) { + writeValue(buffer, value.index); + } else if (value is PlatformJointType) { buffer.putUint8(131); - writeValue(buffer, value.encode()); - } else if (value is PlatformHeatmap) { + writeValue(buffer, value.index); + } else if (value is PlatformCameraPosition) { buffer.putUint8(132); writeValue(buffer, value.encode()); - } else if (value is PlatformClusterManager) { + } else if (value is PlatformCameraUpdate) { buffer.putUint8(133); writeValue(buffer, value.encode()); - } else if (value is PlatformOffset) { + } else if (value is PlatformCameraUpdateNewCameraPosition) { buffer.putUint8(134); writeValue(buffer, value.encode()); - } else if (value is PlatformInfoWindow) { + } else if (value is PlatformCameraUpdateNewLatLng) { buffer.putUint8(135); writeValue(buffer, value.encode()); - } else if (value is PlatformMarker) { + } else if (value is PlatformCameraUpdateNewLatLngBounds) { buffer.putUint8(136); writeValue(buffer, value.encode()); - } else if (value is PlatformPolygon) { + } else if (value is PlatformCameraUpdateNewLatLngZoom) { buffer.putUint8(137); writeValue(buffer, value.encode()); - } else if (value is PlatformPolyline) { + } else if (value is PlatformCameraUpdateScrollBy) { buffer.putUint8(138); writeValue(buffer, value.encode()); - } else if (value is PlatformTile) { + } else if (value is PlatformCameraUpdateZoomBy) { buffer.putUint8(139); writeValue(buffer, value.encode()); - } else if (value is PlatformTileOverlay) { + } else if (value is PlatformCameraUpdateZoom) { buffer.putUint8(140); writeValue(buffer, value.encode()); - } else if (value is PlatformEdgeInsets) { + } else if (value is PlatformCameraUpdateZoomTo) { buffer.putUint8(141); writeValue(buffer, value.encode()); - } else if (value is PlatformLatLng) { + } else if (value is PlatformCircle) { buffer.putUint8(142); writeValue(buffer, value.encode()); - } else if (value is PlatformLatLngBounds) { + } else if (value is PlatformHeatmap) { buffer.putUint8(143); writeValue(buffer, value.encode()); - } else if (value is PlatformCluster) { + } else if (value is PlatformClusterManager) { buffer.putUint8(144); writeValue(buffer, value.encode()); - } else if (value is PlatformCameraTargetBounds) { + } else if (value is PlatformOffset) { buffer.putUint8(145); writeValue(buffer, value.encode()); - } else if (value is PlatformMapViewCreationParams) { + } else if (value is PlatformInfoWindow) { buffer.putUint8(146); writeValue(buffer, value.encode()); - } else if (value is PlatformMapConfiguration) { + } else if (value is PlatformMarker) { buffer.putUint8(147); writeValue(buffer, value.encode()); - } else if (value is PlatformPoint) { + } else if (value is PlatformPolygon) { buffer.putUint8(148); writeValue(buffer, value.encode()); - } else if (value is PlatformTileLayer) { + } else if (value is PlatformPolyline) { buffer.putUint8(149); writeValue(buffer, value.encode()); - } else if (value is PlatformZoomRange) { + } else if (value is PlatformTile) { buffer.putUint8(150); writeValue(buffer, value.encode()); - } else if (value is PlatformMapType) { + } else if (value is PlatformTileOverlay) { buffer.putUint8(151); - writeValue(buffer, value.index); - } else if (value is PlatformRendererType) { + writeValue(buffer, value.encode()); + } else if (value is PlatformEdgeInsets) { buffer.putUint8(152); - writeValue(buffer, value.index); - } else if (value is PlatformJointType) { + writeValue(buffer, value.encode()); + } else if (value is PlatformLatLng) { buffer.putUint8(153); - writeValue(buffer, value.index); + writeValue(buffer, value.encode()); + } else if (value is PlatformLatLngBounds) { + buffer.putUint8(154); + writeValue(buffer, value.encode()); + } else if (value is PlatformCluster) { + buffer.putUint8(155); + writeValue(buffer, value.encode()); + } else if (value is PlatformCameraTargetBounds) { + buffer.putUint8(156); + writeValue(buffer, value.encode()); + } else if (value is PlatformMapViewCreationParams) { + buffer.putUint8(157); + writeValue(buffer, value.encode()); + } else if (value is PlatformMapConfiguration) { + buffer.putUint8(158); + writeValue(buffer, value.encode()); + } else if (value is PlatformPoint) { + buffer.putUint8(159); + writeValue(buffer, value.encode()); + } else if (value is PlatformTileLayer) { + buffer.putUint8(160); + writeValue(buffer, value.encode()); + } else if (value is PlatformZoomRange) { + buffer.putUint8(161); + writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); } @@ -1102,58 +1329,74 @@ class _PigeonCodec extends StandardMessageCodec { Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { case 129: - return PlatformCameraPosition.decode(readValue(buffer)!); + final int? value = readValue(buffer) as int?; + return value == null ? null : PlatformMapType.values[value]; case 130: - return PlatformCameraUpdate.decode(readValue(buffer)!); + final int? value = readValue(buffer) as int?; + return value == null ? null : PlatformRendererType.values[value]; case 131: - return PlatformCircle.decode(readValue(buffer)!); + final int? value = readValue(buffer) as int?; + return value == null ? null : PlatformJointType.values[value]; case 132: - return PlatformHeatmap.decode(readValue(buffer)!); + return PlatformCameraPosition.decode(readValue(buffer)!); case 133: - return PlatformClusterManager.decode(readValue(buffer)!); + return PlatformCameraUpdate.decode(readValue(buffer)!); case 134: - return PlatformOffset.decode(readValue(buffer)!); + return PlatformCameraUpdateNewCameraPosition.decode(readValue(buffer)!); case 135: - return PlatformInfoWindow.decode(readValue(buffer)!); + return PlatformCameraUpdateNewLatLng.decode(readValue(buffer)!); case 136: - return PlatformMarker.decode(readValue(buffer)!); + return PlatformCameraUpdateNewLatLngBounds.decode(readValue(buffer)!); case 137: - return PlatformPolygon.decode(readValue(buffer)!); + return PlatformCameraUpdateNewLatLngZoom.decode(readValue(buffer)!); case 138: - return PlatformPolyline.decode(readValue(buffer)!); + return PlatformCameraUpdateScrollBy.decode(readValue(buffer)!); case 139: - return PlatformTile.decode(readValue(buffer)!); + return PlatformCameraUpdateZoomBy.decode(readValue(buffer)!); case 140: - return PlatformTileOverlay.decode(readValue(buffer)!); + return PlatformCameraUpdateZoom.decode(readValue(buffer)!); case 141: - return PlatformEdgeInsets.decode(readValue(buffer)!); + return PlatformCameraUpdateZoomTo.decode(readValue(buffer)!); case 142: - return PlatformLatLng.decode(readValue(buffer)!); + return PlatformCircle.decode(readValue(buffer)!); case 143: - return PlatformLatLngBounds.decode(readValue(buffer)!); + return PlatformHeatmap.decode(readValue(buffer)!); case 144: - return PlatformCluster.decode(readValue(buffer)!); + return PlatformClusterManager.decode(readValue(buffer)!); case 145: - return PlatformCameraTargetBounds.decode(readValue(buffer)!); + return PlatformOffset.decode(readValue(buffer)!); case 146: - return PlatformMapViewCreationParams.decode(readValue(buffer)!); + return PlatformInfoWindow.decode(readValue(buffer)!); case 147: - return PlatformMapConfiguration.decode(readValue(buffer)!); + return PlatformMarker.decode(readValue(buffer)!); case 148: - return PlatformPoint.decode(readValue(buffer)!); + return PlatformPolygon.decode(readValue(buffer)!); case 149: - return PlatformTileLayer.decode(readValue(buffer)!); + return PlatformPolyline.decode(readValue(buffer)!); case 150: - return PlatformZoomRange.decode(readValue(buffer)!); + return PlatformTile.decode(readValue(buffer)!); case 151: - final int? value = readValue(buffer) as int?; - return value == null ? null : PlatformMapType.values[value]; + return PlatformTileOverlay.decode(readValue(buffer)!); case 152: - final int? value = readValue(buffer) as int?; - return value == null ? null : PlatformRendererType.values[value]; + return PlatformEdgeInsets.decode(readValue(buffer)!); case 153: - final int? value = readValue(buffer) as int?; - return value == null ? null : PlatformJointType.values[value]; + return PlatformLatLng.decode(readValue(buffer)!); + case 154: + return PlatformLatLngBounds.decode(readValue(buffer)!); + case 155: + return PlatformCluster.decode(readValue(buffer)!); + case 156: + return PlatformCameraTargetBounds.decode(readValue(buffer)!); + case 157: + return PlatformMapViewCreationParams.decode(readValue(buffer)!); + case 158: + return PlatformMapConfiguration.decode(readValue(buffer)!); + case 159: + return PlatformPoint.decode(readValue(buffer)!); + case 160: + return PlatformTileLayer.decode(readValue(buffer)!); + case 161: + return PlatformZoomRange.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } @@ -1168,34 +1411,34 @@ class MapsApi { /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. MapsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : __pigeon_binaryMessenger = binaryMessenger, - __pigeon_messageChannelSuffix = + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; - final BinaryMessenger? __pigeon_binaryMessenger; + final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - final String __pigeon_messageChannelSuffix; + final String pigeonVar_messageChannelSuffix; /// Returns once the map instance is available. Future waitForMap() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.waitForMap$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.waitForMap$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1208,23 +1451,23 @@ class MapsApi { /// null values will remain unchanged. Future updateMapConfiguration( PlatformMapConfiguration configuration) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateMapConfiguration$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateMapConfiguration$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([configuration]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = await pigeonVar_channel + .send([configuration]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1234,23 +1477,23 @@ class MapsApi { /// Updates the set of circles on the map. Future updateCircles(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateCircles$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateCircles$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1260,23 +1503,23 @@ class MapsApi { /// Updates the set of heatmaps on the map. Future updateHeatmaps(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateHeatmaps$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateHeatmaps$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1286,23 +1529,23 @@ class MapsApi { /// Updates the set of custer managers for clusters on the map. Future updateClusterManagers( List toAdd, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateClusterManagers$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateClusterManagers$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1312,23 +1555,23 @@ class MapsApi { /// Updates the set of markers on the map. Future updateMarkers(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateMarkers$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateMarkers$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1338,23 +1581,23 @@ class MapsApi { /// Updates the set of polygonss on the map. Future updatePolygons(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updatePolygons$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updatePolygons$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1364,23 +1607,23 @@ class MapsApi { /// Updates the set of polylines on the map. Future updatePolylines(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updatePolylines$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updatePolylines$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1390,23 +1633,23 @@ class MapsApi { /// Updates the set of tile overlays on the map. Future updateTileOverlays(List toAdd, List toChange, List idsToRemove) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateTileOverlays$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.updateTileOverlays$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([toAdd, toChange, idsToRemove]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1415,114 +1658,114 @@ class MapsApi { /// Gets the screen coordinate for the given map location. Future getScreenCoordinate(PlatformLatLng latLng) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getScreenCoordinate$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getScreenCoordinate$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([latLng]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([latLng]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as PlatformPoint?)!; + return (pigeonVar_replyList[0] as PlatformPoint?)!; } } /// Gets the map location for the given screen coordinate. Future getLatLng(PlatformPoint screenCoordinate) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getLatLng$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getLatLng$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([screenCoordinate]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as PlatformLatLng?)!; + return (pigeonVar_replyList[0] as PlatformLatLng?)!; } } /// Gets the map region currently displayed on the map. Future getVisibleRegion() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getVisibleRegion$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getVisibleRegion$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as PlatformLatLngBounds?)!; + return (pigeonVar_replyList[0] as PlatformLatLngBounds?)!; } } /// Moves the camera according to [cameraUpdate] immediately, with no /// animation. Future moveCamera(PlatformCameraUpdate cameraUpdate) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.moveCamera$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.moveCamera$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([cameraUpdate]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([cameraUpdate]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1531,23 +1774,23 @@ class MapsApi { /// Moves the camera according to [cameraUpdate], animating the update. Future animateCamera(PlatformCameraUpdate cameraUpdate) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.animateCamera$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.animateCamera$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([cameraUpdate]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([cameraUpdate]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1556,53 +1799,53 @@ class MapsApi { /// Gets the current map zoom level. Future getZoomLevel() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getZoomLevel$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.getZoomLevel$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as double?)!; + return (pigeonVar_replyList[0] as double?)!; } } /// Show the info window for the marker with the given ID. Future showInfoWindow(String markerId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.showInfoWindow$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.showInfoWindow$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([markerId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([markerId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1611,23 +1854,23 @@ class MapsApi { /// Hide the info window for the marker with the given ID. Future hideInfoWindow(String markerId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.hideInfoWindow$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.hideInfoWindow$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([markerId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([markerId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1637,31 +1880,31 @@ class MapsApi { /// Returns true if the marker with the given ID is currently displaying its /// info window. Future isInfoWindowShown(String markerId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.isInfoWindowShown$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.isInfoWindowShown$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([markerId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([markerId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } @@ -1671,31 +1914,31 @@ class MapsApi { /// Returns false if there was an error setting the style, such as an invalid /// style string. Future setStyle(String style) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.setStyle$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.setStyle$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([style]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([style]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } @@ -1705,53 +1948,53 @@ class MapsApi { /// This allows checking asynchronously for initial style failures, as there /// is no way to return failures from map initialization. Future didLastStyleSucceed() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.didLastStyleSucceed$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.didLastStyleSucceed$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } /// Clears the cache of tiles previously requseted from the tile provider. Future clearTileCache(String tileOverlayId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.clearTileCache$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.clearTileCache$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([tileOverlayId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = await pigeonVar_channel + .send([tileOverlayId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -1760,31 +2003,31 @@ class MapsApi { /// Takes a snapshot of the map and returns its image data. Future takeSnapshot() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.takeSnapshot$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsApi.takeSnapshot$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as Uint8List?)!; + return (pigeonVar_replyList[0] as Uint8List?)!; } } } @@ -1846,15 +2089,16 @@ abstract class MapsCallbackApi { messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCameraMoveStarted$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { try { api.onCameraMoveStarted(); return wrapResponse(empty: true); @@ -1868,15 +2112,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCameraMove$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCameraMove was null.'); final List args = (message as List?)!; @@ -1897,15 +2142,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCameraIdle$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { try { api.onCameraIdle(); return wrapResponse(empty: true); @@ -1919,15 +2165,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onTap was null.'); final List args = (message as List?)!; @@ -1947,15 +2194,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onLongPress$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onLongPress was null.'); final List args = (message as List?)!; @@ -1975,15 +2223,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerTap was null.'); final List args = (message as List?)!; @@ -2003,15 +2252,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDragStart$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDragStart was null.'); final List args = (message as List?)!; @@ -2034,15 +2284,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDrag$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDrag was null.'); final List args = (message as List?)!; @@ -2065,15 +2316,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDragEnd$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onMarkerDragEnd was null.'); final List args = (message as List?)!; @@ -2096,15 +2348,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onInfoWindowTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onInfoWindowTap was null.'); final List args = (message as List?)!; @@ -2124,15 +2377,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCircleTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onCircleTap was null.'); final List args = (message as List?)!; @@ -2152,15 +2406,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onClusterTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onClusterTap was null.'); final List args = (message as List?)!; @@ -2180,15 +2435,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onPolygonTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onPolygonTap was null.'); final List args = (message as List?)!; @@ -2208,15 +2464,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onPolylineTap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.onPolylineTap was null.'); final List args = (message as List?)!; @@ -2236,15 +2493,16 @@ abstract class MapsCallbackApi { } } { - final BasicMessageChannel __pigeon_channel = BasicMessageChannel< + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< Object?>( 'dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.getTileOverlayTile$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - __pigeon_channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - __pigeon_channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.google_maps_flutter_android.MapsCallbackApi.getTileOverlayTile was null.'); final List args = (message as List?)!; @@ -2280,14 +2538,14 @@ class MapsInitializerApi { /// BinaryMessenger will be used which routes to the host platform. MapsInitializerApi( {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : __pigeon_binaryMessenger = binaryMessenger, - __pigeon_messageChannelSuffix = + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; - final BinaryMessenger? __pigeon_binaryMessenger; + final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - final String __pigeon_messageChannelSuffix; + final String pigeonVar_messageChannelSuffix; /// Initializes the Google Maps SDK with the given renderer preference. /// @@ -2297,31 +2555,31 @@ class MapsInitializerApi { /// in an error. Future initializeWithPreferredRenderer( PlatformRendererType? type) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInitializerApi.initializeWithPreferredRenderer$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInitializerApi.initializeWithPreferredRenderer$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([type]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([type]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as PlatformRendererType?)!; + return (pigeonVar_replyList[0] as PlatformRendererType?)!; } } } @@ -2335,33 +2593,33 @@ class MapsPlatformViewApi { /// BinaryMessenger will be used which routes to the host platform. MapsPlatformViewApi( {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : __pigeon_binaryMessenger = binaryMessenger, - __pigeon_messageChannelSuffix = + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; - final BinaryMessenger? __pigeon_binaryMessenger; + final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - final String __pigeon_messageChannelSuffix; + final String pigeonVar_messageChannelSuffix; Future createView(PlatformMapViewCreationParams? type) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsPlatformViewApi.createView$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsPlatformViewApi.createView$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([type]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send([type]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -2376,408 +2634,408 @@ class MapsInspectorApi { /// BinaryMessenger will be used which routes to the host platform. MapsInspectorApi( {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : __pigeon_binaryMessenger = binaryMessenger, - __pigeon_messageChannelSuffix = + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; - final BinaryMessenger? __pigeon_binaryMessenger; + final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - final String __pigeon_messageChannelSuffix; + final String pigeonVar_messageChannelSuffix; Future areBuildingsEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areBuildingsEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areBuildingsEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future areRotateGesturesEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areRotateGesturesEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areRotateGesturesEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future areZoomControlsEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areZoomControlsEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areZoomControlsEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future areScrollGesturesEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areScrollGesturesEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areScrollGesturesEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future areTiltGesturesEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areTiltGesturesEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areTiltGesturesEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future areZoomGesturesEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areZoomGesturesEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.areZoomGesturesEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future isCompassEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isCompassEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isCompassEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future isLiteModeEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isLiteModeEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isLiteModeEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (__pigeon_replyList[0] as bool?); + return (pigeonVar_replyList[0] as bool?); } } Future isMapToolbarEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isMapToolbarEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isMapToolbarEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future isMyLocationButtonEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isMyLocationButtonEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isMyLocationButtonEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future isTrafficEnabled() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isTrafficEnabled$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.isTrafficEnabled$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future getTileOverlayInfo(String tileOverlayId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getTileOverlayInfo$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getTileOverlayInfo$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send([tileOverlayId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = await pigeonVar_channel + .send([tileOverlayId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (__pigeon_replyList[0] as PlatformTileLayer?); + return (pigeonVar_replyList[0] as PlatformTileLayer?); } } Future getZoomRange() async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getZoomRange$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getZoomRange$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = - await __pigeon_channel.send(null) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as PlatformZoomRange?)!; + return (pigeonVar_replyList[0] as PlatformZoomRange?)!; } } Future> getClusters(String clusterManagerId) async { - final String __pigeon_channelName = - 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getClusters$__pigeon_messageChannelSuffix'; - final BasicMessageChannel __pigeon_channel = + final String pigeonVar_channelName = + 'dev.flutter.pigeon.google_maps_flutter_android.MapsInspectorApi.getClusters$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - __pigeon_channelName, + pigeonVar_channelName, pigeonChannelCodec, - binaryMessenger: __pigeon_binaryMessenger, + binaryMessenger: pigeonVar_binaryMessenger, ); - final List? __pigeon_replyList = await __pigeon_channel + final List? pigeonVar_replyList = await pigeonVar_channel .send([clusterManagerId]) as List?; - if (__pigeon_replyList == null) { - throw _createConnectionError(__pigeon_channelName); - } else if (__pigeon_replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: __pigeon_replyList[0]! as String, - message: __pigeon_replyList[1] as String?, - details: __pigeon_replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (__pigeon_replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (__pigeon_replyList[0] as List?)! + return (pigeonVar_replyList[0] as List?)! .cast(); } } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart b/packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart index b303d46486b..002b3c0a60e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart +++ b/packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart @@ -40,17 +40,67 @@ class PlatformCameraPosition { /// Pigeon representation of a CameraUpdate. class PlatformCameraUpdate { - PlatformCameraUpdate(this.json); - - /// The update data, as JSON. This should only be set from - /// CameraUpdate.toJson, and the native code must interpret it according to the - /// internal implementation details of the CameraUpdate class. - // TODO(stuartmorgan): Update the google_maps_platform_interface CameraUpdate - // class to provide a structured representation of an update. Currently it - // uses JSON as its only state, so there is no way to preserve structure. - // This wrapper class exists as a placeholder for now to at least provide - // type safety in the top-level call's arguments. - final Object json; + PlatformCameraUpdate({required this.cameraUpdate}); + + /// This Object shall be any of the below classes prefixed with + /// PlatformCameraUpdate. Each such class represents a different type of + /// camera update, and each holds a different set of data, preventing the + /// use of a single unified class. Pigeon does not support inheritance, which + /// prevents a more strict type bound. + /// See https://github.com/flutter/flutter/issues/117819. + final Object cameraUpdate; +} + +/// Pigeon equivalent of NewCameraPosition +class PlatformCameraUpdateNewCameraPosition { + PlatformCameraUpdateNewCameraPosition(this.cameraPosition); + final PlatformCameraPosition cameraPosition; +} + +/// Pigeon equivalent of NewLatLng +class PlatformCameraUpdateNewLatLng { + PlatformCameraUpdateNewLatLng(this.latLng); + final PlatformLatLng latLng; +} + +/// Pigeon equivalent of NewLatLngBounds +class PlatformCameraUpdateNewLatLngBounds { + PlatformCameraUpdateNewLatLngBounds(this.bounds, this.padding); + final PlatformLatLngBounds bounds; + final double padding; +} + +/// Pigeon equivalent of NewLatLngZoom +class PlatformCameraUpdateNewLatLngZoom { + PlatformCameraUpdateNewLatLngZoom(this.latLng, this.zoom); + final PlatformLatLng latLng; + final double zoom; +} + +/// Pigeon equivalent of ScrollBy +class PlatformCameraUpdateScrollBy { + PlatformCameraUpdateScrollBy(this.dx, this.dy); + final double dx; + final double dy; +} + +/// Pigeon equivalent of ZoomBy +class PlatformCameraUpdateZoomBy { + PlatformCameraUpdateZoomBy(this.amount, [this.focus]); + final double amount; + final PlatformOffset? focus; +} + +/// Pigeon equivalent of ZoomIn/ZoomOut +class PlatformCameraUpdateZoom { + PlatformCameraUpdateZoom(this.out); + final bool out; +} + +/// Pigeon equivalent of ZoomTo +class PlatformCameraUpdateZoomTo { + PlatformCameraUpdateZoomTo(this.zoom); + final double zoom; } /// Pigeon equivalent of the Circle class. diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 64865310764..657c6c05f13 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.14.5 +version: 2.14.6 environment: sdk: ^3.4.0 @@ -21,7 +21,7 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.1 - google_maps_flutter_platform_interface: ^2.9.0 + google_maps_flutter_platform_interface: ^2.9.2 stream_transform: ^2.0.0 dev_dependencies: @@ -30,7 +30,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: 5.4.4 - pigeon: ^20.0.2 + pigeon: ^22.1.0 plugin_platform_interface: ^2.1.7 topics: diff --git a/packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart b/packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart index 293899ac7c6..9219d1205d6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart @@ -104,7 +104,7 @@ void main() { expect(bounds, expectedBounds); }); - test('moveCamera calls through', () async { + test('moveCamera calls through with expected scrollBy', () async { const int mapId = 1; final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = setUpMockMap(mapId: mapId); @@ -115,10 +115,14 @@ void main() { final VerificationResult verification = verify(api.moveCamera(captureAny)); final PlatformCameraUpdate passedUpdate = verification.captured[0] as PlatformCameraUpdate; - expect(passedUpdate.json, update.toJson()); + final PlatformCameraUpdateScrollBy scroll = + passedUpdate.cameraUpdate as PlatformCameraUpdateScrollBy; + update as CameraUpdateScrollBy; + expect(scroll.dx, update.dx); + expect(scroll.dy, update.dy); }); - test('animateCamera calls through', () async { + test('animateCamera calls through with expected scrollBy', () async { const int mapId = 1; final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = setUpMockMap(mapId: mapId); @@ -130,7 +134,11 @@ void main() { verify(api.animateCamera(captureAny)); final PlatformCameraUpdate passedUpdate = verification.captured[0] as PlatformCameraUpdate; - expect(passedUpdate.json, update.toJson()); + final PlatformCameraUpdateScrollBy scroll = + passedUpdate.cameraUpdate as PlatformCameraUpdateScrollBy; + update as CameraUpdateScrollBy; + expect(scroll.dx, update.dx); + expect(scroll.dy, update.dy); }); test('getZoomLevel passes values correctly', () async { @@ -774,6 +782,164 @@ void main() { }, ); + test('moveCamera calls through with expected newCameraPosition', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + const LatLng latLng = LatLng(10.0, 20.0); + const CameraPosition position = CameraPosition(target: latLng); + final CameraUpdate update = CameraUpdate.newCameraPosition(position); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateNewCameraPosition typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateNewCameraPosition; + update as CameraUpdateNewCameraPosition; + expect(typedUpdate.cameraPosition.target.latitude, + update.cameraPosition.target.latitude); + expect(typedUpdate.cameraPosition.target.longitude, + update.cameraPosition.target.longitude); + }); + + test('moveCamera calls through with expected newLatLng', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + const LatLng latLng = LatLng(10.0, 20.0); + final CameraUpdate update = CameraUpdate.newLatLng(latLng); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateNewLatLng typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateNewLatLng; + update as CameraUpdateNewLatLng; + expect(typedUpdate.latLng.latitude, update.latLng.latitude); + expect(typedUpdate.latLng.longitude, update.latLng.longitude); + }); + + test('moveCamera calls through with expected newLatLngBounds', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + final LatLngBounds latLng = LatLngBounds( + northeast: const LatLng(10.0, 20.0), + southwest: const LatLng(9.0, 21.0)); + final CameraUpdate update = CameraUpdate.newLatLngBounds(latLng, 1.0); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateNewLatLngBounds typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateNewLatLngBounds; + update as CameraUpdateNewLatLngBounds; + expect(typedUpdate.bounds.northeast.latitude, + update.bounds.northeast.latitude); + expect(typedUpdate.bounds.northeast.longitude, + update.bounds.northeast.longitude); + expect(typedUpdate.bounds.southwest.latitude, + update.bounds.southwest.latitude); + expect(typedUpdate.bounds.southwest.longitude, + update.bounds.southwest.longitude); + expect(typedUpdate.padding, update.padding); + }); + + test('moveCamera calls through with expected newLatLngZoom', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + const LatLng latLng = LatLng(10.0, 20.0); + final CameraUpdate update = CameraUpdate.newLatLngZoom(latLng, 2.0); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateNewLatLngZoom typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateNewLatLngZoom; + update as CameraUpdateNewLatLngZoom; + expect(typedUpdate.latLng.latitude, update.latLng.latitude); + expect(typedUpdate.latLng.longitude, update.latLng.longitude); + expect(typedUpdate.zoom, update.zoom); + }); + + test('moveCamera calls through with expected zoomBy', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + const Offset focus = Offset(10.0, 20.0); + final CameraUpdate update = CameraUpdate.zoomBy(2.0, focus); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateZoomBy typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateZoomBy; + update as CameraUpdateZoomBy; + expect(typedUpdate.focus?.dx, update.focus?.dx); + expect(typedUpdate.focus?.dy, update.focus?.dy); + expect(typedUpdate.amount, update.amount); + }); + + test('moveCamera calls through with expected zoomTo', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + final CameraUpdate update = CameraUpdate.zoomTo(2.0); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateZoomTo typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateZoomTo; + update as CameraUpdateZoomTo; + expect(typedUpdate.zoom, update.zoom); + }); + + test('moveCamera calls through with expected zoomIn', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + final CameraUpdate update = CameraUpdate.zoomIn(); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateZoom typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateZoom; + expect(typedUpdate.out, false); + }); + + test('moveCamera calls through with expected zoomOut', () async { + const int mapId = 1; + final (GoogleMapsFlutterAndroid maps, MockMapsApi api) = + setUpMockMap(mapId: mapId); + + final CameraUpdate update = CameraUpdate.zoomOut(); + await maps.moveCamera(update, mapId: mapId); + + final VerificationResult verification = verify(api.moveCamera(captureAny)); + final PlatformCameraUpdate passedUpdate = + verification.captured[0] as PlatformCameraUpdate; + final PlatformCameraUpdateZoom typedUpdate = + passedUpdate.cameraUpdate as PlatformCameraUpdateZoom; + expect(typedUpdate.out, true); + }); + testWidgets('Use PlatformViewLink when using surface view', (WidgetTester tester) async { final GoogleMapsFlutterAndroid maps = GoogleMapsFlutterAndroid();