[Map] Remove deprecations from Map

Author: Kocal

src/Map/CHANGELOG.md

@@ -4,13 +4,13 @@
 
 -   Minimum required Symfony version is now 6.4
 -   Minimum required PHP version is now 8.2
+-   Remove `render_map()` Twig function, use `ux_map()` instead
+-   Remove option `title` from `Polygon`, `Polyline`, `Rectangle` and `Circle`, use `infoWindow` instead
+-    Remove property `rawOptions` from `ux:map:*:before-create` events, use `bridgeOptions` instead.
 
 ## 2.30
 
 - Ensure compatibility with PHP 8.5
-
-## 2.30
-
 -  Deprecate option `title` from `Polygon`, `Polyline`, `Rectangle` and `Circle` in favor of `infoWindow`
 
 ## 2.29.0

src/Map/assets/dist/abstract_map_controller.d.ts

@@ -42,41 +42,32 @@ 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;
 }>;
 type CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     center: Point;
     radius: number;
-    title: string | null;
-    rawOptions?: BridgeCircleOptions;
     bridgeOptions?: BridgeCircleOptions;
     extra: ExtraData;
 }>;
 type RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     southWest: Point;
     northEast: Point;
-    title: string | null;
-    rawOptions?: BridgeRectangleOptions;
     bridgeOptions?: BridgeRectangleOptions;
     extra: ExtraData;
 }>;
@@ -86,7 +77,6 @@ type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     position: Point;
     opened: boolean;
     autoClose: boolean;
-    rawOptions?: BridgeInfoWindowOptions;
     bridgeOptions?: BridgeInfoWindowOptions;
     extra: ExtraData;
 };

src/Map/assets/dist/abstract_map_controller.js

@@ -102,12 +102,6 @@ var abstract_map_controller_default = 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, definition });
       draws.set(definition["@id"], drawing);

src/Map/assets/src/abstract_map_controller.ts

@@ -64,11 +64,6 @@ export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = Wit
     title: string | null;
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     icon?: Icon;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the marker constructor, specific to the map provider (e.g.: `L.marker()` for Leaflet).
-     */
-    rawOptions?: BridgeMarkerOptions;
     /**
      * Additional options passed to the Marker constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:marker:before-create` event.
@@ -86,15 +81,6 @@ export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = Wit
 export type PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point> | Array<Array<Point>>;
-    /**
-     * @deprecated since Symfony UX Map 2.29, use "infoWindow" instead
-     */
-    title: string | null;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the polygon constructor, specific to the map provider (e.g.: `L.polygon()` for Leaflet).
-     */
-    rawOptions?: BridgePolygonOptions;
     /**
      * Additional options passed to the Polygon constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:polygon:before-create` event.
@@ -112,15 +98,6 @@ export type PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions> = W
 export type PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point>;
-    /**
-     * @deprecated since Symfony UX Map 2.29, use "infoWindow" instead
-     */
-    title: string | null;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the polyline constructor, specific to the map provider (e.g.: `L.polyline()` for Leaflet).
-     */
-    rawOptions?: BridgePolylineOptions;
     /**
      * Additional options passed to the Polyline constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:polyline:before-create` event.
@@ -139,15 +116,6 @@ export type CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions> = Wit
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     center: Point;
     radius: number;
-    /**
-     * @deprecated since Symfony UX Map 2.29, use "infoWindow" instead
-     */
-    title: string | null;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the circle constructor, specific to the map provider (e.g.: `L.circle()` for Leaflet).
-     */
-    rawOptions?: BridgeCircleOptions;
     /**
      * Additional options passed to the Circle constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:circle:before-create` event.
@@ -166,15 +134,6 @@ export type RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions>
     infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     southWest: Point;
     northEast: Point;
-    /**
-     * @deprecated since Symfony UX Map 2.29, use "infoWindow" instead
-     */
-    title: string | null;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the rectangle constructor, specific to the map provider (e.g.: `L.rectangle()` for Leaflet).
-     */
-    rawOptions?: BridgeRectangleOptions;
     /**
      * Additional options passed to the Rectangle constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:rectangle:before-create` event.
@@ -195,11 +154,6 @@ export type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     position: Point;
     opened: boolean;
     autoClose: boolean;
-    /**
-     * @deprecated since Symfony UX Map 2.27, use "bridgeOptions" instead.
-     * Raw options passed to the info window constructor, specific to the map provider (e.g.: `google.maps.InfoWindow()` for Google Maps).
-     */
-    rawOptions?: BridgeInfoWindowOptions;
     /**
      * Additional options passed to the InfoWindow constructor.
      * These options are specific to the Map Bridge, and can be defined through `ux:map:info-window:before-create` event.
@@ -466,13 +420,6 @@ export default abstract class<
         return ({ definition }: { definition: WithIdentifier<any> }) => {
             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 }) as Draw;
             this.dispatchEvent(eventAfter, { [type]: drawing, definition });
 

src/Map/src/Bridge/Google/assets/dist/map_controller.js

@@ -105,12 +105,6 @@ var abstract_map_controller_default = 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, definition });
       draws.set(definition["@id"], drawing);
@@ -236,12 +230,11 @@ var map_controller_default = class extends abstract_map_controller_default {
   doCreateMarker({
     definition
   }) {
-    const { "@id": _id, position, title, infoWindow, icon, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { "@id": _id, position, title, infoWindow, icon, bridgeOptions = {} } = definition;
     const marker = new _google.maps.marker.AdvancedMarkerElement({
       position,
       title,
       map: this.map,
-      ...rawOptions,
       ...bridgeOptions
     });
     if (infoWindow) {
@@ -258,16 +251,12 @@ var map_controller_default = class extends abstract_map_controller_default {
   doCreatePolygon({
     definition
   }) {
-    const { "@id": _id, points, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { "@id": _id, points, infoWindow, bridgeOptions = {} } = definition;
     const polygon = new _google.maps.Polygon({
       paths: points,
       map: this.map,
-      ...rawOptions,
       ...bridgeOptions
     });
-    if (title) {
-      polygon.set("title", title);
-    }
     if (infoWindow) {
       this.createInfoWindow({ definition: infoWindow, element: polygon });
     }
@@ -279,16 +268,12 @@ var map_controller_default = class extends abstract_map_controller_default {
   doCreatePolyline({
     definition
   }) {
-    const { "@id": _id, points, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { "@id": _id, points, infoWindow, bridgeOptions = {} } = definition;
     const polyline = new _google.maps.Polyline({
       path: points,
       map: this.map,
-      ...rawOptions,
       ...bridgeOptions
     });
-    if (title) {
-      polyline.set("title", title);
-    }
     if (infoWindow) {
       this.createInfoWindow({ definition: infoWindow, element: polyline });
     }
@@ -298,17 +283,13 @@ var map_controller_default = class extends abstract_map_controller_default {
     polyline.setMap(null);
   }
   doCreateCircle({ definition }) {
-    const { "@id": _id, center, radius, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { "@id": _id, center, radius, infoWindow, bridgeOptions = {} } = definition;
     const circle = new _google.maps.Circle({
       center,
       radius,
       map: this.map,
-      ...rawOptions,
       ...bridgeOptions
     });
-    if (title) {
-      circle.set("title", title);
-    }
     if (infoWindow) {
       this.createInfoWindow({ definition: infoWindow, element: circle });
     }
@@ -320,16 +301,12 @@ var map_controller_default = class extends abstract_map_controller_default {
   doCreateRectangle({
     definition
   }) {
-    const { northEast, southWest, title, infoWindow, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { northEast, southWest, infoWindow, bridgeOptions = {} } = definition;
     const rectangle = new _google.maps.Rectangle({
       bounds: new _google.maps.LatLngBounds(southWest, northEast),
       map: this.map,
-      ...rawOptions,
       ...bridgeOptions
     });
-    if (title) {
-      rectangle.set("title", title);
-    }
     if (infoWindow) {
       this.createInfoWindow({ definition: infoWindow, element: rectangle });
     }
@@ -342,7 +319,7 @@ var map_controller_default = class extends abstract_map_controller_default {
     definition,
     element
   }) {
-    const { headerContent, content, opened, autoClose, rawOptions = {}, bridgeOptions = {} } = definition;
+    const { headerContent, content, opened, autoClose, bridgeOptions = {} } = definition;
     let position = null;
     if (element instanceof google.maps.Circle) {
       position = element.getCenter();
@@ -354,7 +331,6 @@ var map_controller_default = class extends abstract_map_controller_default {
       headerContent: this.createTextOrElement(headerContent),
       content: this.createTextOrElement(content),
       position,
-      ...rawOptions,
       ...bridgeOptions
     };
     const infoWindow = new _google.maps.InfoWindow(infoWindowOptions);