feat: mapbox添加fitBoundsOptions

packages/core/src/services/layer/ILayerService.ts

@@ -155,7 +155,7 @@ export interface ILayer {
   destroy(): void;
   source(data: any, option?: ISourceCFG): ILayer;
   setData(data: any, option?: ISourceCFG): ILayer;
-  fitBounds(): ILayer;
+  fitBounds(fitBoundsOptions?: mapboxgl.FitBoundsOptions): ILayer;
   /**
    * 向当前图层注册插件
    * @param plugin 插件实例
@@ -222,6 +222,7 @@ export interface ILayerConfig {
   visible: boolean;
   zIndex: number;
   autoFit: boolean;
+  fitBoundsOptions?: mapboxgl.FitBoundsOptions;
   name: string; //
   blend: keyof typeof BlendType;
   pickedFeatureID: number;

packages/core/src/services/map/IMapService.ts

@@ -50,7 +50,7 @@ export interface IMapService<RawMap = {}> {
   zoomOut(): void;
   panTo(p: Point): void;
   panBy(pixel: Point): void;
-  fitBounds(bound: Bounds): void;
+  fitBounds(bound: Bounds, fitBoundsOptions?: mapboxgl.FitBoundsOptions): void;
   setZoomAndCenter(zoom: number, center: Point): void;
   setCenter(center: [number, number]): void;
   setPitch(pitch: number): void;

packages/layers/src/core/BaseLayer.ts

@@ -654,7 +654,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
   /**
    * zoom to layer Bounds
    */
-  public fitBounds(): ILayer {
+  public fitBounds(fitBoundsOptions?: mapboxgl.FitBoundsOptions): ILayer {
     if (!this.inited) {
       this.updateLayerConfig({
         autoFit: true,
@@ -663,10 +663,13 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     }
     const source = this.getSource();
     const extent = source.extent;
-    this.mapService.fitBounds([
+    this.mapService.fitBounds(
-      [extent[0], extent[1]],
+      [
-      [extent[2], extent[3]],
+        [extent[0], extent[1]],
-    ]);
+        [extent[2], extent[3]],
+      ],
+      fitBoundsOptions,
+    );
     return this;
   }
 
@@ -876,9 +879,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
 
   private sourceEvent = () => {
     this.dataState.dataSourceNeedUpdate = true;
-    const { autoFit } = this.getLayerConfig();
+    const { autoFit, fitBoundsOptions } = this.getLayerConfig();
     if (autoFit) {
-      this.fitBounds();
+      this.fitBounds(fitBoundsOptions);
     }
 
     this.emit('dataUpdate');

packages/layers/src/plugins/LayerStylePlugin.ts

@@ -11,10 +11,10 @@ export default class LayerStylePlugin implements ILayerPlugin {
     layer.hooks.afterInit.tap('LayerStylePlugin', () => {
       // 更新图层默认状态
       layer.updateLayerConfig({});
-      const { autoFit } = layer.getLayerConfig();
+      const { autoFit, fitBoundsOptions } = layer.getLayerConfig();
       if (autoFit) {
         setTimeout(() => {
-          layer.fitBounds();
+          layer.fitBounds(fitBoundsOptions);
         }, 100);
       }
     });

packages/maps/src/mapbox/map.ts

@@ -157,8 +157,11 @@ export default class MapboxService
     this.panTo(pixel);
   }
 
-  public fitBounds(bound: Bounds): void {
+  public fitBounds(
-    this.map.fitBounds(bound);
+    bound: Bounds,
+    fitBoundsOptions?: mapboxgl.FitBoundsOptions,
+  ): void {
+    this.map.fitBounds(bound, fitBoundsOptions);
   }
 
   public setMaxZoom(max: number): void {

packages/react/src/component/LayerAttribute/Source.tsx

@@ -18,7 +18,7 @@ export default React.memo(function Chart(props: ISourceProps) {
       layer.setData(data, sourceOption);
     }
     if (sourceOption.autoFit) {
-      layer.fitBounds();
+      layer.fitBounds(sourceOption && sourceOption.fitBoundsOptions);
     }
   }, [data, JSON.stringify(sourceOption)]);
   return null;

packages/react/src/component/LayerAttribute/index.ts

@@ -60,6 +60,8 @@ export interface ISourceOptions extends ISourceCFG {
   data: any;
   // 每次更新数据之后是否自适应缩放
   autoFit?: boolean;
+  // Mapbox 自适应的参数
+  fitBoundsOptions?: any;
 }
 
 export interface IActiveOptions {

packages/scene/src/IMapController.ts

@@ -49,7 +49,7 @@ export default interface IMapController {
   /**
    * 调整地图适合指定区域
    */
-  fitBounds(bound: Bounds): void;
+  fitBounds(bound: Bounds, fitBoundsOptions?: mapboxgl.FitBoundsOptions): void;
 
   setRotation(rotation: number): void;
 

packages/scene/src/index.ts

@@ -270,8 +270,11 @@ class Scene
   public setZoom(zoom: number): void {
     this.mapService.setZoom(zoom);
   }
-  public fitBounds(bound: Bounds): void {
+  public fitBounds(
-    this.mapService.fitBounds(bound);
+    bound: Bounds,
+    fitBoundsOptions?: mapboxgl.FitBoundsOptions,
+  ): void {
+    this.mapService.fitBounds(bound, fitBoundsOptions);
   }
 
   public setZoomAndCenter(zoom: number, center: Point): void {