[Map] Remove "bounds" higher key from normalized Rectangle

Author: Kocal

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

@@ -58,10 +58,8 @@ export type CircleDefinition<CircleOptions, InfoWindowOptions> = WithIdentifier<
 }>;
 export type RectangleDefinition<RectangleOptions, InfoWindowOptions> = WithIdentifier<{
     infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-    bounds: {
-        northEast: Point;
-        southWest: Point;
-    };
+    southWest: Point;
+    northEast: Point;
     title: string | null;
     rawOptions?: RectangleOptions;
     extra: Record<string, unknown>;

src/Map/assets/src/abstract_map_controller.ts

@@ -100,7 +100,8 @@ export type CircleDefinition<CircleOptions, InfoWindowOptions> = WithIdentifier<
 
 export type RectangleDefinition<RectangleOptions, InfoWindowOptions> = WithIdentifier<{
     infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-    bounds: { northEast: Point; southWest: Point };
+    southWest: Point;
+    northEast: Point;
     title: string | null;
     /**
      * Raw options passed to the rectangle constructor, specific to the map provider (e.g.: `L.rectangle()` for Leaflet).

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

@@ -276,10 +276,10 @@ class map_controller extends default_1 {
         circle.setMap(null);
     }
     doCreateRectangle({ definition, }) {
-        const { bounds, title, infoWindow, rawOptions = {} } = definition;
+        const { northEast, southWest, title, infoWindow, rawOptions = {} } = definition;
         const rectangle = new _google.maps.Rectangle({
             ...rawOptions,
-            bounds: new _google.maps.LatLngBounds(bounds.southWest, bounds.northEast),
+            bounds: new _google.maps.LatLngBounds(southWest, northEast),
             map: this.map,
         });
         if (title) {

src/Map/src/Bridge/Google/assets/src/map_controller.ts

@@ -283,11 +283,11 @@ export default class extends AbstractMapController<
     }: {
         definition: RectangleDefinition<google.maps.RectangleOptions, google.maps.InfoWindowOptions>;
     }): google.maps.Rectangle {
-        const { bounds, title, infoWindow, rawOptions = {} } = definition;
+        const { northEast, southWest, title, infoWindow, rawOptions = {} } = definition;
 
         const rectangle = new _google.maps.Rectangle({
             ...rawOptions,
-            bounds: new _google.maps.LatLngBounds(bounds.southWest, bounds.northEast),
+            bounds: new _google.maps.LatLngBounds(southWest, northEast),
             map: this.map,
         });
 

src/Map/src/Bridge/Google/tests/__snapshots__/GoogleRendererTest__testRenderMap with data set with rectangles and infoWindows__1.txt

@@ -11,5 +11,5 @@
   data-symfony--ux-google-map--map-polygons-value="[]"
   data-symfony--ux-google-map--map-polylines-value="[]"
   data-symfony--ux-google-map--map-circles-value="[]"
-  data-symfony--ux-google-map--map-rectangles-value="[{"bounds":{"southWest":{"lat":48.8566,"lng":2.3522},"northEast":{"lat":48.8566,"lng":2.3522}},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":null},{"bounds":{"southWest":{"lat":1.1,"lng":2.2},"northEast":{"lat":3.3,"lng":4.4}},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":null}]"
+  data-symfony--ux-google-map--map-rectangles-value="[{"southWest":{"lat":48.8566,"lng":2.3522},"northEast":{"lat":48.8566,"lng":2.3522},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":null},{"southWest":{"lat":1.1,"lng":2.2},"northEast":{"lat":3.3,"lng":4.4},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":null}]"
 ></div>

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

@@ -240,10 +240,10 @@ class map_controller extends default_1 {
         circle.remove();
     }
     doCreateRectangle({ definition, }) {
-        const { '@id': _id, bounds, title, infoWindow, rawOptions = {} } = definition;
+        const { '@id': _id, southWest, northEast, title, infoWindow, rawOptions = {} } = definition;
         const rectangle = L.rectangle([
-            [bounds.southWest.lat, bounds.southWest.lng],
-            [bounds.northEast.lat, bounds.northEast.lng],
+            [southWest.lat, southWest.lng],
+            [northEast.lat, northEast.lng],
         ], { ...rawOptions }).addTo(this.map);
         if (title) {
             rectangle.bindPopup(title);

src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts

@@ -207,12 +207,12 @@ export default class extends AbstractMapController<
     protected doCreateRectangle({
         definition,
     }: { definition: RectangleDefinition<RectangleOptions, PopupOptions> }): L.Rectangle {
-        const { '@id': _id, bounds, title, infoWindow, rawOptions = {} } = definition;
+        const { '@id': _id, southWest, northEast, title, infoWindow, rawOptions = {} } = definition;
 
         const rectangle = L.rectangle(
             [
-                [bounds.southWest.lat, bounds.southWest.lng],
-                [bounds.northEast.lat, bounds.northEast.lng],
+                [southWest.lat, southWest.lng],
+                [northEast.lat, northEast.lng],
             ],
             { ...rawOptions }
         ).addTo(this.map);

src/Map/src/Bridge/Leaflet/tests/__snapshots__/LeafletRendererTest__testRenderMap with data set with rectangles and infoWindows__1.txt

@@ -11,5 +11,5 @@
   data-symfony--ux-leaflet-map--map-polygons-value="[]"
   data-symfony--ux-leaflet-map--map-polylines-value="[]"
   data-symfony--ux-leaflet-map--map-circles-value="[]"
-  data-symfony--ux-leaflet-map--map-rectangles-value="[{"bounds":{"southWest":{"lat":48.8566,"lng":2.3522},"northEast":{"lat":48.8566,"lng":2.3522}},"title":"Rectangle","infoWindow":null,"extra":[],"id":"rectangle1"},{"bounds":{"southWest":{"lat":1.1,"lng":2.2},"northEast":{"lat":3.3,"lng":4.4}},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":"rectangle2"}]"
+  data-symfony--ux-leaflet-map--map-rectangles-value="[{"southWest":{"lat":48.8566,"lng":2.3522},"northEast":{"lat":48.8566,"lng":2.3522},"title":"Rectangle","infoWindow":null,"extra":[],"id":"rectangle1"},{"southWest":{"lat":1.1,"lng":2.2},"northEast":{"lat":3.3,"lng":4.4},"title":null,"infoWindow":{"headerContent":null,"content":"Rectangle","position":null,"opened":false,"autoClose":true,"extra":[]},"extra":[],"id":"rectangle2"}]"
 ></div>

src/Map/src/Rectangle.php

@@ -34,7 +34,8 @@ public function __construct(
      * Convert the rectangle to an array representation.
      *
      * @return array{
-     *     bounds: array{southWest: array{lat: float, lng: float}, northEast: array{lat: float, lng: float}},
+     *     southWest: array{lat: float, lng: float},
+     *     northEast: array{lat: float, lng: float},
      *     title: string|null,
      *     infoWindow: array<string, mixed>|null,
      *     extra: array,
@@ -44,10 +45,8 @@ public function __construct(
     public function toArray(): array
     {
         return [
-            'bounds' => [
-                'southWest' => $this->southWest->toArray(),
-                'northEast' => $this->northEast->toArray(),
-            ],
+            'southWest' => $this->southWest->toArray(),
+            'northEast' => $this->northEast->toArray(),
             'title' => $this->title,
             'infoWindow' => $this->infoWindow?->toArray(),
             'extra' => $this->extra,
@@ -57,8 +56,8 @@ public function toArray(): array
 
     /**
      * @param array{
-     *     southWest: array{lat: float, lng: float},
-     *     northEast: array{lat: float, lng: float},
+     *     southWest?: array{lat: float, lng: float},
+     *     northEast?: array{lat: float, lng: float},
      *     title?: string|null,
      *     infoWindow?: array<string, mixed>|null,
      *     extra?: array,
@@ -69,11 +68,16 @@ public function toArray(): array
      */
     public static function fromArray(array $rectangle): self
     {
-        if (!isset($rectangle['southWest'], $rectangle['northEast'])) {
-            throw new InvalidArgumentException('The points "southWest" and "northEast" are required.');
+        if (!isset($rectangle['southWest'])) {
+            throw new InvalidArgumentException('The "southWest" point is required to create a Rectangle.');
         }
 
         $rectangle['southWest'] = Point::fromArray($rectangle['southWest']);
+
+        if (!isset($rectangle['northEast'])) {
+            throw new InvalidArgumentException('The "northEast" point is required to create a Rectangle.');
+        }
+
         $rectangle['northEast'] = Point::fromArray($rectangle['northEast']);
 
         if (isset($rectangle['infoWindow'])) {

src/Map/tests/MapTest.php

@@ -371,10 +371,8 @@ public function testWithMaximumConfiguration(): void
             ],
             'rectangles' => [
                 [
-                    'bounds' => [
-                        'southWest' => ['lat' => 48.853, 'lng' => 2.3499],
-                        'northEast' => ['lat' => 48.8566, 'lng' => 2.3522],
-                    ],
+                    'southWest' => ['lat' => 48.853, 'lng' => 2.3499],
+                    'northEast' => ['lat' => 48.8566, 'lng' => 2.3522],
                     'title' => 'Rectangle around Paris',
                     'infoWindow' => [
                         'headerContent' => '<b>Rectangle around Paris</b>',
@@ -388,10 +386,8 @@ public function testWithMaximumConfiguration(): void
                     'id' => null,
                 ],
                 [
-                    'bounds' => [
-                        'southWest' => ['lat' => 45.75, 'lng' => 4.85],
-                        'northEast' => ['lat' => 45.77, 'lng' => 4.82],
-                    ],
+                    'southWest' => ['lat' => 45.75, 'lng' => 4.85],
+                    'northEast' => ['lat' => 45.77, 'lng' => 4.82],
                     'title' => 'Rectangle around Lyon',
                     'infoWindow' => [
                         'headerContent' => '<b>Rectangle around Lyon</b>',