add mask in Layer.toJSON, fix #1013

maptalks · Nov 13, 2019 · f6fb0e2 · f6fb0e2
1 parent 898ed9c
commit f6fb0e2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/layer/Layer.js b/src/layer/Layer.js
@@ -4,6 +4,7 @@ import Eventable from '../core/Eventable';
 import JSONAble from '../core/JSONAble';
 import Renderable from '../renderer/Renderable';
 import CanvasRenderer from '../renderer/layer/CanvasRenderer';
+import Geometry from '../geometry/Geometry';
 
 /**
  * @property {Object}  [options=null] - base options of layer.
@@ -64,6 +65,9 @@ class Layer extends JSONAble(Eventable(Renderable(Class))) {
         this.setId(id);
         if (options) {
             this.setZIndex(options.zIndex);
+            if (options.mask) {
+                this.setMask(Geometry.fromJSON(options.mask));
+            }
         }
     }
 
@@ -384,6 +388,7 @@ class Layer extends JSONAble(Eventable(Renderable(Class))) {
         }
         mask._bindLayer(this);
         this._mask = mask;
+        this.options.mask = mask.toJSON();
         if (!this.getMap() || this.getMap().isZooming()) {
             return this;
         }
@@ -400,6 +405,7 @@ class Layer extends JSONAble(Eventable(Renderable(Class))) {
      */
     removeMask() {
         delete this._mask;
+        delete this.options.mask;
         if (!this.getMap() || this.getMap().isZooming()) {
             return this;
         }

diff --git a/test/layer/MaskSpec.js b/test/layer/MaskSpec.js
@@ -189,4 +189,21 @@ describe('Spec of Masks', function () {
         });
     });
 
+    it('mask with Layer.toJSON', function (done) {
+        vlayer.setMask(new maptalks.MultiPolygon([
+            new maptalks.Circle(map.getCenter(), 5).getShell(),
+            new maptalks.Circle(map.locate(map.getCenter(), 10, 0), 5).getShell()
+        ]));
+        // map.addLayer(vlayer);
+        var json = vlayer.toJSON();
+        var layer2 = maptalks.Layer.fromJSON(json).addTo(map);
+        var canvas = layer2.getMap().getRenderer().canvas;
+        var c = new maptalks.Point(canvas.width / 2, canvas.height / 2);
+        layer2.once('layerload', function () {
+            expect(isDrawn(canvas, c.add(-11, 0))).not.to.be.ok();
+            expect(isDrawn(canvas, c.add(0, 0))).to.be.ok();
+            done();
+        });
+    });
+
 });