add cancelEdit, fix #1047

maptalks · Feb 18, 2020 · 843d67b · 843d67b
1 parent 8bc492e
commit 843d67b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/geometry/editor/GeometryEditor.js b/src/geometry/editor/GeometryEditor.js
@@ -1044,6 +1044,16 @@ class GeometryEditor extends Eventable(Class) {
         this._geometry.fire('editrecord');
     }
 
+    cancel() {
+        if (!this._history || this._historyPointer === 0) {
+            return this;
+        }
+        this._historyPointer = 0;
+        const record = this._history[0];
+        this._exeAndReset(record);
+        return this;
+    }
+
     /**
      * Get previous map view in view history
      * @return {Object} map view
@@ -1063,7 +1073,7 @@ class GeometryEditor extends Eventable(Class) {
      */
     redo() {
         if (!this._history || this._historyPointer === this._history.length - 1) {
-            return null;
+            return this;
         }
         const record = this._history[++this._historyPointer];
         this._exeAndReset(record);

diff --git a/src/geometry/ext/Geometry.Edit.js b/src/geometry/ext/Geometry.Edit.js
@@ -95,6 +95,27 @@ Geometry.include(/** @lends Geometry.prototype */ {
         return this;
     },
 
+    /**
+     * cancel the edit
+     * @return {Geometry} this
+     */
+    cancelEdit() {
+        if (!this.isEditing()) {
+            return this;
+        }
+        this._editor.cancel();
+        /**
+         * cancel edit event
+         *
+         * @event Geometry#canceledit
+         * @type {Object}
+         * @property {String} type - canceledit
+         * @property {Geometry} target - the geometry fires the event
+         */
+        this.fire('canceledit');
+        return this;
+    },
+
     /**
      * Whether the geometry is being edited.
      * @return {Boolean}

diff --git a/test/geometry/edit/GeometryEditSpec.js b/test/geometry/edit/GeometryEditSpec.js
@@ -89,6 +89,10 @@ describe('Geometry.Edit', function () {
                         expect(c.y).to.be.approx(center.y, 1E-4);
                         geo.redoEdit();
                         expect(geo.getCenter()).to.closeTo(newCenter);
+                        geo.cancelEdit();
+                        var c = geo.getCenter();
+                        expect(c.x).to.be.approx(center.x, 1E-4);
+                        expect(c.y).to.be.approx(center.y, 1E-4);
                     }
                     geo.endEdit();
                 };