@vtx/map 1.1.23 → 1.1.25

package/lib/VtxMap/OlMap/Map.js

@@ -744,26 +744,39 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           source: gp.source
         });
         t.state.gis.addInteraction(t.editToolbar);
-        t.editToolbar.on('modifyend', function (e) {
-          var feature = gc;
-          e.features.forEach(function (feature) {
-            feature = feature;
-          }); //返回参数
+      } else {
+        t.state.gis.addInteraction(t.editToolbar);
+      }
 
-          var param = {
-            id: id,
-            e: e
-          }; // 绘制内部管理的图元
+      t.editToolbar.on('modifyend', function (e) {
+        var feature = gc;
+        e.features.forEach(function (feature) {
+          feature = feature;
+        }); //返回参数
+
+        var param = {
+          id: id,
+          e: e
+        }; // 绘制内部管理的图元
 
-          if (gp.geometry.type == 'point') {
-            var cur = feature.getProperties().geometry;
+        if (gp.geometry.type == 'point') {
+          var cur = feature.getProperties().geometry;
 
-            var _cur$flatCoordinates = _slicedToArray(cur.flatCoordinates, 2),
-                lng = _cur$flatCoordinates[0],
-                lat = _cur$flatCoordinates[1]; //处理点返回参数
+          var _cur$flatCoordinates = _slicedToArray(cur.flatCoordinates, 2),
+              lng = _cur$flatCoordinates[0],
+              lat = _cur$flatCoordinates[1]; //处理点返回参数
 
 
-            param = _objectSpread(_objectSpread({}, param), {}, {
+          param = _objectSpread(_objectSpread({}, param), {}, {
+            attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+              longitude: lng,
+              latitude: lat,
+              other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+                longitude: lng,
+                latitude: lat
+              })
+            }),
+            param: {
               attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                 longitude: lng,
                 latitude: lat,
@@ -772,149 +785,151 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
                   latitude: lat
                 })
               }),
-              param: {
-                attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                  longitude: lng,
-                  latitude: lat,
-                  other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                    longitude: lng,
-                    latitude: lat
-                  })
-                }),
-                geometryType: gp.geometry.type,
-                mapLayer: t.GM.getGraphic(id)
-              },
               geometryType: gp.geometry.type,
-              geometry: {
-                type: 'point',
-                x: lng,
-                y: lat
-              }
-            });
-          } //线
+              mapLayer: t.GM.getGraphic(id)
+            },
+            geometryType: gp.geometry.type,
+            geometry: {
+              type: 'point',
+              x: lng,
+              y: lat
+            }
+          });
+        } //线
 
 
-          if (gp.geometry.type == 'polyline') {
-            var _cur = feature.getProperties().geometry;
-            var oddList = [],
-                evenList = [];
+        if (gp.geometry.type == 'polyline') {
+          var _cur = feature.getProperties().geometry;
+          var oddList = [],
+              evenList = [];
 
-            _cur.flatCoordinates.map(function (item, index) {
-              // 判断下标奇偶数
-              if (index % 2 === 0) {
-                evenList.push(item);
-              } else {
-                oddList.push(item);
-              }
-            });
+          _cur.flatCoordinates.map(function (item, index) {
+            // 判断下标奇偶数
+            if (index % 2 === 0) {
+              evenList.push(item);
+            } else {
+              oddList.push(item);
+            }
+          });
 
-            var path = oddList.map(function (item, index) {
-              return [evenList[index], oddList[index]];
-            }); //处理线返回参数
+          var path = oddList.map(function (item, index) {
+            return [evenList[index], oddList[index]];
+          }); //处理线返回参数
 
-            var _t$dealData = t.dealData(path),
-                lnglatAry = _t$dealData.lnglatAry,
-                _extent = _t$dealData._extent;
+          var _t$dealData = t.dealData(path),
+              lnglatAry = _t$dealData.lnglatAry,
+              _extent = _t$dealData._extent;
 
-            param = _objectSpread(_objectSpread({}, param), {}, {
+          param = _objectSpread(_objectSpread({}, param), {}, {
+            attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+              paths: path,
+              other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+                paths: path
+              })
+            }),
+            param: {
               attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                 paths: path,
                 other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                   paths: path
                 })
               }),
-              param: {
-                attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                  paths: path,
-                  other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                    paths: path
-                  })
-                }),
-                geometry: {
-                  paths: path,
-                  _extent: _extent,
-                  type: "polyline"
-                },
-                geometryType: 'polyline',
-                lnglatAry: lnglatAry,
-                mapLayer: t.GM.getGraphic(id)
-              },
-              geometryType: gp.geometry.type,
               geometry: {
                 paths: path,
                 _extent: _extent,
                 type: "polyline"
               },
-              distance: t.calculateDistance(path)
-            });
-          } //面
+              geometryType: 'polyline',
+              lnglatAry: lnglatAry,
+              mapLayer: t.GM.getGraphic(id)
+            },
+            geometryType: gp.geometry.type,
+            geometry: {
+              paths: path,
+              _extent: _extent,
+              type: "polyline"
+            },
+            distance: t.calculateDistance(path)
+          });
+        } //面
 
 
-          if (gp.geometry.type == 'polygon') {
-            var _cur2 = feature.getProperties().geometry;
-            var _oddList = [],
-                _evenList = [];
+        if (gp.geometry.type == 'polygon') {
+          var _cur2 = feature.getProperties().geometry;
+          var _oddList = [],
+              _evenList = [];
 
-            _cur2.flatCoordinates.map(function (item, index) {
-              // 判断下标奇偶数
-              if (index % 2 === 0) {
-                _evenList.push(item);
-              } else {
-                _oddList.push(item);
-              }
-            });
+          _cur2.flatCoordinates.map(function (item, index) {
+            // 判断下标奇偶数
+            if (index % 2 === 0) {
+              _evenList.push(item);
+            } else {
+              _oddList.push(item);
+            }
+          });
 
-            var _path = _oddList.map(function (item, index) {
-              return [_evenList[index], _oddList[index]];
-            }); //处理线返回参数
+          var _path = _oddList.map(function (item, index) {
+            return [_evenList[index], _oddList[index]];
+          }); //处理线返回参数
 
 
-            var _t$dealData2 = t.dealData(_path),
-                _lnglatAry = _t$dealData2.lnglatAry,
-                _extent2 = _t$dealData2._extent;
+          var _t$dealData2 = t.dealData(_path),
+              _lnglatAry = _t$dealData2.lnglatAry,
+              _extent2 = _t$dealData2._extent;
 
-            param = _objectSpread(_objectSpread({}, param), {}, {
+          param = _objectSpread(_objectSpread({}, param), {}, {
+            attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+              rings: _path,
+              other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+                paths: _path
+              })
+            }),
+            param: {
               attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                 rings: _path,
                 other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                   paths: _path
                 })
               }),
-              param: {
-                attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                  rings: _path,
-                  other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                    paths: _path
-                  })
-                }),
-                geometry: {
-                  rings: _path,
-                  type: 'polygon',
-                  _extent: _extent2
-                },
-                geometryType: 'polygon',
-                lnglatAry: _lnglatAry,
-                mapLayer: t.GM.getGraphic(id)
-              },
-              geometryType: gp.geometry.type,
               geometry: {
                 rings: _path,
                 type: 'polygon',
                 _extent: _extent2
               },
-              area: (0, _MapToolFunction.getPolygonArea)(_path)
-            });
-          }
+              geometryType: 'polygon',
+              lnglatAry: _lnglatAry,
+              mapLayer: t.GM.getGraphic(id)
+            },
+            geometryType: gp.geometry.type,
+            geometry: {
+              rings: _path,
+              type: 'polygon',
+              _extent: _extent2
+            },
+            area: (0, _MapToolFunction.getPolygonArea)(_path)
+          });
+        }
 
-          if (gp.geometry.type == 'circle') {
-            var _cur3 = feature.getProperties().geometry;
+        if (gp.geometry.type == 'circle') {
+          var _cur3 = feature.getProperties().geometry;
 
-            var center = _cur3.getCenter();
+          var center = _cur3.getCenter();
 
-            var sketchCoords_ = [_cur3.flatCoordinates[0], _cur3.flatCoordinates[1]];
-            var sketchCoords_2 = [_cur3.flatCoordinates[2], _cur3.flatCoordinates[3]];
-            var radius = ol.sphere.getDistance(sketchCoords_, sketchCoords_2);
-            param = _objectSpread(_objectSpread({}, param), {}, {
+          var sketchCoords_ = [_cur3.flatCoordinates[0], _cur3.flatCoordinates[1]];
+          var sketchCoords_2 = [_cur3.flatCoordinates[2], _cur3.flatCoordinates[3]];
+          var radius = ol.sphere.getDistance(sketchCoords_, sketchCoords_2);
+          param = _objectSpread(_objectSpread({}, param), {}, {
+            attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+              longitude: center[0],
+              latitude: center[1],
+              radius: radius,
+              other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
+                longitude: center[0],
+                latitude: center[1],
+                radius: radius
+              })
+            }),
+            param: {
               attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
                 longitude: center[0],
                 latitude: center[1],
@@ -925,47 +940,34 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
                   radius: radius
                 })
               }),
-              param: {
-                attributes: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                  longitude: center[0],
-                  latitude: center[1],
-                  radius: radius,
-                  other: _objectSpread(_objectSpread({}, gp.attributes), {}, {
-                    longitude: center[0],
-                    latitude: center[1],
-                    radius: radius
-                  })
-                }),
-                geometry: {
-                  x: center[0],
-                  y: center[1],
-                  radius: radius,
-                  type: 'circle'
-                },
-                geometryType: 'circle',
-                mapLayer: t.GM.getGraphic(id)
-              },
-              geometryType: gp.geometry.type,
-              area: Math.PI * Math.pow(radius, 2),
               geometry: {
-                type: 'circle',
                 x: center[0],
                 y: center[1],
-                radius: radius
-              }
-            });
-          }
-
-          if ('editGraphicChange' in t.props && typeof t.props.editGraphicChange == 'function') {
-            t.props.editGraphicChange(param);
-          }
+                radius: radius,
+                type: 'circle'
+              },
+              geometryType: 'circle',
+              mapLayer: t.GM.getGraphic(id)
+            },
+            geometryType: gp.geometry.type,
+            area: Math.PI * Math.pow(radius, 2),
+            geometry: {
+              type: 'circle',
+              x: center[0],
+              y: center[1],
+              radius: radius
+            }
+          });
+        }
 
-          t.GM.setGraphic(id, feature).setGraphicParam(id, _objectSpread(_objectSpread({}, param), {}, {
-            source: gp.source
-          }));
-        });
-      }
+        if ('editGraphicChange' in t.props && typeof t.props.editGraphicChange == 'function') {
+          t.props.editGraphicChange(param);
+        }
 
+        t.GM.setGraphic(id, feature).setGraphicParam(id, _objectSpread(_objectSpread({}, param), {}, {
+          source: gp.source
+        }));
+      });
       t.editId = id;
     } //关闭编辑
 
@@ -1089,169 +1091,224 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         });
         gis.addInteraction(t.drawToolbar);
-        t.drawToolbar.on('drawend', function (e) {
-          // 关闭绘制事件
-          t.drawToolbar.finishDrawing(); // 移除
+      } else {
+        gis.addInteraction(t.drawToolbar);
+      }
+
+      t.drawToolbar.on('drawend', function (e) {
+        // 关闭绘制事件
+        t.drawToolbar.finishDrawing(); // 移除
+
+        gis.removeInteraction(t.drawToolbar);
+        var gc = e.feature.getGeometry(); //返回参数
 
-          gis.removeInteraction(t.drawToolbar);
-          var gc = e.feature.getGeometry(); //返回参数
+        var param = {}; // 绘制内部管理的图元
 
-          var param = {}; // 绘制内部管理的图元
+        if (t.drawParam.geometryType == 'point') {
+          var _gc$flatCoordinates = _slicedToArray(gc.flatCoordinates, 2),
+              lng = _gc$flatCoordinates[0],
+              lat = _gc$flatCoordinates[1];
 
-          if (t.drawParam.geometryType == 'point') {
-            var _gc$flatCoordinates = _slicedToArray(gc.flatCoordinates, 2),
-                lng = _gc$flatCoordinates[0],
-                lat = _gc$flatCoordinates[1];
+          gc.x = lng;
+          gc.y = lat;
 
-            gc.x = lng;
-            gc.y = lat;
+          if (t.GM.isRepetition(t.drawParam.data.id)) {
+            t.updatePoint([{
+              id: t.drawParam.data.id,
+              longitude: lng,
+              latitude: lat,
+              url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
+              config: _objectSpread({}, t.drawParam.parameter)
+            }], "point");
+          } else {
             t.addPoint([{
               id: t.drawParam.data.id,
               longitude: lng,
               latitude: lat,
               url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
               config: _objectSpread({}, t.drawParam.parameter)
-            }], 'point'); //处理点返回参数
+            }], 'point');
+          } //处理点返回参数
+
 
-            param = {
+          param = {
+            id: t.drawParam.data.id,
+            attributes: {
               id: t.drawParam.data.id,
-              attributes: {
-                id: t.drawParam.data.id,
-                url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
-                config: {
-                  width: t.drawParam.parameter.width || 30,
-                  height: t.drawParam.parameter.height || 30
-                }
-              },
-              geometry: gc,
-              geometryType: 'point',
-              mapLayer: t.GM.getGraphic(t.drawParam.data.id)
-            };
-          } //线
+              url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
+              config: {
+                width: t.drawParam.parameter.width || 30,
+                height: t.drawParam.parameter.height || 30
+              }
+            },
+            geometry: gc,
+            geometryType: 'point',
+            mapLayer: t.GM.getGraphic(t.drawParam.data.id)
+          };
+        } //线
 
 
-          if (t.drawParam.geometryType == 'polyline') {
-            var oddList = [],
-                evenList = [];
-            gc.flatCoordinates.map(function (item, index) {
-              // 判断下标奇偶数
-              if (index % 2 === 0) {
-                evenList.push(item);
-              } else {
-                oddList.push(item);
-              }
-            });
-            var path = oddList.map(function (item, index) {
-              return [evenList[index], oddList[index]];
-            });
+        if (t.drawParam.geometryType == 'polyline') {
+          var oddList = [],
+              evenList = [];
+          gc.flatCoordinates.map(function (item, index) {
+            // 判断下标奇偶数
+            if (index % 2 === 0) {
+              evenList.push(item);
+            } else {
+              oddList.push(item);
+            }
+          });
+          var path = oddList.map(function (item, index) {
+            return [evenList[index], oddList[index]];
+          });
+
+          if (t.GM.isRepetition(t.drawParam.data.id)) {
+            t.updateLine([{
+              id: t.drawParam.data.id,
+              paths: path,
+              config: _objectSpread({}, t.drawParam.parameter)
+            }], 'polyline');
+          } else {
             t.addLine([{
               id: t.drawParam.data.id,
               paths: path,
               config: _objectSpread({}, t.drawParam.parameter)
-            }], 'polyline'); //处理线返回参数
+            }], 'polyline');
+          } //处理线返回参数
 
-            var _t$dealData3 = t.dealData(path),
-                lnglatAry = _t$dealData3.lnglatAry,
-                _extent = _t$dealData3._extent;
 
-            param = {
-              lnglatAry: lnglatAry,
+          var _t$dealData3 = t.dealData(path),
+              lnglatAry = _t$dealData3.lnglatAry,
+              _extent = _t$dealData3._extent;
+
+          param = {
+            lnglatAry: lnglatAry,
+            id: t.drawParam.data.id,
+            geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
+              paths: path,
+              _extent: _extent
+            }),
+            attributes: {
               id: t.drawParam.data.id,
-              geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
-                paths: path,
-                _extent: _extent
-              }),
-              attributes: {
-                id: t.drawParam.data.id,
-                config: _objectSpread({}, t.drawParam.parameter)
-              },
-              distance: t.calculateDistance(path),
-              geometryType: 'polyline',
-              mapLayer: t.GM.getGraphic(t.drawParam.data.id)
-            };
-          } //面
+              config: _objectSpread({}, t.drawParam.parameter)
+            },
+            distance: t.calculateDistance(path),
+            geometryType: 'polyline',
+            mapLayer: t.GM.getGraphic(t.drawParam.data.id)
+          };
+        } //面
 
 
-          if (t.drawParam.geometryType == 'polygon') {
-            var _oddList2 = [],
-                _evenList2 = [];
-            gc.flatCoordinates.map(function (item, index) {
-              // 判断下标奇偶数
-              if (index % 2 === 0) {
-                _evenList2.push(item);
-              } else {
-                _oddList2.push(item);
-              }
-            });
+        if (t.drawParam.geometryType == 'polygon') {
+          var _oddList2 = [],
+              _evenList2 = [];
+          gc.flatCoordinates.map(function (item, index) {
+            // 判断下标奇偶数
+            if (index % 2 === 0) {
+              _evenList2.push(item);
+            } else {
+              _oddList2.push(item);
+            }
+          });
 
-            var _path2 = _oddList2.map(function (item, index) {
-              return [_evenList2[index], _oddList2[index]];
-            });
+          var _path2 = _oddList2.map(function (item, index) {
+            return [_evenList2[index], _oddList2[index]];
+          });
 
+          if (t.GM.isRepetition(t.drawParam.data.id)) {
+            t.updatePolygon([{
+              id: t.drawParam.data.id,
+              rings: _path2,
+              config: _objectSpread({}, t.drawParam.parameter)
+            }], t.drawParam.geometryType);
+          } else {
             t.addPolygon([{
               id: t.drawParam.data.id,
               rings: _path2,
               config: _objectSpread({}, t.drawParam.parameter)
-            }], t.drawParam.geometryType); //处理线返回参数
+            }], t.drawParam.geometryType);
+          } //处理线返回参数
+
 
-            var _t$dealData4 = t.dealData(_path2),
-                _lnglatAry2 = _t$dealData4.lnglatAry,
-                _extent3 = _t$dealData4._extent;
+          var _t$dealData4 = t.dealData(_path2),
+              _lnglatAry2 = _t$dealData4.lnglatAry,
+              _extent3 = _t$dealData4._extent;
 
-            param = {
-              lnglatAry: _lnglatAry2,
+          param = {
+            lnglatAry: _lnglatAry2,
+            id: t.drawParam.data.id,
+            geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
+              rings: _path2,
+              type: t.drawParam.geometryType,
+              _extent: _extent3
+            }),
+            attributes: {
               id: t.drawParam.data.id,
-              geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
-                rings: _path2,
-                type: t.drawParam.geometryType,
-                _extent: _extent3
-              }),
-              attributes: {
-                id: t.drawParam.data.id,
-                config: _objectSpread({}, t.drawParam.parameter)
-              },
-              area: (0, _MapToolFunction.getPolygonArea)(_path2),
-              geometryType: t.drawParam.geometryType,
-              mapLayer: t.GM.getGraphic(t.drawParam.data.id)
-            };
-          }
+              config: _objectSpread({}, t.drawParam.parameter)
+            },
+            area: (0, _MapToolFunction.getPolygonArea)(_path2),
+            geometryType: t.drawParam.geometryType,
+            mapLayer: t.GM.getGraphic(t.drawParam.data.id)
+          };
+        }
 
-          if (t.drawParam.geometryType == 'rectangle') {
-            var _path3 = e.feature.getGeometry().getCoordinates()[0];
+        if (t.drawParam.geometryType == 'rectangle') {
+          var _path3 = e.feature.getGeometry().getCoordinates()[0];
+
+          if (t.GM.isRepetition(t.drawParam.data.id)) {
+            t.updatePolygon([{
+              id: t.drawParam.data.id,
+              rings: _path3,
+              config: _objectSpread({}, t.drawParam.parameter)
+            }], t.drawParam.geometryType);
+          } else {
             t.addPolygon([{
               id: t.drawParam.data.id,
               rings: _path3,
               config: _objectSpread({}, t.drawParam.parameter)
-            }], t.drawParam.geometryType); //处理线返回参数
+            }], t.drawParam.geometryType);
+          } //处理线返回参数
 
-            var _t$dealData5 = t.dealData(_path3),
-                _lnglatAry3 = _t$dealData5.lnglatAry,
-                _extent4 = _t$dealData5._extent;
 
-            param = {
-              lnglatAry: _lnglatAry3,
+          var _t$dealData5 = t.dealData(_path3),
+              _lnglatAry3 = _t$dealData5.lnglatAry,
+              _extent4 = _t$dealData5._extent;
+
+          param = {
+            lnglatAry: _lnglatAry3,
+            id: t.drawParam.data.id,
+            geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
+              rings: _path3,
+              type: t.drawParam.geometryType,
+              _extent: _extent4
+            }),
+            attributes: {
               id: t.drawParam.data.id,
-              geometry: _objectSpread(_objectSpread({}, e.geometry), {}, {
-                rings: _path3,
-                type: t.drawParam.geometryType,
-                _extent: _extent4
-              }),
-              attributes: {
-                id: t.drawParam.data.id,
-                config: _objectSpread({}, t.drawParam.parameter)
-              },
-              area: (0, _MapToolFunction.getPolygonArea)(_path3),
-              geometryType: t.drawParam.geometryType,
-              mapLayer: t.GM.getGraphic(t.drawParam.data.id)
-            };
-          }
+              config: _objectSpread({}, t.drawParam.parameter)
+            },
+            area: (0, _MapToolFunction.getPolygonArea)(_path3),
+            geometryType: t.drawParam.geometryType,
+            mapLayer: t.GM.getGraphic(t.drawParam.data.id)
+          };
+        }
+
+        if (t.drawParam.geometryType == 'circle') {
+          var center = e.feature.getGeometry().getCenter();
+          var cur = e.feature.getProperties().geometry;
+          var sketchCoords_ = [cur.flatCoordinates[0], cur.flatCoordinates[1]];
+          var sketchCoords_2 = [cur.flatCoordinates[2], cur.flatCoordinates[3]];
+          var radius = ol.sphere.getDistance(sketchCoords_, sketchCoords_2);
 
-          if (t.drawParam.geometryType == 'circle') {
-            var center = e.feature.getGeometry().getCenter();
-            var cur = e.feature.getProperties().geometry;
-            var sketchCoords_ = [cur.flatCoordinates[0], cur.flatCoordinates[1]];
-            var sketchCoords_2 = [cur.flatCoordinates[2], cur.flatCoordinates[3]];
-            var radius = ol.sphere.getDistance(sketchCoords_, sketchCoords_2);
+          if (t.GM.isRepetition(t.drawParam.data.id)) {
+            t.updateCircle([{
+              id: t.drawParam.data.id,
+              longitude: center[0],
+              latitude: center[1],
+              radius: radius,
+              config: _objectSpread({}, t.drawParam.parameter)
+            }], t.drawParam.geometryType);
+          } else {
             t.addCircle([{
               id: t.drawParam.data.id,
               longitude: center[0],
@@ -1259,28 +1316,31 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               radius: radius,
               config: _objectSpread({}, t.drawParam.parameter)
             }], t.drawParam.geometryType);
-            param = {
-              area: Math.PI * Math.pow(radius, 2),
-              attributes: {
-                id: t.drawParam.data.id,
-                config: _objectSpread({}, t.drawParam.parameter)
-              },
-              geometry: {
-                type: t.drawParam.geometryType,
-                x: center[0],
-                y: center[1],
-                radius: radius
-              },
-              geometryType: t.drawParam.geometryType,
-              mapLayer: t.GM.getGraphic(t.drawParam.data.id)
-            };
           }
 
-          if ('drawEnd' in t.props && typeof t.props.drawEnd == 'function') {
-            t.props.drawEnd(param);
-          }
-        });
-      }
+          param = {
+            area: Math.PI * Math.pow(radius, 2),
+            attributes: {
+              id: t.drawParam.data.id,
+              config: _objectSpread({}, t.drawParam.parameter)
+            },
+            geometry: {
+              type: t.drawParam.geometryType,
+              x: center[0],
+              y: center[1],
+              radius: radius
+            },
+            geometryType: t.drawParam.geometryType,
+            mapLayer: t.GM.getGraphic(t.drawParam.data.id)
+          };
+        }
+
+        if ('drawEnd' in t.props && typeof t.props.drawEnd == 'function') {
+          t.props.drawEnd(param);
+        }
+      }); //保存绘制图元的id便于后期比对
+
+      t.state.drawIds[drawParam.geometryType].push(drawParam.data.id);
     } // 关闭绘制
 
   }, {
@@ -1525,10 +1585,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       }
     } //将制定图元展示在视野内 (强制改变地图中心位置)
 
-    /*
-        参数arg格式如下1,2
-        1.string   格式如:'1,a,2,3,4'
-        2.数组 ['1','2']
+    /*
+        参数arg格式如下1,2
+        1.string   格式如:'1,a,2,3,4'
+        2.数组 ['1','2']
     */
 
   }, {
@@ -1851,12 +1911,12 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         item.value.clear();
       });
     }
-    /*
-    * 添加信息窗口
-    * params
-    * @position: Array[longitude,latitude]
-    * @content: String|HTML
-    * @close: boolean
+    /*
+    * 添加信息窗口
+    * params
+    * @position: Array[longitude,latitude]
+    * @content: String|HTML
+    * @close: boolean
     */
 
   }, {
@@ -3703,10 +3763,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           olProps = nextProps.olProps; // 等待地图加载
 
       if (!t.state.mapCreated) return;
-      /*点数据处理
-          pointData[2]相同的点,执行刷新
-          pointData[1]的数据在idsForGraphicId中不存在的,执行新增
-          pointData[0]数据中多余的id,执行删除
+      /*点数据处理
+          pointData[2]相同的点,执行刷新
+          pointData[1]的数据在idsForGraphicId中不存在的,执行新增
+          pointData[0]数据中多余的id,执行删除
       */
 
       if (mapPoints instanceof Array && t.props.mapPoints instanceof Array && !t.deepEqual(mapPoints, t.props.mapPoints)) {
@@ -3755,9 +3815,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
       }
-      /*
-          线数据处理
-          先全删除,再新增
+      /*
+          线数据处理
+          先全删除,再新增
       */
 
 
@@ -3807,9 +3867,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updateLine([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
       }
-      /*
-          面数据处理
-          先全删除,再新增
+      /*
+          面数据处理
+          先全删除,再新增
       */
 
 
@@ -3859,9 +3919,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updatePolygon([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
       }
-      /*
-          圆数据处理
-          先全删除,再新增
+      /*
+          圆数据处理
+          先全删除,再新增
       */