@vtx/map 1.1.0 → 1.1.4

package/lib/VtxMap/OlMap/Map.less

@@ -0,0 +1,122 @@
+.map{
+    width: 100%;
+    height: 100%;
+    background-color: #f1f1f1;
+}
+.vtx_gmap_html_points,.vtx_gmap_html_pointCollection{
+    position: absolute;
+    top: 0px;
+    left: 0px;
+}
+.esriSimpleSlider{
+    z-index: 10000000 !important;
+}
+.label-content{
+    /*margin-left: 0;
+    width: 100px;
+    line-height: 25px;
+    text-align: center;
+    position: relative;
+    left: -43px;
+    background-color: #fff;
+    opacity: 1;
+    border-radius: 5px;
+    color: #5DD0EE;
+    word-break: break-all;
+    white-space: normal;
+    padding: 2px 8px;*/
+    display: inline-block;
+    padding: 5px;
+    line-height: 22px;
+    text-align: center;
+    border-radius: 5px;
+    background-color: #fff;
+    opacity: 1;
+    color: #5DD0EE;
+}
+.vtx-g-rangingPoint{
+    width: 7px;
+    height: 7px;
+    background-color: #fff;
+    border: 2px solid #ff0000;
+    display: inline-block;
+    border-radius: 7px;
+}
+.vtx-g-rangingDistance{
+    position: relative;
+    top: -36px;
+    left: 15px;
+    height: 30px;
+    line-height: 28px;
+    background-color: #fff;
+    border: 1px solid #ff0000;
+    font-size: 12px;
+    word-break: keep-all;
+    padding: 0px 3px;
+}
+.vtx-g-rang-exit{
+    width: 9px;
+    height: 9px;
+    background-color: #fff;
+    border: 2px solid #ff0000;
+    color: #ff0000;
+    line-height: 7px;
+    text-align: center;
+    font-size: 12px;
+    cursor: pointer;
+}
+.vtx-g-rang-showRangTool{
+    line-height: 18px;
+    font-size: 12px;
+    border: 1px solid #ff0000;
+    word-break: keep-all;
+    background-color: #fff;
+    padding: 0px 5px;
+}
+.zoom_slider_show_scale{
+    padding: 1px 8px;
+    font-size: 12px;
+    text-align: center;
+}
+.zoom_slider_show_bottom{
+    width: 100%;
+    height: 3px;
+    border: 1px solid #000;
+    border-bottom: 3px solid #000;
+    border-top: 0px;
+}
+.ol-tooltip {
+    position: relative;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 4px;
+    color: white;
+    padding: 4px 8px;
+    opacity: 0.7;
+    white-space: nowrap;
+    font-size: 12px;
+    cursor: default;
+    user-select: none;
+}
+.ol-tooltip-measure {
+    opacity: 1;
+    font-weight: bold;
+}
+.ol-tooltip-static {
+    background-color: #ffcc33;
+    color: black;
+    border: 1px solid white;
+}
+.ol-tooltip-measure:before,
+.ol-tooltip-static:before {
+    border-top: 6px solid rgba(0, 0, 0, 0.5);
+    border-right: 6px solid transparent;
+    border-left: 6px solid transparent;
+    content: "";
+    position: absolute;
+    bottom: -6px;
+    margin-left: -7px;
+    left: 50%;
+}
+.ol-tooltip-static:before {
+    border-top-color: #ffcc33;
+}

package/lib/VtxMap/TMap/TMap.js

@@ -1587,11 +1587,11 @@ var TMap = function (_React$Component) {
                 infowindow && t.state.gis.closeInfoWindow();
             }
         }
-        /*
-            参数
-            geometryType:point/polyline/polygon/circle/rectangle  默认point
-            parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
-            data //初始化数据   默认{id:'add'}
+        /*
+            参数
+            geometryType:point/polyline/polygon/circle/rectangle  默认point
+            parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
+            data //初始化数据   默认{id:'add'}
         */
 
     }, {
@@ -2053,7 +2053,8 @@ var TMap = function (_React$Component) {
                     ms.geometry._extent = (0, _MapToolFunction.getMaxMin)(ms.mapLayer.getLngLats()[0])._extent;
                     obj.geometry = ms.geometry;
                     obj.param = ms;
-                    obj.area = (0, _MapToolFunction.getPolygonArea)(ms.mapLayer.getLngLats()[0]);
+                    // obj.area = getPolygonArea(ms.mapLayer.getLngLats()[0]);
+                    obj.area = t.polygonTool.getArea(ms.mapLayer.getLngLats()[0]);
                     break;
                 case 'circle':
                     obj.geometry = ms.geometry;
@@ -2798,10 +2799,10 @@ var TMap = function (_React$Component) {
                     t.clearAllPointCollection();
                 }
 
-                /*点数据处理
-                    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)) {
                     var oldMapPoints = t.props.mapPoints;
@@ -2861,9 +2862,9 @@ var TMap = function (_React$Component) {
                     //更新
                     t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
                 }
-                /*
-                    面数据处理
-                    先全删除,再新增
+                /*
+                    面数据处理
+                    先全删除,再新增
                 */
                 if (mapPolygons instanceof Array && t.props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, t.props.mapPolygons)) {
                     var oldMapPolygons = t.props.mapPolygons;
@@ -2922,9 +2923,9 @@ var TMap = function (_React$Component) {
                     //更新
                     t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
                 }
-                /*
-                    圆数据处理
-                    先全删除,再新增
+                /*
+                    圆数据处理
+                    先全删除,再新增
                 */
                 if (mapCircles instanceof Array && t.props.mapCircles instanceof Array && !t.deepEqual(mapCircles, t.props.mapCircles)) {
                     var oldMapCircles = t.props.mapCircles;
@@ -2983,9 +2984,9 @@ var TMap = function (_React$Component) {
                     //更新
                     t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
                 }
-                /*
-                    线数据处理
-                    先全删除,再新增
+                /*
+                    线数据处理
+                    先全删除,再新增
                 */
                 if (mapLines instanceof Array && t.props.mapLines instanceof Array && !t.deepEqual(mapLines, t.props.mapLines)) {
                     var oldMapLines = t.props.mapLines;

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -161,7 +161,9 @@ var VtxSearchMap = function (_React$Component) {
             modal1Visible: props.modal1Visible || false,
             isShowOther: props.isShowOther || false,
             otherText: props.otherText || '显示服务区域',
-            isShowOtherGraph: props.isShowOther || false
+            isShowOtherGraph: props.isShowOther || false,
+            // openlayer
+            olProps: props.olProps
         };
         return _this;
     }
@@ -253,7 +255,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';
                 }
@@ -502,7 +505,8 @@ var VtxSearchMap = function (_React$Component) {
                 otherText = _state2.otherText,
                 isShowOtherGraph = _state2.isShowOtherGraph,
                 editGraphic = _state2.editGraphic,
-                graphicType = _state2.graphicType;
+                graphicType = _state2.graphicType,
+                olProps = _state2.olProps;
 
             var InputProps = {
                 style: { 'width': '200px' },
@@ -574,6 +578,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;
 
@@ -619,7 +635,7 @@ var VtxSearchMap = function (_React$Component) {
                     _react2.default.createElement(
                         'div',
                         { className: styles.top },
-                        mapType == 'gmap' ? '' : [_react2.default.createElement(_input2.default, _extends({ key: '1' }, InputProps)), _react2.default.createElement(
+                        mapType == 'gmap' || mapType == 'olmap' ? '' : [_react2.default.createElement(_input2.default, _extends({ key: '1' }, InputProps)), _react2.default.createElement(
                             _button2.default,
                             { key: '2', type: 'primary', onClick: this.searchList.bind(this), icon: getIcon('search') },
                             '\u67E5\u8BE2'
@@ -652,7 +668,7 @@ var VtxSearchMap = function (_React$Component) {
                                 }, icon: getIcon('edit') },
                             '\u91CD\u65B0\u7ED8\u5236'
                         ) : null,
-                        mapType == 'gmap' ? '' : _react2.default.createElement(
+                        mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
                             _button2.default,
                             { onClick: this.setFitView.bind(this), icon: getIcon('sync') },
                             '\u8FD4\u56DE\u5168\u5C40\u5730\u56FE'
@@ -671,8 +687,8 @@ var VtxSearchMap = function (_React$Component) {
                     ),
                     _react2.default.createElement(
                         'div',
-                        { className: styles.content, style: { paddingLeft: mapType == 'gmap' ? '0px' : '25px' } },
-                        mapType == 'gmap' ? '' : _react2.default.createElement(
+                        { className: styles.content, style: { paddingLeft: mapType == 'gmap' || mapType == 'olmap' ? '0px' : '25px' } },
+                        mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
                             'div',
                             { className: styles.content_left + ' ' + (isShowList ? styles.w_l : '') },
                             _react2.default.createElement(
@@ -751,7 +767,9 @@ var VtxSearchMap = function (_React$Component) {
                                 clickMap: function clickMap() {
                                     t.isClickMap = true;
                                 }
-                            }, drawProps))
+                            }, drawProps, {
+                                olProps: olProps
+                            }))
                         )
                     )
                 )
@@ -846,6 +864,8 @@ var VtxSearchMap = function (_React$Component) {
                                     _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
                                     _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
                                     _this6.map.state.gis.graphics.refresh();
+                                case 'olMap':
+                                    _this6.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
                                     break;
                             }
                         }

package/lib/default.js

@@ -28,7 +28,9 @@ exports.default = {
     //地图服务地址ip
     mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : '//vortexplugin.cloudhw.cn/mapplugin',
     //arcgis地图服务ip
-    arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : '//vortexplugin.cloudhw.cn/gis'
+    arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : '//vortexplugin.cloudhw.cn/gis',
+    //openlayer地图服务ip
+    openlayerServerURL: globalCfg.openlayerServerURL ? globalCfg.openlayerServerURL : '//vortexplugin.cloudhw.cn/openlayer'
 };
 function getTMapTK() {
     if (window.TMapTK) {

package/package.json

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