@vtx/map 1.0.4 → 1.0.5

package/lib/VtxMap/AMap/AMap.js

@@ -744,44 +744,88 @@ var VortexAMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
+        value: function showControl(props) {
             var t = this,
                 location = 'RT',
                 offset = null;
-
-            if (t.props.showControl.location) {
-                location = t.AnchorConstant[t.props.showControl.location];
+            var config = props || t.props;
+            if (t.scaleControl) {
+                t.state.gis.removeControl(t.scaleControl);
+            }
+            if (t.navigationControl) {
+                t.state.gis.removeControl(t.navigationControl);
             }
-            if (t.props.showControl.offset && t.props.showControl.offset.length > 0) {
-                offset = new AMap.Pixel(t.props.showControl.offset[0], t.props.showControl.offset[1]);
-                scaleOffset = new AMap.Pixel(t.props.showControl.offset[0] + 70, t.props.showControl.offset[1]);
+            if (config.showControl.location) {
+                location = t.AnchorConstant[config.showControl.location];
+            }
+            if (config.showControl.offset && config.showControl.offset.length > 0) {
+                offset = new AMap.Pixel(config.showControl.offset[0], config.showControl.offset[1]);
+                scaleOffset = new AMap.Pixel(config.showControl.offset[0] + 70, config.showControl.offset[1]);
             }
             // 添加比例尺
             var control = new AMap.Scale({ position: location, offset: scaleOffset });
             t.state.gis.addControl(control);
-
+            t.scaleControl = control;
             // 包含平移和缩放按钮
             var navigation = new AMap.ToolBar({ position: location, offset: offset });
             t.state.gis.addControl(navigation);
+            t.navigationControl = navigation;
         }
         //展示地图切换控件
 
     }, {
         key: 'showMapTypeControl',
-        value: function showMapTypeControl() {
+        value: function showMapTypeControl(props) {
             var t = this,
                 location = 'RT',
                 offset = null;
-            // TODO，MapType没有这些属性，所以下面定位和偏移不生效
-            if (t.props.satelliteSwitch.location) {
-                location = t.AnchorConstant[t.props.showControl.location];
+            var config = props || t.props;
+            if (t.mapTypeControl) {
+                t.state.gis.removeControl(t.mapTypeControl);
             }
-            if (t.props.satelliteSwitch.offset && t.props.satelliteSwitch.offset.length > 0) {
-                offset = new AMap.Pixel(t.props.satelliteSwitch.offset[0], t.props.satelliteSwitch.offset[1]);
+            if (config.satelliteSwitch.location) {
+                location = t.AnchorConstant[config.satelliteSwitch.location];
             }
+
             // 地图切换控件
             var control = new AMap.MapType({ position: location, offset: offset });
             t.state.gis.addControl(control);
+            t.mapTypeControl = control;
+
+            // TODO，MapType没有这些属性，所以下面定位和偏移不生效，手动修改
+            function reloaction() {
+                if (location == 'RT') {
+                    $('div.amap-maptypecontrol').css({ right: 0, top: 0, left: 'inherit', bottom: 'inherit' });
+                } else if (location == 'LT') {
+                    $('div.amap-maptypecontrol').css({ left: 0 + 64, top: 0, right: 'inherit', bottom: 'inherit' });
+                } else if (location == 'LB') {
+                    $('div.amap-maptypecontrol').css({ left: 0 + 64, bottom: 0 + 84, right: 'inherit', top: 'inherit' });
+                } else if (location == 'RB') {
+                    $('div.amap-maptypecontrol').css({ right: 0, bottom: 0 + 84, left: 'inherit', top: 'inherit' });
+                }
+                if (config.satelliteSwitch.offset && config.satelliteSwitch.offset.length > 0) {
+                    if (location == 'RT') {
+                        $('div.amap-maptypecontrol').css({ right: config.satelliteSwitch.offset[0], top: config.satelliteSwitch.offset[1], left: 'inherit', bottom: 'inherit' });
+                    } else if (location == 'LT') {
+                        $('div.amap-maptypecontrol').css({ left: config.satelliteSwitch.offset[0] + 64, top: config.satelliteSwitch.offset[1], right: 'inherit', bottom: 'inherit' });
+                    } else if (location == 'LB') {
+                        $('div.amap-maptypecontrol').css({ left: config.satelliteSwitch.offset[0] + 64, bottom: config.satelliteSwitch.offset[1] + 84, right: 'inherit', top: 'inherit' });
+                    } else if (location == 'RB') {
+                        $('div.amap-maptypecontrol').css({ right: config.satelliteSwitch.offset[0], bottom: config.satelliteSwitch.offset[1] + 84, left: 'inherit', top: 'inherit' });
+                    }
+                }
+            }
+            if ($('div.amap-maptypecontrol').length > 0) {
+                reloaction();
+            } else {
+                var timer = setInterval(function () {
+                    console.log(123);
+                    if ($('div.amap-maptypecontrol').length > 0) {
+                        clearInterval(timer);
+                        reloaction();
+                    }
+                }, 500);
+            }
         }
         //获取图元数据
 
@@ -2958,6 +3002,15 @@ var VortexAMap = function (_React$Component) {
             if (typeof isClearAreaRestriction == 'boolean' && isClearAreaRestriction || isClearAreaRestriction && isClearAreaRestriction !== t.props.isClearAreaRestriction) {
                 t.clearAreaRestriction();
             }
+
+            // 比例尺控件位置改变
+            if (nextProps.showControl && JSON.stringify(nextProps.showControl) != JSON.stringify(t.props.showControl)) {
+                t.showControl(nextProps);
+            }
+            // 地图类型控件位置改变
+            if (nextProps.satelliteSwitch && JSON.stringify(nextProps.satelliteSwitch) != JSON.stringify(t.props.satelliteSwitch)) {
+                t.showMapTypeControl(nextProps);
+            }
         }
     }, {
         key: 'componentWillUnmount',

package/lib/VtxMap/BMap/Map.js

@@ -37,13 +37,6 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var Set = _immutable2.default.Set;
 //公共地址配置
 
-// 百度地图js文件内做了一些额外的http or https判断
-// 如果协议为Https，我们需要改动全局变量BMAP_PROTOCOL和BMap_loadScriptTime
-if (window.location.protocol === 'https:') {
-    window.BMAP_PROTOCOL = "https";
-    window.BMap_loadScriptTime = new Date().getTime();
-}
-
 var gisMapConstant = {
     circle: 'BMAP_POINT_SHAPE_CIRCLE', //圆形
     star: 1, //星形
@@ -2222,48 +2215,63 @@ var BaiduMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
+        value: function showControl(props) {
             var t = this,
                 location = t.AnchorConstant['tr'],
                 type = '',
                 offset = null,
                 scaleOffset = null;
-            if (t.props.showControl.location) {
-                location = t.AnchorConstant[t.props.showControl.location];
+            var config = props || t.props;
+            if (t.scaleControl) {
+                t.state.gis.removeControl(t.scaleControl);
+            }
+            if (t.navigationControl) {
+                t.state.gis.removeControl(t.navigationControl);
+            }
+            if (config.showControl.location) {
+                location = t.AnchorConstant[config.showControl.location];
             }
-            if (t.props.showControl.type) {
-                type = t.NavigationConstant[t.props.showControl.type];
+            if (config.showControl.type) {
+                type = t.NavigationConstant[config.showControl.type];
             }
-            if (t.props.showControl.offset && t.props.showControl.offset.length > 0) {
-                offset = new BMap.Size(t.props.showControl.offset[0], t.props.showControl.offset[1]);
-                scaleOffset = new BMap.Size(t.props.showControl.offset[0] + 70, t.props.showControl.offset[1]);
+            if (config.showControl.offset && config.showControl.offset.length > 0) {
+                offset = new BMap.Size(config.showControl.offset[0], config.showControl.offset[1]);
+                scaleOffset = new BMap.Size(config.showControl.offset[0] + 70, config.showControl.offset[1]);
             }
             // 左上角，添加比例尺
             var control = new BMap.ScaleControl({ anchor: location, offset: scaleOffset });
             t.state.gis.addControl(control);
+            t.scaleControl = control;
             if (type !== 'null') {
                 //右上角，仅包含平移和缩放按钮
                 var navigation = new BMap.NavigationControl({ anchor: location, type: type, offset: offset });
                 t.state.gis.addControl(navigation);
+                t.navigationControl = navigation;
             }
         }
         //展示地图切换控件
 
     }, {
         key: 'showMapTypeControl',
-        value: function showMapTypeControl() {
+        value: function showMapTypeControl(props) {
             var t = this,
                 location = t.AnchorConstant['br'],
                 offset = null;
-            if (t.props.satelliteSwitch.location) {
-                location = t.AnchorConstant[t.props.satelliteSwitch.location];
+            var config = props || t.props;
+            if (t.mapTypeControl) {
+                t.state.gis.removeControl(t.mapTypeControl);
             }
-            if (t.props.satelliteSwitch.offset && t.props.satelliteSwitch.offset.length > 0) {
-                offset = new BMap.Size(t.props.satelliteSwitch.offset[0], t.props.satelliteSwitch.offset[1]);
+            if (config.satelliteSwitch.location) {
+                location = t.AnchorConstant[config.satelliteSwitch.location];
             }
+            if (config.satelliteSwitch.offset && config.satelliteSwitch.offset.length > 0) {
+                offset = new BMap.Size(config.satelliteSwitch.offset[0], config.satelliteSwitch.offset[1]);
+            }
+            var mapTypes = [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP, BMAP_HYBRID_MAP];
             // 地图切换控件
-            var control = new BMap.MapTypeControl({ anchor: location, type: BMAP_MAPTYPE_CONTROL_MAP, offset: offset });
+            var control = new BMap.MapTypeControl({ mapTypes: mapTypes, anchor: location, type: BMAP_MAPTYPE_CONTROL_HORIZONTAL, offset: offset });
             t.state.gis.addControl(control);
+            t.mapTypeControl = control;
         }
         /*设置显示区域*/
 
@@ -3119,6 +3127,14 @@ var BaiduMap = function (_React$Component) {
                     t.removeGraphic(item.id, item.type);
                 });
             }
+            // 比例尺控件位置改变
+            if (nextProps.showControl && JSON.stringify(nextProps.showControl) != JSON.stringify(t.props.showControl)) {
+                t.showControl(nextProps);
+            }
+            // 地图类型控件位置改变
+            if (nextProps.satelliteSwitch && JSON.stringify(nextProps.satelliteSwitch) != JSON.stringify(t.props.satelliteSwitch)) {
+                t.showMapTypeControl(nextProps);
+            }
         }
     }, {
         key: 'componentWillUnmount',

package/lib/VtxMap/TMap/TMap.js

@@ -565,41 +565,75 @@ var TMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
+        value: function showControl(props) {
             var t = this,
                 location = t.AnchorConstant['tr'],
                 offset = null,
                 scaleOffset = null;
-            if (t.props.showControl.location) {
-                location = t.AnchorConstant[t.props.showControl.location];
+            var config = props || t.props;
+            if (t.scaleControl) {
+                t.state.gis.removeControl(t.scaleControl);
+            }
+            if (t.navigationControl) {
+                t.state.gis.removeControl(t.navigationControl);
+            }
+            if (config.showControl.location) {
+                location = t.AnchorConstant[config.showControl.location];
             }
-            if (t.props.showControl.offset && t.props.showControl.offset.length > 0) {}
-            // TODO不支持偏移
-
             // 添加比例尺
             var control = new T.Control.Scale({ position: location, offset: scaleOffset });
             t.state.gis.addControl(control);
+            t.scaleControl = control;
             // 缩放地图
             var navigation = new T.Control.Zoom({ position: location, offset: offset });
             t.state.gis.addControl(navigation);
+            t.navigationControl = navigation;
+
+            // TODO不支持偏移，手动偏移
+            if (config.showControl.offset && config.showControl.offset.length > 0) {
+                if (location == "topright") {
+                    $('div.tdt-top.tdt-right').css({ right: config.showControl.offset[0], top: config.showControl.offset[1] });
+                } else if (location == "topleft") {
+                    $('div.tdt-top.tdt-left').css({ left: config.showControl.offset[0], top: config.showControl.offset[1] });
+                } else if (location == "bottomleft") {
+                    $('div.tdt-bottom.tdt-left').css({ left: config.showControl.offset[0], bottom: config.showControl.offset[1] });
+                } else if (location == "bottomright") {
+                    $('div.tdt-bottom.tdt-right').css({ right: config.showControl.offset[0], bottom: config.showControl.offset[1] });
+                }
+            }
         }
         //展示地图切换控件
 
     }, {
         key: 'showMapTypeControl',
-        value: function showMapTypeControl() {
+        value: function showMapTypeControl(props) {
             var t = this,
                 location = t.AnchorConstant['br'],
                 offset = null;
-            if (t.props.satelliteSwitch.location) {
-                location = t.AnchorConstant[t.props.satelliteSwitch.location];
+            var config = props || t.props;
+            if (t.mapTypeControl) {
+                t.state.gis.removeControl(t.mapTypeControl);
+            }
+            if (config.satelliteSwitch.location) {
+                location = t.AnchorConstant[config.satelliteSwitch.location];
             }
-            if (t.props.satelliteSwitch.offset && t.props.satelliteSwitch.offset.length > 0) {}
-            // TODO不支持偏移
-
             // 地图切换控件
             var control = new T.Control.MapType({ position: location, offset: offset });
             t.state.gis.addControl(control);
+            t.mapTypeControl = control;
+
+            // TODO不支持偏移，手动偏移
+            if (config.satelliteSwitch.offset && config.satelliteSwitch.offset.length > 0) {
+                if (location == "topright") {
+                    $('div.tdt-top.tdt-right').css({ right: config.satelliteSwitch.offset[0], top: config.satelliteSwitch.offset[1] });
+                } else if (location == "topleft") {
+                    $('div.tdt-top.tdt-left').css({ left: config.satelliteSwitch.offset[0], top: config.satelliteSwitch.offset[1] });
+                } else if (location == "bottomleft") {
+                    $('div.tdt-bottom.tdt-left').css({ left: config.satelliteSwitch.offset[0], bottom: config.satelliteSwitch.offset[1] });
+                } else if (location == "bottomright") {
+                    $('div.tdt-bottom.tdt-right').css({ right: config.satelliteSwitch.offset[0], bottom: config.satelliteSwitch.offset[1] });
+                }
+            }
         }
         //测距
 
@@ -3106,6 +3140,15 @@ var TMap = function (_React$Component) {
                     }
                 }, 100);
             }
+
+            // 比例尺控件位置改变
+            if (nextProps.showControl && JSON.stringify(nextProps.showControl) != JSON.stringify(t.props.showControl)) {
+                t.showControl(nextProps);
+            }
+            // 地图类型控件位置改变
+            if (nextProps.satelliteSwitch && JSON.stringify(nextProps.satelliteSwitch) != JSON.stringify(t.props.satelliteSwitch)) {
+                t.showMapTypeControl(nextProps);
+            }
         }
     }, {
         key: 'componentWillUnmount',

package/package.json

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