fix webmap.js 传参错误

xilanhuaweidapao · xilanhuaweidapao · commit c40e741e0c60 · 2024-08-08T10:01:54.000+08:00
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -15,7 +15,7 @@ const l7LayerUtil = L7LayerUtil({ featureFilter, expression, spec, L7Layer, L7 }
 export class WebMap extends createWebMapExtending(mapboxgl.Evented, { mapRepo: mapboxgl }) {
 
   _createWebMapV2(commonOptions, mapOptions) {
-    const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(mapboxgl.Evented)), { MapManager, mapRepo: mapboxgl });
+    const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(mapboxgl.Evented), 'fire'), { MapManager, mapRepo: mapboxgl });
     const webMapHandler = new WebMapV2(this.mapId, commonOptions, mapOptions, this.layerFilter);
     return webMapHandler;
   }
@@ -35,7 +35,7 @@ export class WebMap extends createWebMapExtending(mapboxgl.Evented, { mapRepo: m
   }
 
   _createMapStyle(commonOptions, mapOptions) {
-    const MapStyle = createMapStyleExtending(mapboxgl.Evented, { mapRepo: mapboxgl });
+    const MapStyle = createMapStyleExtending(createMapClassExtending(mapboxgl.Evented), { MapManager, mapRepo: mapboxgl });
     const mapStyleHandler = new MapStyle(this.mapId, commonOptions, mapOptions);
     return mapStyleHandler;
   }
diff --git a/src/maplibregl/mapping/WebMap.js b/src/maplibregl/mapping/WebMap.js
@@ -16,7 +16,7 @@ const l7LayerUtil = L7LayerUtil({ featureFilter, expression, spec, L7Layer, L7})
 export class WebMap extends createWebMapExtending(maplibregl.Evented, { LngLat: maplibregl.LngLat, CRS: maplibregl.CRS }) {
 
   _createWebMapV2(commonOptions, mapOptions) {
-    const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(maplibregl.Evented)), { MapManager, mapRepo: maplibregl });
+    const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(maplibregl.Evented), 'fire'), { MapManager, mapRepo: maplibregl });
     const webMapHandler = new WebMapV2(this.mapId, commonOptions, mapOptions, this.layerFilter);
     return webMapHandler;
   }
@@ -36,7 +36,7 @@ export class WebMap extends createWebMapExtending(maplibregl.Evented, { LngLat:
   }
 
   _createMapStyle(commonOptions, mapOptions) {
-     const MapStyle = createMapStyleExtending(maplibregl.Evented);
+     const MapStyle = createMapStyleExtending(createMapClassExtending(maplibregl.Evented), { MapManager, mapRepo: maplibregl });
      const mapStyleHandler = new MapStyle(this.mapId, commonOptions, mapOptions);
      return mapStyleHandler;
    }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const l7LayerUtil = L7LayerUtil({ featureFilter, expression, spec, L7Layer, L7 }`
`15`	`15`	`export class WebMap extends createWebMapExtending(mapboxgl.Evented, { mapRepo: mapboxgl }) {`
`16`	`16`
`17`	`17`	`_createWebMapV2(commonOptions, mapOptions) {`
`18`		`- const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(mapboxgl.Evented)), { MapManager, mapRepo: mapboxgl });`
	`18`	`+ const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(mapboxgl.Evented), 'fire'), { MapManager, mapRepo: mapboxgl });`
`19`	`19`	`const webMapHandler = new WebMapV2(this.mapId, commonOptions, mapOptions, this.layerFilter);`
`20`	`20`	`return webMapHandler;`
`21`	`21`	`}`
`@@ -35,7 +35,7 @@ export class WebMap extends createWebMapExtending(mapboxgl.Evented, { mapRepo: m`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`_createMapStyle(commonOptions, mapOptions) {`
`38`		`- const MapStyle = createMapStyleExtending(mapboxgl.Evented, { mapRepo: mapboxgl });`
	`38`	`+ const MapStyle = createMapStyleExtending(createMapClassExtending(mapboxgl.Evented), { MapManager, mapRepo: mapboxgl });`
`39`	`39`	`const mapStyleHandler = new MapStyle(this.mapId, commonOptions, mapOptions);`
`40`	`40`	`return mapStyleHandler;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const l7LayerUtil = L7LayerUtil({ featureFilter, expression, spec, L7Layer, L7})`
`16`	`16`	`export class WebMap extends createWebMapExtending(maplibregl.Evented, { LngLat: maplibregl.LngLat, CRS: maplibregl.CRS }) {`
`17`	`17`
`18`	`18`	`_createWebMapV2(commonOptions, mapOptions) {`
`19`		`- const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(maplibregl.Evented)), { MapManager, mapRepo: maplibregl });`
	`19`	`+ const WebMapV2 = createWebMapV2Extending(createWebMapBaseExtending(createMapClassExtending(maplibregl.Evented), 'fire'), { MapManager, mapRepo: maplibregl });`
`20`	`20`	`const webMapHandler = new WebMapV2(this.mapId, commonOptions, mapOptions, this.layerFilter);`
`21`	`21`	`return webMapHandler;`
`22`	`22`	`}`
`@@ -36,7 +36,7 @@ export class WebMap extends createWebMapExtending(maplibregl.Evented, { LngLat:`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`_createMapStyle(commonOptions, mapOptions) {`
`39`		`- const MapStyle = createMapStyleExtending(maplibregl.Evented);`
	`39`	`+ const MapStyle = createMapStyleExtending(createMapClassExtending(maplibregl.Evented), { MapManager, mapRepo: maplibregl });`
`40`	`40`	`const mapStyleHandler = new MapStyle(this.mapId, commonOptions, mapOptions);`
`41`	`41`	`return mapStyleHandler;`
`42`	`42`	`}`