[Map] Fix default values of Stimulus Map Controller

Kocal · Kocal · commit 4cb91efaaffc · 2024-12-03T15:58:57.000+01:00
diff --git a/src/Map/assets/dist/abstract_map_controller.d.ts b/src/Map/assets/dist/abstract_map_controller.d.ts
@@ -56,6 +56,13 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
     polygonsValue: Array<PolygonDefinition<PolygonOptions, InfoWindowOptions>>;
     polylinesValue: Array<PolylineDefinition<PolylineOptions, InfoWindowOptions>>;
     optionsValue: MapOptions;
+    hasCenterValue: boolean;
+    hasZoomValue: boolean;
+    hasFitBoundsToMarkersValue: boolean;
+    hasMarkersValue: boolean;
+    hasPolygonsValue: boolean;
+    hasPolylinesValue: boolean;
+    hasOptionsValue: boolean;
     protected map: Map;
     protected markers: globalThis.Map<string, Marker>;
     protected polygons: globalThis.Map<string, Polygon>;
diff --git a/src/Map/assets/dist/abstract_map_controller.js b/src/Map/assets/dist/abstract_map_controller.js
@@ -15,7 +15,11 @@ class default_1 extends Controller {
         this.createMarker = this.createDrawingFactory('marker', this.markers, this.doCreateMarker.bind(this));
         this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));
         this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));
-        this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });
+        this.map = this.doCreateMap({
+            center: this.hasCenterValue ? this.centerValue : null,
+            zoom: this.hasZoomValue ? this.zoomValue : null,
+            options,
+        });
         this.markersValue.forEach((definition) => this.createMarker({ definition }));
         this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));
         this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));
diff --git a/src/Map/assets/src/abstract_map_controller.ts b/src/Map/assets/src/abstract_map_controller.ts
@@ -112,6 +112,14 @@ export default abstract class<
     declare polylinesValue: Array<PolylineDefinition<PolylineOptions, InfoWindowOptions>>;
     declare optionsValue: MapOptions;
 
+    declare hasCenterValue: boolean;
+    declare hasZoomValue: boolean;
+    declare hasFitBoundsToMarkersValue: boolean;
+    declare hasMarkersValue: boolean;
+    declare hasPolygonsValue: boolean;
+    declare hasPolylinesValue: boolean;
+    declare hasOptionsValue: boolean;
+
     protected map: Map;
     protected markers = new Map<Identifier, Marker>();
     protected polygons = new Map<Identifier, Polygon>();
@@ -140,7 +148,11 @@ export default abstract class<
         this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));
         this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));
 
-        this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });
+        this.map = this.doCreateMap({
+            center: this.hasCenterValue ? this.centerValue : null,
+            zoom: this.hasZoomValue ? this.zoomValue : null,
+            options,
+        });
         this.markersValue.forEach((definition) => this.createMarker({ definition }));
         this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));
         this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));
diff --git a/src/Map/src/Bridge/Google/assets/dist/map_controller.js b/src/Map/src/Bridge/Google/assets/dist/map_controller.js
@@ -16,7 +16,11 @@ class default_1 extends Controller {
         this.createMarker = this.createDrawingFactory('marker', this.markers, this.doCreateMarker.bind(this));
         this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));
         this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));
-        this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });
+        this.map = this.doCreateMap({
+            center: this.hasCenterValue ? this.centerValue : null,
+            zoom: this.hasZoomValue ? this.zoomValue : null,
+            options,
+        });
         this.markersValue.forEach((definition) => this.createMarker({ definition }));
         this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));
         this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));
@@ -121,12 +125,12 @@ class map_controller extends default_1 {
         super.connect();
     }
     centerValueChanged() {
-        if (this.map && this.centerValue) {
+        if (this.map && this.hasCenterValue && this.centerValue) {
             this.map.setCenter(this.centerValue);
         }
     }
     zoomValueChanged() {
-        if (this.map && this.zoomValue) {
+        if (this.map && this.hasZoomValue && this.zoomValue) {
             this.map.setZoom(this.zoomValue);
         }
     }
diff --git a/src/Map/src/Bridge/Google/assets/src/map_controller.ts b/src/Map/src/Bridge/Google/assets/src/map_controller.ts
@@ -86,13 +86,13 @@ export default class extends AbstractMapController<
     }
 
     public centerValueChanged(): void {
-        if (this.map && this.centerValue) {
+        if (this.map && this.hasCenterValue && this.centerValue) {
             this.map.setCenter(this.centerValue);
         }
     }
 
     public zoomValueChanged(): void {
-        if (this.map && this.zoomValue) {
+        if (this.map && this.hasZoomValue && this.zoomValue) {
             this.map.setZoom(this.zoomValue);
         }
     }
diff --git a/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.js b/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.js
@@ -17,7 +17,11 @@ class default_1 extends Controller {
         this.createMarker = this.createDrawingFactory('marker', this.markers, this.doCreateMarker.bind(this));
         this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));
         this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));
-        this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });
+        this.map = this.doCreateMap({
+            center: this.hasCenterValue ? this.centerValue : null,
+            zoom: this.hasZoomValue ? this.zoomValue : null,
+            options,
+        });
         this.markersValue.forEach((definition) => this.createMarker({ definition }));
         this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));
         this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));
@@ -112,12 +116,12 @@ class map_controller extends default_1 {
         super.connect();
     }
     centerValueChanged() {
-        if (this.map && this.centerValue && this.zoomValue) {
+        if (this.map && this.hasCenterValue && this.centerValue && this.hasZoomValue && this.zoomValue) {
             this.map.setView(this.centerValue, this.zoomValue);
         }
     }
     zoomValueChanged() {
-        if (this.map && this.zoomValue) {
+        if (this.map && this.hasZoomValue && this.zoomValue) {
             this.map.setZoom(this.zoomValue);
         }
     }
diff --git a/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts b/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts
@@ -48,13 +48,13 @@ export default class extends AbstractMapController<
     }
 
     public centerValueChanged(): void {
-        if (this.map && this.centerValue && this.zoomValue) {
+        if (this.map && this.hasCenterValue && this.centerValue && this.hasZoomValue && this.zoomValue) {
             this.map.setView(this.centerValue, this.zoomValue);
         }
     }
 
     public zoomValueChanged(): void {
-        if (this.map && this.zoomValue) {
+        if (this.map && this.hasZoomValue && this.zoomValue) {
             this.map.setZoom(this.zoomValue);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ class default_1 extends Controller {`
`16`	`16`	`this.createMarker = this.createDrawingFactory('marker', this.markers, this.doCreateMarker.bind(this));`
`17`	`17`	`this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));`
`18`	`18`	`this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));`
`19`		`- this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });`
	`19`	`+ this.map = this.doCreateMap({`
	`20`	`+ center: this.hasCenterValue ? this.centerValue : null,`
	`21`	`+ zoom: this.hasZoomValue ? this.zoomValue : null,`
	`22`	`+ options,`
	`23`	`+ });`
`20`	`24`	`this.markersValue.forEach((definition) => this.createMarker({ definition }));`
`21`	`25`	`this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));`
`22`	`26`	`this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));`
`@@ -121,12 +125,12 @@ class map_controller extends default_1 {`
`121`	`125`	`super.connect();`
`122`	`126`	`}`
`123`	`127`	`centerValueChanged() {`
`124`		`- if (this.map && this.centerValue) {`
	`128`	`+ if (this.map && this.hasCenterValue && this.centerValue) {`
`125`	`129`	`this.map.setCenter(this.centerValue);`
`126`	`130`	`}`
`127`	`131`	`}`
`128`	`132`	`zoomValueChanged() {`
`129`		`- if (this.map && this.zoomValue) {`
	`133`	`+ if (this.map && this.hasZoomValue && this.zoomValue) {`
`130`	`134`	`this.map.setZoom(this.zoomValue);`
`131`	`135`	`}`
`132`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ export default class extends AbstractMapController<`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public centerValueChanged(): void {`
`89`		`- if (this.map && this.centerValue) {`
	`89`	`+ if (this.map && this.hasCenterValue && this.centerValue) {`
`90`	`90`	`this.map.setCenter(this.centerValue);`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public zoomValueChanged(): void {`
`95`		`- if (this.map && this.zoomValue) {`
	`95`	`+ if (this.map && this.hasZoomValue && this.zoomValue) {`
`96`	`96`	`this.map.setZoom(this.zoomValue);`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ class default_1 extends Controller {`
`17`	`17`	`this.createMarker = this.createDrawingFactory('marker', this.markers, this.doCreateMarker.bind(this));`
`18`	`18`	`this.createPolygon = this.createDrawingFactory('polygon', this.polygons, this.doCreatePolygon.bind(this));`
`19`	`19`	`this.createPolyline = this.createDrawingFactory('polyline', this.polylines, this.doCreatePolyline.bind(this));`
`20`		`- this.map = this.doCreateMap({ center: this.centerValue, zoom: this.zoomValue, options });`
	`20`	`+ this.map = this.doCreateMap({`
	`21`	`+ center: this.hasCenterValue ? this.centerValue : null,`
	`22`	`+ zoom: this.hasZoomValue ? this.zoomValue : null,`
	`23`	`+ options,`
	`24`	`+ });`
`21`	`25`	`this.markersValue.forEach((definition) => this.createMarker({ definition }));`
`22`	`26`	`this.polygonsValue.forEach((definition) => this.createPolygon({ definition }));`
`23`	`27`	`this.polylinesValue.forEach((definition) => this.createPolyline({ definition }));`
`@@ -112,12 +116,12 @@ class map_controller extends default_1 {`
`112`	`116`	`super.connect();`
`113`	`117`	`}`
`114`	`118`	`centerValueChanged() {`
`115`		`- if (this.map && this.centerValue && this.zoomValue) {`
	`119`	`+ if (this.map && this.hasCenterValue && this.centerValue && this.hasZoomValue && this.zoomValue) {`
`116`	`120`	`this.map.setView(this.centerValue, this.zoomValue);`
`117`	`121`	`}`
`118`	`122`	`}`
`119`	`123`	`zoomValueChanged() {`
`120`		`- if (this.map && this.zoomValue) {`
	`124`	`+ if (this.map && this.hasZoomValue && this.zoomValue) {`
`121`	`125`	`this.map.setZoom(this.zoomValue);`
`122`	`126`	`}`
`123`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ export default class extends AbstractMapController<`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public centerValueChanged(): void {`
`51`		`- if (this.map && this.centerValue && this.zoomValue) {`
	`51`	`+ if (this.map && this.hasCenterValue && this.centerValue && this.hasZoomValue && this.zoomValue) {`
`52`	`52`	`this.map.setView(this.centerValue, this.zoomValue);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public zoomValueChanged(): void {`
`57`		`- if (this.map && this.zoomValue) {`
	`57`	`+ if (this.map && this.hasZoomValue && this.zoomValue) {`
`58`	`58`	`this.map.setZoom(this.zoomValue);`
`59`	`59`	`}`
`60`	`60`	`}`