reset vertexes in DistanceTool._addVertexMarker, fix #1249

Author: fuzhenn

src/map/tool/DistanceTool.js

@@ -295,10 +295,10 @@ class DistanceTool extends DrawTool {
         if (!this._vertexes) {
             this._vertexes = [];
         }
-        this._vertexes.push({ label: vertexLabel, marker });
-        if (this._historyPointer !== undefined) {
-            this._vertexes.length = this._historyPointer;
+        if (this._historyPointer !== undefined && this._vertexes.length > this._historyPointer - 1) {
+            this._vertexes.length = this._historyPointer - 1;
         }
+        this._vertexes.push({ label: vertexLabel, marker });
         this._measureMarkerLayer.addGeometry(marker);
         if (vertexLabel) {
             this._measureMarkerLayer.addGeometry(vertexLabel);

test/map/tools/MeasureToolSpec.js

@@ -303,6 +303,83 @@ describe('DistanceTool and AreaTool', function () {
             tool.endDraw();
             expect(tool.getLastMeasure()).to.be.above(0);
         });
+
+        //#1249
+        it('undo for multiple times', function () {
+            var tool = new maptalks.AreaTool().addTo(map);
+            var center = map.getCenter();
+
+            var domPosition = GET_PAGE_POSITION(container);
+            var point = map.coordinateToContainerPoint(center).add(domPosition);
+
+            var measure = 0;
+            happen.mousedown(eventContainer, {
+                'clientX':point.x,
+                'clientY':point.y
+            });
+            happen.click(eventContainer, {
+                'clientX':point.x,
+                'clientY':point.y
+            });
+            var i;
+            for (i = 1; i < 10; i++) {
+                happen.mousemove(eventContainer, {
+                    'clientX':point.x + i,
+                    'clientY':point.y
+                });
+            }
+
+            happen.mousedown(eventContainer, {
+                'clientX':point.x + 10,
+                'clientY':point.y
+            });
+            happen.click(eventContainer, {
+                'clientX':point.x + 10,
+                'clientY':point.y
+            });
+            happen.mousedown(eventContainer, {
+                'clientX':point.x + 20,
+                'clientY':point.y
+            });
+            happen.click(eventContainer, {
+                'clientX':point.x + 20,
+                'clientY':point.y
+            });
+
+            tool.undo();
+            tool.undo();
+            happen.click(eventContainer, {
+                'clientX':point.x,
+                'clientY':point.y
+            });
+            var i;
+            for (i = 1; i < 10; i++) {
+                happen.mousemove(eventContainer, {
+                    'clientX':point.x + i,
+                    'clientY':point.y
+                });
+            }
+
+            happen.mousedown(eventContainer, {
+                'clientX':point.x + 10,
+                'clientY':point.y
+            });
+            happen.click(eventContainer, {
+                'clientX':point.x + 10,
+                'clientY':point.y
+            });
+            tool.undo();
+            tool.undo();
+
+            var layers = tool.getMeasureLayers();
+            for (var i = 0; i < layers.length; i++){
+                if (layers[i].getCount() > 0) {
+                    expect(layers[i].getCount()).to.be.eql(2);
+                }
+            }
+            tool.disable();
+
+        });
     });