fix a bug when calling AreaTool.endDraw, fix #1250

Author: fuzhenn

src/map/tool/AreaTool.js

@@ -112,16 +112,32 @@ class AreaTool extends DistanceTool {
 
     _msOnDrawEnd(param) {
         this._clearTailMarker();
-        const prjCoord = this.getMap()._pointToPrj(param['point2d']);
+        let prjCoord;
+        if (param['point2d']) {
+            prjCoord = this.getMap()._pointToPrj(param['point2d']);
+        } else {
+            let prjCoords = param['geometry']._getPrjCoordinates();
+            prjCoords = prjCoords.slice(0, prjCoords.length - 1);
+            param['geometry']._setPrjCoordinates(prjCoords);
+            prjCoord = prjCoords[prjCoords.length - 1];
+        }
+        if (param['geometry']._getPrjCoordinates().length < 3) {
+            this._lastMeasure = 0;
+            this._clearMeasureLayers();
+            return;
+        }
+
         const ms = this._measure(param['geometry']);
-        const endLabel = new Label(ms, param['coordinate'], this.options['labelOptions'])
+        const projection = this.getMap().getProjection();
+        const coord = projection.unproject(prjCoord);
+        const endLabel = new Label(ms, coord, this.options['labelOptions'])
             .addTo(this._measureMarkerLayer);
         endLabel._setPrjCoordinates(prjCoord);
         let size = endLabel.getSize();
         if (!size) {
             size = new Size(10, 10);
         }
-        this._addClearMarker(param['coordinate'], prjCoord, size['width']);
+        this._addClearMarker(coord, prjCoord, size['width']);
         const geo = param['geometry'].copy();
         geo._setPrjCoordinates(param['geometry']._getPrjCoordinates());
         geo.addTo(this._measureLineLayer);

src/map/tool/DistanceTool.js

@@ -307,6 +307,11 @@ class DistanceTool extends DrawTool {
 
     _msOnDrawEnd(param) {
         this._clearTailMarker();
+        if (param['geometry']._getPrjCoordinates().length < 2) {
+            this._lastMeasure = 0;
+            this._clearMeasureLayers();
+            return;
+        }
         let size = this._lastVertex.getSize();
         if (!size) {
             size = new Size(10, 10);
@@ -362,6 +367,11 @@ class DistanceTool extends DrawTool {
         }
     }
 
+    _clearMeasureLayers() {
+        this._measureLineLayer.remove();
+        this._measureMarkerLayer.remove();
+    }
+
 }
 
 DistanceTool.mergeOptions(options);

test/map/tools/MeasureToolSpec.js

@@ -3,7 +3,7 @@ describe('DistanceTool and AreaTool', function () {
     var map;
     var center = new maptalks.Coordinate(118.846825, 32.046534);
 
-    function measure(tool) {
+    function measure(tool, noDblClick) {
         var center = map.getCenter();
 
         var domPosition = GET_PAGE_POSITION(container);
@@ -76,10 +76,13 @@ describe('DistanceTool and AreaTool', function () {
             'clientX':point.x - 1,
             'clientY':point.y + 5
         });
-        happen.dblclick(eventContainer, {
-            'clientX':point.x - 1,
-            'clientY':point.y + 5
-        });
+        if (!noDblClick) {
+            happen.dblclick(eventContainer, {
+                'clientX':point.x - 1,
+                'clientY':point.y + 5
+            });
+        }
+
         if (tool.isEnabled()) {
             expect(tool.getLastMeasure()).to.be.above(measure);
             measure = tool.getLastMeasure();
@@ -148,6 +151,38 @@ describe('DistanceTool and AreaTool', function () {
             result = tool.getLastMeasure();
             expect(result).to.be.above(0);
         });
+
+        it('endDraw', function () {
+            var distanceTool = new maptalks.DistanceTool({
+                metric : true,
+                imperial:true
+            }).addTo(map);
+            expect(distanceTool.getLastMeasure()).to.be.eql(0);
+            measure(distanceTool, true);
+            distanceTool.endDraw();
+            expect(distanceTool.getLastMeasure()).to.be.above(0);
+        });
+
+        it('endDraw with 1 click', function () {
+            var tool = new maptalks.DistanceTool().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;
+            tool.endDraw();
+            expect(tool.getLastMeasure()).to.be.eql(0);
+        });
     });
 
     describe('test areaTool', function () {
@@ -221,6 +256,53 @@ describe('DistanceTool and AreaTool', function () {
             result = tool.getLastMeasure();
             expect(result).to.be.above(0);
         });
+
+        it('endDraw with 2 clicks', 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
+            });
+            tool.endDraw();
+            expect(tool.getLastMeasure()).to.be.eql(0);
+        });
+
+        it('endDraw', function () {
+            var tool = new maptalks.AreaTool().addTo(map).disable();
+            measure(tool);
+            var result = tool.getLastMeasure();
+            expect(result).to.be(0);
+            tool.enable();
+            measure(tool, true);
+            tool.endDraw();
+            expect(tool.getLastMeasure()).to.be.above(0);
+        });
     });