@vtx/map 1.1.0 → 1.1.1

package/lib/VtxMap/BMap/Map.js

@@ -22,6 +22,10 @@ var _immutable = require('immutable');
 
 var _immutable2 = _interopRequireDefault(_immutable);
 
+var _unionBy = require('lodash/unionBy');
+
+var _unionBy2 = _interopRequireDefault(_unionBy);
+
 var _default = require('../../default');
 
 var _default2 = _interopRequireDefault(_default);
@@ -1810,7 +1814,10 @@ var BaiduMap = function (_React$Component) {
                     });
                     break;
                 case 'polygon':
-                    pts = gg.getPath().map(function (item, index) {
+                    // fix: 编辑图元时面积计算不正确，需要过滤一下重复的经纬度
+                    pts = (0, _unionBy2.default)(gg.getPath(), function (res) {
+                        return res.lng && res.lat;
+                    }).map(function (item) {
                         return [item.lng, item.lat];
                     });
                     p = _extends({}, gp, {
@@ -1953,7 +1960,11 @@ var BaiduMap = function (_React$Component) {
                         geometry: param.geometry
                     };
                     if (param.geometry.type == 'polygon') {
-                        obj.area = BMapLib.GeoUtils.getPolygonArea(param.mapLayer);
+                        // obj.area = BMapLib.GeoUtils.getPolygonArea(param.mapLayer);
+                        // fix: 只能是数组计算之前的计算因为重复的经纬度导致面积为NAN
+                        obj.area = BMapLib.GeoUtils.getPolygonArea(param.geometry.rings.map(function (item) {
+                            return new BMap.Point(item[0], item[1]);
+                        }));
                     }
                     if (param.geometry.type == 'polyline') {
                         obj.distance = t.calculateDistance(param.geometry.paths);

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -253,7 +253,8 @@ var VtxSearchMap = function (_React$Component) {
                 var lglt = this.map.getMapExtent(),
                     editGraphic = null,
                     editGraphicId = 'locationPoint';
-                if (this.props.editParam && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')) {
+                if (this.props.editParam) {
+                    // && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')
                     editGraphic = _extends({}, this.props.editParam, { id: 'drawnGraph' });
                     editGraphicId = 'drawnGraph';
                 }
@@ -574,6 +575,18 @@ var VtxSearchMap = function (_React$Component) {
                     drawProps = null;
                 }
             }
+            if (graphicType === 'rectangle') {
+                if (editGraphic) {
+                    mapPolygons.push(editGraphic);
+                    drawProps = null;
+                }
+            }
+            if (graphicType === 'circle') {
+                if (editGraphic) {
+                    mapCircles.push(editGraphic);
+                    drawProps = null;
+                }
+            }
             if (isShowOtherGraph) {
                 var otherGraph = this.props.otherGraph;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/map",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "@vtx/map",
   "main": "lib/index.js",
   "scripts": {