@vtx/map 1.1.14 → 1.1.15

package/lib/VtxMap/OMap/Map.less

@@ -1,70 +1,70 @@
-.label-content{
-    display: inline-block;
-    padding: 5px;
-    line-height: 22px;
-    text-align: center;
-    border-radius: 5px;
-    background-color: #fff;
-    opacity: 1;
-    color: #5DD0EE;
-    transform: translate(-50%);
-    -ms-transform: translate(-50%);
-}
-.noselect {
-    -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Chrome/Safari/Opera */
-    -khtml-user-select: none; /* Konqueror */
-    -moz-user-select: none; /* Firefox */
-    -ms-user-select: none; /* Internet Explorer/Edge */
-    user-select: none; /* Non-prefixed version, currently
-    not supported by any browser */
-}
-.vtx_gmap_html_pointCollection_a{
-    position: absolute;
-    canvas{
-        z-index: 111;
-    }
-}
-.vtx-g-rangingPoint{
-    width: 8px;
-    height: 8px;
-    background-color: #fff;
-    border: 2px solid #108ee9;
-    display: inline-block;
-    border-radius: 8px;
-    position: relative;
-    top: 5px;
-    left: 1px;
-}
-.vtx-g-rangingDistance{
-    position: relative;
-    top: -36px;
-    left: 15px;
-    height: 30px;
-    line-height: 28px;
-    background-color: #fff;
-    border: 1px solid #108ee9;
-    font-size: 12px;
-    word-break: keep-all;
-    padding: 0px 3px;
-    color: #108ee9;
-}
-.vtx-g-rang-exit{
-    width: 12px;
-    height: 12px;
-    background-color: #fff;
-    border: 2px solid #108ee9;
-    color: #108ee9;
-    line-height: 7px;
-    text-align: center;
-    font-size: 12px;
-    cursor: pointer;
-}
-.vtx-g-rang-showRangTool{
-    line-height: 18px;
-    font-size: 12px;
-    border: 1px solid #108ee9;
-    word-break: keep-all;
-    background-color: #fff;
-    padding: 0px 5px;
-}
+.label-content{
+    display: inline-block;
+    padding: 5px;
+    line-height: 22px;
+    text-align: center;
+    border-radius: 5px;
+    background-color: #fff;
+    opacity: 1;
+    color: #5DD0EE;
+    transform: translate(-50%);
+    -ms-transform: translate(-50%);
+}
+.noselect {
+    -webkit-touch-callout: none; /* iOS Safari */
+    -webkit-user-select: none; /* Chrome/Safari/Opera */
+    -khtml-user-select: none; /* Konqueror */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* Internet Explorer/Edge */
+    user-select: none; /* Non-prefixed version, currently
+    not supported by any browser */
+}
+.vtx_gmap_html_pointCollection_a{
+    position: absolute;
+    canvas{
+        z-index: 111;
+    }
+}
+.vtx-g-rangingPoint{
+    width: 8px;
+    height: 8px;
+    background-color: #fff;
+    border: 2px solid #108ee9;
+    display: inline-block;
+    border-radius: 8px;
+    position: relative;
+    top: 5px;
+    left: 1px;
+}
+.vtx-g-rangingDistance{
+    position: relative;
+    top: -36px;
+    left: 15px;
+    height: 30px;
+    line-height: 28px;
+    background-color: #fff;
+    border: 1px solid #108ee9;
+    font-size: 12px;
+    word-break: keep-all;
+    padding: 0px 3px;
+    color: #108ee9;
+}
+.vtx-g-rang-exit{
+    width: 12px;
+    height: 12px;
+    background-color: #fff;
+    border: 2px solid #108ee9;
+    color: #108ee9;
+    line-height: 7px;
+    text-align: center;
+    font-size: 12px;
+    cursor: pointer;
+}
+.vtx-g-rang-showRangTool{
+    line-height: 18px;
+    font-size: 12px;
+    border: 1px solid #108ee9;
+    word-break: keep-all;
+    background-color: #fff;
+    padding: 0px 5px;
+}

package/lib/VtxMap/OlMap/Map.js

@@ -446,13 +446,15 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
       if (!projection) {
         projection = 'EPSG:4326';
-      }
+      } //中心点
+
 
+      var center = mapCenter && mapCenter instanceof Array && mapCenter.length == 2 ? mapCenter : [116.400433, 39.906705];
+      center = [parseFloat(center[0]), parseFloat(center[1])];
       window.VtxMap[mapId] = t.state.gis = new ol.Map({
         target: mapId.toString(),
         view: new ol.View({
-          center: mapCenter && mapCenter instanceof Array && mapCenter.length == 2 ? mapCenter : [116.400433, 39.906705],
-          //中心点
+          center: center,
           zoom: mapZoomLevel || 10,
           projection: projection,
           minZoom: minZoom,
@@ -466,8 +468,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       }); // 基本地图视图
 
       t.viewer = new ol.View({
-        center: mapCenter && mapCenter instanceof Array && mapCenter.length == 2 ? mapCenter : [116.400433, 39.906705],
-        //中心点
+        center: center,
         zoom: mapZoomLevel || 10,
         projection: projection,
         minZoom: minZoom,
@@ -952,6 +953,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
                 lng = _gc$flatCoordinates[0],
                 lat = _gc$flatCoordinates[1];
 
+            gc.x = lng;
+            gc.y = lat;
             t.addPoint([{
               id: t.drawParam.data.id,
               longitude: lng,
@@ -1372,10 +1375,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']
     */
 
   }, {
@@ -1698,12 +1701,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
     */
 
   }, {
@@ -1761,7 +1764,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
 
         var feature = new ol.Feature({
-          geometry: new ol.geom.Point([item.longitude, item.latitude]),
+          geometry: new ol.geom.Point([parseFloat(item.longitude), parseFloat(item.latitude)]),
           name: item.name,
           id: item.id,
           params: _objectSpread({}, item)
@@ -1792,7 +1795,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
           var pop = new ol.Overlay({
             id: item.id,
-            position: [item.longitude, item.latitude],
+            position: [parseFloat(item.longitude), parseFloat(item.latitude)],
             positioning: 'center-center',
             element: nodes,
             autoPanMargin: 20,
@@ -1897,8 +1900,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           geometryType: 'point',
           geometry: {
             type: 'point',
-            x: item.longitude,
-            y: item.latitude
+            x: parseFloat(item.longitude),
+            y: parseFloat(item.latitude)
           },
           source: source
         });
@@ -1955,7 +1958,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             var overlay = t.state.gis.getOverlayById(item.id);
             var nodes = t.parseDom(item.markerContent)[0];
             overlay.setElement(nodes);
-            overlay.setPosition([item.longitude, item.latitude]);
+            overlay.setPosition([parseFloat(item.longitude), parseFloat(item.latitude)]);
             t.state.gis.changed();
           } else {
             canvasDataURL(item.url || require("../images/defaultMarker.png"), {
@@ -2014,7 +2017,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             }
           }
 
-          gc.setGeometry(new ol.geom.Point([item.longitude, item.latitude]));
+          gc.setGeometry(new ol.geom.Point([parseFloat(item.longitude), parseFloat(item.latitude)]));
 
           _this3.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
@@ -2023,8 +2026,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             geometryType: 'point',
             geometry: {
               type: 'point',
-              x: item.longitude,
-              y: item.latitude
+              x: parseFloat(item.longitude),
+              y: parseFloat(item.latitude)
             },
             source: gp.source
           });
@@ -3480,10 +3483,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           isClearAll = nextProps.isClearAll; // 等待地图加载
 
       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)) {
@@ -3532,9 +3535,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
       }
-      /*
-          线数据处理
-          先全删除,再新增
+      /*
+          线数据处理
+          先全删除,再新增
       */
 
 
@@ -3584,9 +3587,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updateLine([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
       }
-      /*
-          面数据处理
-          先全删除,再新增
+      /*
+          面数据处理
+          先全删除,再新增
       */
 
 
@@ -3636,9 +3639,9 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
         t.updatePolygon([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
       }
-      /*
-          圆数据处理
-          先全删除,再新增
+      /*
+          圆数据处理
+          先全删除,再新增
       */