@symfony/ux-leaflet-map 2.35.0 → 3.0.0

package/README.md

@@ -19,7 +19,7 @@ npm add @symfony/ux-leaflet-map@2.23.0
 
 ## Resources
 
-- [Documentation](https://github.com/symfony/ux/tree/2.x/src/Map/src/Bridge/Google)
+- [Documentation](https://github.com/symfony/ux/tree/3.x/src/Map/src/Bridge/Google)
 - [Report issues](https://github.com/symfony/ux/issues) and
   [send Pull Requests](https://github.com/symfony/ux/pulls)
   in the [main Symfony UX repository](https://github.com/symfony/ux)

package/dist/map_controller.d.ts

@@ -43,23 +43,18 @@ type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = WithIdenti
   title: string | null;
   infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
   icon?: Icon;
-  rawOptions?: BridgeMarkerOptions;
   bridgeOptions?: BridgeMarkerOptions;
   extra: ExtraData;
 }>;
 type PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
   infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
   points: Array<Point> | Array<Array<Point>>;
-  title: string | null;
-  rawOptions?: BridgePolygonOptions;
   bridgeOptions?: BridgePolygonOptions;
   extra: ExtraData;
 }>;
 type PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
   infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
   points: Array<Point>;
-  title: string | null;
-  rawOptions?: BridgePolylineOptions;
   bridgeOptions?: BridgePolylineOptions;
   extra: ExtraData;
 }>;
@@ -67,8 +62,6 @@ type CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions> = WithIdenti
   infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
   center: Point;
   radius: number;
-  title: string | null;
-  rawOptions?: BridgeCircleOptions;
   bridgeOptions?: BridgeCircleOptions;
   extra: ExtraData;
 }>;
@@ -76,8 +69,6 @@ type RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions> = With
   infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
   southWest: Point;
   northEast: Point;
-  title: string | null;
-  rawOptions?: BridgeRectangleOptions;
   bridgeOptions?: BridgeRectangleOptions;
   extra: ExtraData;
 }>;
@@ -87,7 +78,6 @@ type InfoWindowDefinition<BridgeInfoWindowOptions> = {
   position: Point;
   opened: boolean;
   autoClose: boolean;
-  rawOptions?: BridgeInfoWindowOptions;
   bridgeOptions?: BridgeInfoWindowOptions;
   extra: ExtraData;
 };

package/dist/map_controller.js

@@ -105,7 +105,6 @@ var _Class = class extends Controller {
 		const eventAfter = `${type}:after-create`;
 		return ({ definition }) => {
 			this.dispatchEvent(eventBefore, { definition });
-			if (typeof definition.rawOptions !== "undefined") console.warn(`[Symfony UX Map] The event "${eventBefore}" added a deprecated "rawOptions" property to the definition, it will be removed in a next major version, replace it with "bridgeOptions" instead.`, definition);
 			const drawing = factory({ definition });
 			this.dispatchEvent(eventAfter, {
 				[type]: drawing,
@@ -195,12 +194,11 @@ var map_controller_default = class extends _Class {
 		return map;
 	}
 	doCreateMarker({ definition }) {
-		const { "@id": _id, position, title, infoWindow, icon, rawOptions = {}, bridgeOptions = {} } = definition;
+		const { "@id": _id, position, title, infoWindow, icon, bridgeOptions = {} } = definition;
 		const marker = L.marker(position, {
 			title: title || void 0,
-			...rawOptions,
-			...bridgeOptions,
-			riseOnHover: true
+			riseOnHover: true,
+			...bridgeOptions
 		}).addTo(this.map);
 		if (infoWindow) this.createInfoWindow({
 			definition: infoWindow,
@@ -208,7 +206,6 @@ var map_controller_default = class extends _Class {
 		});
 		if (icon) {
 			if (Object.prototype.hasOwnProperty.call(bridgeOptions, "icon")) console.warn("[Symfony UX Map] Defining \"bridgeOptions.icon\" for a marker with a custom icon is not supported and will be ignored.");
-			else if (Object.prototype.hasOwnProperty.call(rawOptions, "icon")) console.warn("[Symfony UX Map] Defining \"rawOptions.icon\" for a marker with a custom icon is not supported and will be ignored.");
 			this.doCreateIcon({
 				definition: icon,
 				element: marker
@@ -220,15 +217,8 @@ var map_controller_default = class extends _Class {
 		marker.remove();
 	}
 	doCreatePolygon({ definition }) {
-		const { "@id": _id, points, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
-		const polygon = L.polygon(points, {
-			...rawOptions,
-			...bridgeOptions
-		}).addTo(this.map);
-		/**
-		* @deprecated since Symfony UX Map 2.29
-		*/
-		if (title) polygon.bindPopup(title);
+		const { "@id": _id, points, infoWindow, bridgeOptions = {} } = definition;
+		const polygon = L.polygon(points, { ...bridgeOptions }).addTo(this.map);
 		if (infoWindow) this.createInfoWindow({
 			definition: infoWindow,
 			element: polygon
@@ -239,15 +229,8 @@ var map_controller_default = class extends _Class {
 		polygon.remove();
 	}
 	doCreatePolyline({ definition }) {
-		const { "@id": _id, points, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
-		const polyline = L.polyline(points, {
-			...rawOptions,
-			...bridgeOptions
-		}).addTo(this.map);
-		/**
-		* @deprecated since Symfony UX Map 2.29
-		*/
-		if (title) polyline.bindPopup(title);
+		const { "@id": _id, points, infoWindow, bridgeOptions = {} } = definition;
+		const polyline = L.polyline(points, { ...bridgeOptions }).addTo(this.map);
 		if (infoWindow) this.createInfoWindow({
 			definition: infoWindow,
 			element: polyline
@@ -258,16 +241,11 @@ var map_controller_default = class extends _Class {
 		polyline.remove();
 	}
 	doCreateCircle({ definition }) {
-		const { "@id": _id, center, radius, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
+		const { "@id": _id, center, radius, infoWindow, bridgeOptions = {} } = definition;
 		const circle = L.circle(center, {
 			radius,
-			...rawOptions,
 			...bridgeOptions
 		}).addTo(this.map);
-		/**
-		* @deprecated since Symfony UX Map 2.29
-		*/
-		if (title) circle.bindPopup(title);
 		if (infoWindow) this.createInfoWindow({
 			definition: infoWindow,
 			element: circle
@@ -278,15 +256,8 @@ var map_controller_default = class extends _Class {
 		circle.remove();
 	}
 	doCreateRectangle({ definition }) {
-		const { "@id": _id, southWest, northEast, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
-		const rectangle = L.rectangle([[southWest.lat, southWest.lng], [northEast.lat, northEast.lng]], {
-			...rawOptions,
-			...bridgeOptions
-		}).addTo(this.map);
-		/**
-		* @deprecated since Symfony UX Map 2.29
-		*/
-		if (title) rectangle.bindPopup(title);
+		const { "@id": _id, southWest, northEast, infoWindow, bridgeOptions = {} } = definition;
+		const rectangle = L.rectangle([[southWest.lat, southWest.lng], [northEast.lat, northEast.lng]], { ...bridgeOptions }).addTo(this.map);
 		if (infoWindow) this.createInfoWindow({
 			definition: infoWindow,
 			element: rectangle
@@ -297,11 +268,8 @@ var map_controller_default = class extends _Class {
 		rectangle.remove();
 	}
 	doCreateInfoWindow({ definition, element }) {
-		const { headerContent, content, opened, autoClose, rawOptions = {}, bridgeOptions = {} } = definition;
-		element.bindPopup([headerContent, content].filter((x) => x).join("<br>"), {
-			...rawOptions,
-			...bridgeOptions
-		});
+		const { headerContent, content, opened, autoClose, bridgeOptions = {} } = definition;
+		element.bindPopup([headerContent, content].filter((x) => x).join("<br>"), { ...bridgeOptions });
 		if (opened) {
 			if (autoClose) this.closePopups();
 			setTimeout(() => element.openPopup(), 0);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symfony/ux-leaflet-map",
   "description": "Leaflet bridge for Symfony UX Map, integrate interactive maps in your Symfony applications",
   "license": "MIT",
-  "version": "2.35.0",
+  "version": "3.0.0",
   "keywords": [
     "symfony-ux",
     "leaflet",