fix review & pipeline

Author: Valmonzo

src/Map/CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## 2.28
+
 -   Add support for creating `Circle` by passing a `Point` and a radius in meters to the `Circle` constructor, e.g.:
 ```php
 $map->addCircle(new Circle(

src/Map/assets/src/abstract_map_controller.ts

@@ -370,7 +370,11 @@ export default abstract class<
         factory: typeof this.doCreateCircle
     ): typeof this.doCreateCircle;
     private createDrawingFactory<
-        Factory extends typeof this.doCreateMarker | typeof this.doCreatePolygon | typeof this.doCreatePolyline | typeof this.doCreateCircle,
+        Factory extends
+            | typeof this.doCreateMarker
+            | typeof this.doCreatePolygon
+            | typeof this.doCreatePolyline
+            | typeof this.doCreateCircle,
         Draw extends ReturnType<Factory>,
     >(
         type: 'marker' | 'polygon' | 'polyline' | 'circle',

src/Map/assets/test/abstract_map_controller.test.ts

@@ -128,7 +128,8 @@ describe('AbstractMapController', () => {
             ])
         );
         expect(controller.polylines).toEqual(new Map([['0fa955da866c7720', { polyline: 'polyline', title: null }]]));
-        expect(controller.circles).toEqual(new Map([['7c3e1a9b5f2d4e81', { circle: 'circle', title: null }]]));        expect(controller.infoWindows).toEqual([
+        expect(controller.circles).toEqual(new Map([['7c3e1a9b5f2d4e81', { circle: 'circle', title: null }]]));
+        expect(controller.infoWindows).toEqual([
             {
                 headerContent: 'Paris',
                 infoWindow: 'infoWindow',

src/Map/doc/index.rst

@@ -209,7 +209,7 @@ You can add Polylines, which represents a path made by a series of ``Point`` ins
     ));
 
 Add Circles
-~~~~~~~~~~
+~~~~~~~~~~~
 
 You can add Circles, which represents a circular area defined by a center point and a radius (in meters)::
 

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

@@ -11,13 +11,13 @@ import type { LoaderOptions } from '@googlemaps/js-api-loader';
 import { Loader } from '@googlemaps/js-api-loader';
 import AbstractMapController, { IconTypes } from '@symfony/ux-map';
 import type {
+    CircleDefinition,
     Icon,
     InfoWindowWithoutPositionDefinition,
     MarkerDefinition,
     Point,
     PolygonDefinition,
     PolylineDefinition,
-    CircleDefinition,
 } from '@symfony/ux-map';
 
 type MapOptions = Pick<

src/Map/src/Bridge/Google/tests/GoogleRendererTest.php

@@ -14,6 +14,7 @@
 use Symfony\UX\Icons\IconRendererInterface;
 use Symfony\UX\Map\Bridge\Google\GoogleOptions;
 use Symfony\UX\Map\Bridge\Google\Renderer\GoogleRenderer;
+use Symfony\UX\Map\Circle;
 use Symfony\UX\Map\Icon\Icon;
 use Symfony\UX\Map\Icon\UxIconRenderer;
 use Symfony\UX\Map\InfoWindow;
@@ -101,6 +102,15 @@ public static function provideTestRenderMap(): iterable
                 ->addPolyline(new Polyline(points: [new Point(1.1, 2.2), new Point(3.3, 4.4), new Point(5.5, 6.6)], infoWindow: new InfoWindow(content: 'Polygon'))),
         ];
 
+        yield 'with circles and infoWindows' => [
+            'renderer' => new GoogleRenderer(new StimulusHelper(null), new UxIconRenderer(null), apiKey: 'api_key'),
+            'map' => (new Map())
+                ->center(new Point(48.8566, 2.3522))
+                ->zoom(12)
+                ->addCircle(new Circle(center: new Point(48.8566, 2.3522), radius: 500, infoWindow: new InfoWindow(content: 'Circle')))
+                ->addCircle(new Circle(center: new Point(1.1, 2.2), radius: 1000, infoWindow: new InfoWindow(content: 'Circle'))),
+        ];
+
         yield 'with controls enabled' => [
             'renderer' => new GoogleRenderer(new StimulusHelper(null), new UxIconRenderer(null), apiKey: 'api_key'),
             'map' => (new Map())

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

@@ -1,24 +1,24 @@
 import AbstractMapController, { IconTypes } from '@symfony/ux-map';
 import type {
+    CircleDefinition,
     Icon,
     InfoWindowWithoutPositionDefinition,
     MarkerDefinition,
     Point,
     PolygonDefinition,
     PolylineDefinition,
-    CircleDefinition,
 } from '@symfony/ux-map';
 import 'leaflet/dist/leaflet.min.css';
 import * as L from 'leaflet';
-import {
+import type {
+    CircleOptions,
     ControlPosition,
     LatLngBoundsExpression,
     MapOptions as LeafletMapOptions,
     MarkerOptions,
     PolylineOptions as PolygonOptions,
     PolylineOptions,
     PopupOptions,
-    CircleOptions,
 } from 'leaflet';
 
 type MapOptions = Pick<LeafletMapOptions, 'center' | 'zoom' | 'attributionControl' | 'zoomControl'> & {
@@ -180,12 +180,10 @@ export default class extends AbstractMapController<
         polyline.remove();
     }
 
-    protected doCreateCircle({
-        definition,
-    }: { definition: CircleDefinition<CircleOptions, PopupOptions> }): L.Circle {
+    protected doCreateCircle({ definition }: { definition: CircleDefinition<CircleOptions, PopupOptions> }): L.Circle {
         const { '@id': _id, center, radius, title, infoWindow, rawOptions = {} } = definition;
 
-        const circle = L.circle(center, {radius, ...rawOptions }).addTo(this.map);
+        const circle = L.circle(center, { radius, ...rawOptions }).addTo(this.map);
 
         if (title) {
             circle.bindPopup(title);

src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\UX\Icons\IconRendererInterface;
 use Symfony\UX\Map\Bridge\Leaflet\Renderer\LeafletRenderer;
+use Symfony\UX\Map\Circle;
 use Symfony\UX\Map\Icon\Icon;
 use Symfony\UX\Map\Icon\UxIconRenderer;
 use Symfony\UX\Map\InfoWindow;
@@ -96,6 +97,15 @@ public static function provideTestRenderMap(): iterable
                 ->addPolyline(new Polyline(points: [new Point(1.1, 2.2), new Point(3.3, 4.4), new Point(5.5, 6.6)], infoWindow: new InfoWindow(content: 'Polyline'), id: 'polyline2')),
         ];
 
+        yield 'with circles and infoWindows' => [
+            'renderer' => new LeafletRenderer(new StimulusHelper(null), new UxIconRenderer(null)),
+            'map' => (new Map())
+                ->center(new Point(48.8566, 2.3522))
+                ->zoom(12)
+                ->addCircle(new Circle(center: new Point(48.8566, 2.3522), radius: 1000000, title: 'Paris', id: 'circle1'))
+                ->addCircle(new Circle(center: new Point(1.1, 2.2), radius: 500, infoWindow: new InfoWindow(content: 'Circle'), id: 'circle2')),
+        ];
+
         yield 'markers with icons' => [
             'renderer' => new LeafletRenderer(
                 new StimulusHelper(null),

src/Map/src/Circle.php

@@ -16,7 +16,7 @@
 /**
  * Represents a circle on a map.
  *
- * @author Symfony Community
+ * @author Valmont Pehaut-Pietri <[email protected]>
  */
 final class Circle implements Element
 {

src/Map/src/Circles.php

@@ -14,7 +14,7 @@
 /**
  * Represents a Circle collection.
  *
- * @author Symfony Community
+ * @author Valmont Pehaut-Pietri <[email protected]>
  *
  * @internal
  */