mend

Author: sblondeau

src/Map/config/services.php

@@ -25,36 +25,36 @@
 return static function (ContainerConfigurator $container): void {
     $container->services()
         ->set('ux_map.renderers', Renderers::class)
-        ->factory([service('ux_map.renderer_factory'), 'fromStrings'])
-        ->args([
-            abstract_arg('renderers configuration'),
-        ])
+            ->factory([service('ux_map.renderer_factory'), 'fromStrings'])
+            ->args([
+                abstract_arg('renderers configuration'),
+            ])
 
         ->set('.ux_map.ux_icons.renderer', UxIconRenderer::class)
-        ->args([
-            service('.ux_icons.icon_renderer')->nullOnInvalid(),
-        ])
+            ->args([
+                service('.ux_icons.icon_renderer')->nullOnInvalid(),
+            ])
 
         ->set('ux_map.renderer_factory.abstract', AbstractRendererFactory::class)
-        ->abstract()
-        ->args([
-            service('stimulus.helper'),
-            service('.ux_map.ux_icons.renderer')->nullOnInvalid(),
-        ])
+            ->abstract()
+            ->args([
+                service('stimulus.helper'),
+                service('.ux_map.ux_icons.renderer')->nullOnInvalid(),
+            ])
 
         ->set('ux_map.renderer_factory', Renderer::class)
-        ->args([
-            tagged_iterator('ux_map.renderer_factory'),
-        ])
+            ->args([
+                tagged_iterator('ux_map.renderer_factory'),
+            ])
 
         ->set('ux_map.twig_extension', MapExtension::class)
-        ->tag('twig.extension')
+            ->tag('twig.extension')
 
         ->set('ux_map.twig_runtime', MapRuntime::class)
-        ->args([
-            service('ux_map.renderers'),
-        ])
-        ->tag('twig.runtime')
-        ->tag('ux.twig_component.twig_renderer', ['key' => 'ux:map'])
+            ->args([
+                service('ux_map.renderers'),
+            ])
+            ->tag('twig.runtime')
+            ->tag('ux.twig_component.twig_renderer', ['key' => 'ux:map'])
     ;
 };

src/Map/doc/index.rst

@@ -135,35 +135,19 @@ You can add markers to a map using the ``addMarker()`` method::
 Add Marker icons
 ~~~~~~~~~~~~~~~~
 
-It is possible to add icon to Marker::
-
+.. versionadded:: 2.24
+    ``Marker`` icon customizatisation is available since UX Map 2.24.
+When returning a Map, it's quite common to want to customize ``Marker`` icon. It is possible thanks to ``icon`` parameter and ``Icon`` class::
+        // It can be a UX Icon (requires `symfony/ux-icons`)
+        $icon = Icon::fromUxIcon('fa:map-marker');
+        // Or an URL pointing to an image
+        $icon = Icon::fromUrl('https://example.com/marker.png');
+        // Or a plain SVG content
+        $icon = Icon::fromInlineSVG('<svg>(...)</svg>');
         new Marker(
-            position: new Point(45.7640, 4.8357),
-            title: 'Lyon',
-            infoWindow: new InfoWindow(
-                headerContent: '<b>Lyon</b>',
-                content: 'The French town in the historic Rhône-Alpes region, located at the junction of the Rhône and Saône rivers.'
-            ),
-            icon: Icon::fromInlineSvg(
-                svg: '<svg>....</svg>'
-            )
-        ))
-
-You can add image icon (type 'url')::
-
-    Icon::fromUrl(
-        url: 'https://my-image.png',
-        width: 24, // default
-        height: 24, // default
-    )
-
-or SVG icon (type 'html')::
-
-    Icon::fromInlineSvg(
-        svg: '<svg>...</svg>',
-        width: 36,
-        height: 36, 
-    )
+            // ...
+            icon: $icon
+))
 
 Remove elements from Map
 ~~~~~~~~~~~~~~~~~~~~~~~~

src/Map/src/Icon/Icon.php

@@ -20,6 +20,10 @@
  */
 class Icon
 {
+    public const TYPE_URL = "url";
+    public const TYPE_INLINE_SVG = "inline-svg";
+    public const TYPE_UX_ICON = "ux-icon";
+
     private function __construct(
         public string $content,
         public string $type,
@@ -42,7 +46,7 @@ public static function fromUrl(string $url, int $width = 24, int $height = 24):
     {
         return new Url(
             content: $url,
-            type: 'url',
+            type: self::TYPE_URL,
             width: $width,
             height: $height
         );
@@ -52,7 +56,7 @@ public static function fromInlineSVG(string $html, int $width = 24, int $height
     {
         return new InlineSvg(
             content: $html,
-            type: 'inline-svg',
+            type: self::TYPE_INLINE_SVG,
             width: $width,
             height: $height
         );
@@ -62,7 +66,7 @@ public static function fromUxIcon(string $name, int $width = 24, int $height = 2
     {
         return new UxIcon(
             content: $name,
-            type: 'ux-icon',
+            type: self::TYPE_UX_ICON,
             width: $width,
             height: $height
         );

src/Map/src/Icon/Icon.php.orig

@@ -43,13 +43,13 @@ public function configure(DefinitionConfigurator $definition): void
         $rootNode = $definition->rootNode();
         $rootNode
             ->children()
-            ->scalarNode('renderer')->defaultNull()->end()
-            ->arrayNode('google_maps')
-            ->addDefaultsIfNotSet()
-            ->children()
-            ->scalarNode('default_map_id')->defaultNull()->end()
-            ->end()
-            ->end()
+                ->scalarNode('renderer')->defaultNull()->end()
+                ->arrayNode('google_maps')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('default_map_id')->defaultNull()->end()
+                    ->end()
+                ->end()
             ->end()
         ;
     }