[Map] Optional leaflet tilelayer

Author: Danny van Wijk

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

@@ -145,10 +145,12 @@ class map_controller extends default_1 {
             center: center === null ? undefined : center,
             zoom: zoom === null ? undefined : zoom,
         });
-        L.tileLayer(options.tileLayer.url, {
-            attribution: options.tileLayer.attribution,
-            ...options.tileLayer.options,
-        }).addTo(map);
+        if (options.tileLayer) {
+            L.tileLayer(options.tileLayer.url, {
+                attribution: options.tileLayer.attribution,
+                ...options.tileLayer.options,
+            }).addTo(map);
+        }
         return map;
     }
     doCreateMarker({ definition }) {

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

@@ -81,10 +81,12 @@ export default class extends AbstractMapController<
             zoom: zoom === null ? undefined : zoom,
         });
 
-        L.tileLayer(options.tileLayer.url, {
-            attribution: options.tileLayer.attribution,
-            ...options.tileLayer.options,
-        }).addTo(map);
+        if (options.tileLayer) {
+            L.tileLayer(options.tileLayer.url, {
+                attribution: options.tileLayer.attribution,
+                ...options.tileLayer.options,
+            }).addTo(map);
+        }
 
         return map;
     }

src/Map/src/Bridge/Leaflet/src/LeafletOptions.php

@@ -20,14 +20,14 @@
 final class LeafletOptions implements MapOptionsInterface
 {
     public function __construct(
-        private TileLayer $tileLayer = new TileLayer(
+        private TileLayer|false $tileLayer = new TileLayer(
             url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
         ),
     ) {
     }
 
-    public function tileLayer(TileLayer $tileLayer): self
+    public function tileLayer(TileLayer|false $tileLayer): self
     {
         $this->tileLayer = $tileLayer;
 
@@ -40,7 +40,7 @@ public function tileLayer(TileLayer $tileLayer): self
     public static function fromArray(array $array): MapOptionsInterface
     {
         return new self(
-            tileLayer: TileLayer::fromArray($array['tileLayer']),
+            tileLayer: $array['tileLayer'] ? TileLayer::fromArray($array['tileLayer']) : false,
         );
     }
 
@@ -50,7 +50,7 @@ public static function fromArray(array $array): MapOptionsInterface
     public function toArray(): array
     {
         return [
-            'tileLayer' => $this->tileLayer->toArray(),
+            'tileLayer' => $this->tileLayer ? $this->tileLayer->toArray() : false,
         ];
     }
 }

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

@@ -62,4 +62,15 @@ public function testWithMaximumConfiguration(): void
 
         self::assertEquals($leafletOptions, LeafletOptions::fromArray($leafletOptions->toArray()));
     }
+
+    public function testWithTileLayerFalse(): void
+    {
+        $leafletOptions = new LeafletOptions(tileLayer: false);
+
+        self::assertSame([
+            'tileLayer' => false,
+        ], $leafletOptions->toArray());
+
+        self::assertEquals($leafletOptions, LeafletOptions::fromArray($leafletOptions->toArray()));
+    }
 }