@hzab/map-combine 0.3.1-alpha.0 → 0.3.1-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/map-combine",
-  "version": "0.3.1-alpha.0",
+  "version": "0.3.1-alpha.1",
   "description": "地图组件",
   "main": "src",
   "scripts": {

package/src/amap/AMap.ts

@@ -45,6 +45,10 @@ export interface IFlyToViewerOpt {
    * 最大缩放级别
    */
   maxZoom?: number;
+  /**
+   * 动画时间
+   */
+  duration?: number;
 }
 
 export class AMap extends MapCombine {
@@ -247,18 +251,13 @@ export class AMap extends MapCombine {
    */
   flyToViewer(points: number[][], opt: IFlyToViewerOpt = { avoid: [0, 0, 0, 0], immediately: true }): void {
     this.loadPromise.then(() => {
-      this.viewer.setBounds(
+      const [zoom, center] = this.viewer.getFitZoomAndCenterByBounds(
         this.getBounds(points, { canvas: this.viewer.canvas, ...opt }),
-        opt?.immediately,
         opt?.avoid,
+        opt.maxZoom,
       );
 
-      var currentZoom = this.viewer.getZoom();
-
-      if (opt.maxZoom && currentZoom > opt.maxZoom) {
-        // 如果当前缩放级别超过限制，则手动设置回最大允许级别
-        this.viewer.setZoom(opt.maxZoom);
-      }
+      this.viewer.setZoomAndCenter(zoom, center, opt?.immediately, opt?.duration);
     });
   }