@antv/l7-component 2.21.0 → 2.21.1

package/es/control/swipe.js

@@ -55,7 +55,6 @@ var Swipe = /*#__PURE__*/function (_Control) {
             });
             // fallthrough
           }
-
         case 'mousemove':
         case 'touchmove':
           {
@@ -121,12 +120,10 @@ var Swipe = /*#__PURE__*/function (_Control) {
       }
     });
     _defineProperty(_assertThisInitialized(_this), "getMaskLayer", function () {
+      console.log(_this.getMaskGeoData());
       return new PolygonLayer({
         visible: false
-      }).source({
-        type: 'FeatureCollection',
-        features: []
-      }).shape('fill').color('red').style({
+      }).source(_this.getMaskGeoData()).shape('fill').color('red').style({
         opacity: 0.1
       });
     });
@@ -204,17 +201,16 @@ var Swipe = /*#__PURE__*/function (_Control) {
       // this.scene.getSceneContainer().appendChild(this.container);
       this.mapsService.getMarkerContainer().appendChild(this.container);
       this.maskLayer = this.getMaskLayer();
-      this.updateMask();
       this.registerEvent();
 
-      // 给图层挂载掩膜
-      this.addMaskToLayers(layers, false);
-      this.addMaskToLayers(rightLayers, true);
-
       // 添加掩膜图层到 scene
       var layerContainer = createLayerContainer(sceneContainer);
       this.maskLayer.setContainer(layerContainer);
       this.scene.addLayer(this.maskLayer);
+
+      // 给图层挂载掩膜
+      this.addMaskToLayers(layers, false);
+      this.addMaskToLayers(rightLayers, true);
       this.emit('add', this);
       return this;
     }

package/es/marker-layer.js

@@ -63,7 +63,6 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.on('camerachange', this.update); // amap1.x 更新事件
         this.mapsService.on('viewchange', this.update); // amap2.0 更新事件
       }
-
       this.mapsService.on('camerachange', this.setContainerSize.bind(this)); // amap1.x 更新事件
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
       this.addMarkers();

package/es/marker.d.ts

@@ -3,10 +3,8 @@ import { anchorType } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 export default class Marker extends EventEmitter {
     private markerOption;
-    private defaultMarker;
     private popup;
     private mapsService;
-    private sceneSerive;
     private lngLat;
     private scene;
     private added;

package/es/marker.js

@@ -100,16 +100,11 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      // this.remove();
       this.scene = scene;
       this.mapsService = scene.mapService;
-      this.sceneSerive = scene.sceneService;
       var element = this.markerOption.element;
-      // this.sceneSerive.getSceneContainer().appendChild(element as HTMLElement);
       this.mapsService.getMarkerContainer().appendChild(element);
       this.registerMarkerEvent(element);
-      //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
-      // this.mapsService.on('zoomchange', this.updatePositionWhenZoom);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
       this.update();
       this.updateDraggable();
@@ -124,7 +119,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
         this.mapsService.off('moveend', this.update);
-        // this.mapsService.off('zoomchange', this.update);
         this.mapsService.off('camerachange', this.update);
       }
       this.unRegisterMarkerEvent();
@@ -418,7 +412,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
         color = _this$markerOption4.color,
         anchor = _this$markerOption4.anchor;
       if (!element) {
-        this.defaultMarker = true;
         element = DOM.create('div');
         this.markerOption.element = element;
         var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');

package/lib/control/swipe.js

@@ -61,7 +61,6 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
             });
             // fallthrough
           }
-
         case 'mousemove':
         case 'touchmove':
           {
@@ -127,12 +126,10 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getMaskLayer", function () {
+      console.log(_this.getMaskGeoData());
       return new _l7Layers.PolygonLayer({
         visible: false
-      }).source({
-        type: 'FeatureCollection',
-        features: []
-      }).shape('fill').color('red').style({
+      }).source(_this.getMaskGeoData()).shape('fill').color('red').style({
         opacity: 0.1
       });
     });
@@ -210,17 +207,16 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
       // this.scene.getSceneContainer().appendChild(this.container);
       this.mapsService.getMarkerContainer().appendChild(this.container);
       this.maskLayer = this.getMaskLayer();
-      this.updateMask();
       this.registerEvent();
 
-      // 给图层挂载掩膜
-      this.addMaskToLayers(layers, false);
-      this.addMaskToLayers(rightLayers, true);
-
       // 添加掩膜图层到 scene
       var layerContainer = (0, _l7Core.createLayerContainer)(sceneContainer);
       this.maskLayer.setContainer(layerContainer);
       this.scene.addLayer(this.maskLayer);
+
+      // 给图层挂载掩膜
+      this.addMaskToLayers(layers, false);
+      this.addMaskToLayers(rightLayers, true);
       this.emit('add', this);
       return this;
     }

package/lib/marker-layer.js

@@ -69,7 +69,6 @@ var MarkerLayer = exports.default = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.on('camerachange', this.update); // amap1.x 更新事件
         this.mapsService.on('viewchange', this.update); // amap2.0 更新事件
       }
-
       this.mapsService.on('camerachange', this.setContainerSize.bind(this)); // amap1.x 更新事件
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
       this.addMarkers();

package/lib/marker.js

@@ -106,16 +106,11 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      // this.remove();
       this.scene = scene;
       this.mapsService = scene.mapService;
-      this.sceneSerive = scene.sceneService;
       var element = this.markerOption.element;
-      // this.sceneSerive.getSceneContainer().appendChild(element as HTMLElement);
       this.mapsService.getMarkerContainer().appendChild(element);
       this.registerMarkerEvent(element);
-      //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
-      // this.mapsService.on('zoomchange', this.updatePositionWhenZoom);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
       this.update();
       this.updateDraggable();
@@ -130,7 +125,6 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
         this.mapsService.off('moveend', this.update);
-        // this.mapsService.off('zoomchange', this.update);
         this.mapsService.off('camerachange', this.update);
       }
       this.unRegisterMarkerEvent();
@@ -424,7 +418,6 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
         color = _this$markerOption4.color,
         anchor = _this$markerOption4.anchor;
       if (!element) {
-        this.defaultMarker = true;
         element = _l7Utils.DOM.create('div');
         this.markerOption.element = element;
         var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "description": "",
   "license": "ISC",
   "author": "lzxue",
@@ -26,20 +26,20 @@
     "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments"
   },
   "dependencies": {
-    "@antv/l7-core": "2.21.0",
-    "@antv/l7-utils": "2.21.0",
+    "@antv/l7-core": "2.21.1",
+    "@antv/l7-utils": "2.21.1",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.21.0",
-    "@antv/l7-test-utils": "2.21.0",
+    "@antv/l7-layers": "2.21.1",
+    "@antv/l7-test-utils": "2.21.1",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7fa1b00b5262c98bb4cceef4eaf87a7b10af7e29"
+  "gitHead": "1e0d2e5920f479f77095a2c5eddda8a8d7ac9e0f"
 }