fix(google-maps): ensure userData is handled

triniwiz · triniwiz · commit 4c8be91cb89d · 2022-06-18T14:18:42.000-04:00
diff --git a/packages/google-maps/index.android.ts b/packages/google-maps/index.android.ts
@@ -787,31 +787,47 @@ export class GoogleMap implements IGoogleMap {
 	}
 
 	addCircle(options: CircleOptions): Circle {
-		return Circle.fromNative(this.native.addCircle(intoNativeCircleOptions(options)));
+		const circle = Circle.fromNative(this.native.addCircle(intoNativeCircleOptions(options)));
+		if (options?.userData) {
+			circle.userData = options.userData;
+		}
+		return circle;
 	}
 
 	removeCircle(circle: Circle) {
 		circle?.native?.remove?.();
 	}
 
 	addPolygon(options: PolygonOptions): Polygon {
-		return Polygon.fromNative(this.native.addPolygon(intoNativePolygonOptions(options)));
+		const poly = Polygon.fromNative(this.native.addPolygon(intoNativePolygonOptions(options)));
+		if (options?.userData) {
+			poly.userData = options.userData;
+		}
+		return poly;
 	}
 
 	removePolygon(polygon: Polygon) {
 		polygon?.native?.remove?.();
 	}
 
 	addPolyline(options: PolylineOptions): Polyline {
-		return Polyline.fromNative(this.native.addPolyline(intoNativePolylineOptions(options)));
+		const polyline = Polyline.fromNative(this.native.addPolyline(intoNativePolylineOptions(options)));
+		if (options?.userData) {
+			polyline.userData = options.userData;
+		}
+		return polyline;
 	}
 
 	removePolyline(polyline: Polyline) {
 		polyline?.native?.remove?.();
 	}
 
 	addGroundOverlay(options: GroundOverlayOptions): GroundOverlay {
-		return GroundOverlay.fromNative(this.native.addGroundOverlay(intoNativeGroundOverlayOptions(options)));
+		const overlay = GroundOverlay.fromNative(this.native.addGroundOverlay(intoNativeGroundOverlayOptions(options)));
+		if (options?.userData) {
+			overlay.userData = options.userData;
+		}
+		return overlay;
 	}
 
 	removeGroundOverlay(groundOverlay: GroundOverlay) {
diff --git a/packages/google-maps/utils/index.ios.ts b/packages/google-maps/utils/index.ios.ts
@@ -71,6 +71,11 @@ export function intoNativeMarkerOptions(options: MarkerOptions) {
 	if (typeof options?.zIndex === 'number') {
 		opts.zIndex = options.zIndex;
 	}
+
+	if (options?.userData) {
+		opts.userData = serialize(options.userData);
+	}
+
 	return opts;
 }
 
@@ -110,6 +115,11 @@ export function intoNativeCircleOptions(options: CircleOptions) {
 	if (typeof options?.zIndex === 'number') {
 		opts.zIndex = options.zIndex;
 	}
+
+	if (options?.userData) {
+		opts.userData = serialize(options.userData);
+	}
+
 	return opts;
 }
 
@@ -169,6 +179,11 @@ export function intoNativePolygonOptions(options: PolygonOptions) {
 	if (typeof options?.zIndex === 'number') {
 		opts.zIndex = options.zIndex;
 	}
+
+	if (options?.userData) {
+		opts.userData = serialize(options.userData);
+	}
+
 	return opts;
 }
 
@@ -221,6 +236,11 @@ export function intoNativePolylineOptions(options: PolylineOptions) {
 	if (typeof options?.endCap) {
 		// TODO
 	}
+
+	if (options?.userData) {
+		opts.userData = serialize(options.userData);
+	}
+
 	return opts;
 }
 
@@ -270,6 +290,10 @@ export function intoNativeGroundOverlayOptions(options: GroundOverlayOptions) {
 		opts.zIndex = options.zIndex;
 	}
 
+	if (options?.userData) {
+		opts.userData = serialize(options.userData);
+	}
+
 	return opts;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -787,31 +787,47 @@ export class GoogleMap implements IGoogleMap {`
`787`	`787`	`}`
`788`	`788`
`789`	`789`	`addCircle(options: CircleOptions): Circle {`
`790`		`- return Circle.fromNative(this.native.addCircle(intoNativeCircleOptions(options)));`
	`790`	`+ const circle = Circle.fromNative(this.native.addCircle(intoNativeCircleOptions(options)));`
	`791`	`+ if (options?.userData) {`
	`792`	`+ circle.userData = options.userData;`
	`793`	`+ }`
	`794`	`+ return circle;`
`791`	`795`	`}`
`792`	`796`
`793`	`797`	`removeCircle(circle: Circle) {`
`794`	`798`	`circle?.native?.remove?.();`
`795`	`799`	`}`
`796`	`800`
`797`	`801`	`addPolygon(options: PolygonOptions): Polygon {`
`798`		`- return Polygon.fromNative(this.native.addPolygon(intoNativePolygonOptions(options)));`
	`802`	`+ const poly = Polygon.fromNative(this.native.addPolygon(intoNativePolygonOptions(options)));`
	`803`	`+ if (options?.userData) {`
	`804`	`+ poly.userData = options.userData;`
	`805`	`+ }`
	`806`	`+ return poly;`
`799`	`807`	`}`
`800`	`808`
`801`	`809`	`removePolygon(polygon: Polygon) {`
`802`	`810`	`polygon?.native?.remove?.();`
`803`	`811`	`}`
`804`	`812`
`805`	`813`	`addPolyline(options: PolylineOptions): Polyline {`
`806`		`- return Polyline.fromNative(this.native.addPolyline(intoNativePolylineOptions(options)));`
	`814`	`+ const polyline = Polyline.fromNative(this.native.addPolyline(intoNativePolylineOptions(options)));`
	`815`	`+ if (options?.userData) {`
	`816`	`+ polyline.userData = options.userData;`
	`817`	`+ }`
	`818`	`+ return polyline;`
`807`	`819`	`}`
`808`	`820`
`809`	`821`	`removePolyline(polyline: Polyline) {`
`810`	`822`	`polyline?.native?.remove?.();`
`811`	`823`	`}`
`812`	`824`
`813`	`825`	`addGroundOverlay(options: GroundOverlayOptions): GroundOverlay {`
`814`		`- return GroundOverlay.fromNative(this.native.addGroundOverlay(intoNativeGroundOverlayOptions(options)));`
	`826`	`+ const overlay = GroundOverlay.fromNative(this.native.addGroundOverlay(intoNativeGroundOverlayOptions(options)));`
	`827`	`+ if (options?.userData) {`
	`828`	`+ overlay.userData = options.userData;`
	`829`	`+ }`
	`830`	`+ return overlay;`
`815`	`831`	`}`
`816`	`832`
`817`	`833`	`removeGroundOverlay(groundOverlay: GroundOverlay) {`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,11 @@ export function intoNativeMarkerOptions(options: MarkerOptions) {`
`71`	`71`	`if (typeof options?.zIndex === 'number') {`
`72`	`72`	`opts.zIndex = options.zIndex;`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ if (options?.userData) {`
	`76`	`+ opts.userData = serialize(options.userData);`
	`77`	`+ }`
	`78`	`+`
`74`	`79`	`return opts;`
`75`	`80`	`}`
`76`	`81`
`@@ -110,6 +115,11 @@ export function intoNativeCircleOptions(options: CircleOptions) {`
`110`	`115`	`if (typeof options?.zIndex === 'number') {`
`111`	`116`	`opts.zIndex = options.zIndex;`
`112`	`117`	`}`
	`118`	`+`
	`119`	`+ if (options?.userData) {`
	`120`	`+ opts.userData = serialize(options.userData);`
	`121`	`+ }`
	`122`	`+`
`113`	`123`	`return opts;`
`114`	`124`	`}`
`115`	`125`
`@@ -169,6 +179,11 @@ export function intoNativePolygonOptions(options: PolygonOptions) {`
`169`	`179`	`if (typeof options?.zIndex === 'number') {`
`170`	`180`	`opts.zIndex = options.zIndex;`
`171`	`181`	`}`
	`182`	`+`
	`183`	`+ if (options?.userData) {`
	`184`	`+ opts.userData = serialize(options.userData);`
	`185`	`+ }`
	`186`	`+`
`172`	`187`	`return opts;`
`173`	`188`	`}`
`174`	`189`
`@@ -221,6 +236,11 @@ export function intoNativePolylineOptions(options: PolylineOptions) {`
`221`	`236`	`if (typeof options?.endCap) {`
`222`	`237`	`// TODO`
`223`	`238`	`}`
	`239`	`+`
	`240`	`+ if (options?.userData) {`
	`241`	`+ opts.userData = serialize(options.userData);`
	`242`	`+ }`
	`243`	`+`
`224`	`244`	`return opts;`
`225`	`245`	`}`
`226`	`246`
`@@ -270,6 +290,10 @@ export function intoNativeGroundOverlayOptions(options: GroundOverlayOptions) {`
`270`	`290`	`opts.zIndex = options.zIndex;`
`271`	`291`	`}`
`272`	`292`
	`293`	`+ if (options?.userData) {`
	`294`	`+ opts.userData = serialize(options.userData);`
	`295`	`+ }`
	`296`	`+`
`273`	`297`	`return opts;`
`274`	`298`	`}`
`275`	`299`