@vtx/map 1.0.3 → 1.0.7

package/lib/VtxMap/AMap/AMap.js

@@ -91,6 +91,12 @@ var VortexAMap = function (_React$Component) {
                 rectangle: []
             }
         };
+        _this.AnchorConstant = {
+            tr: 'RT',
+            tl: 'LT',
+            bl: 'LB',
+            br: 'RB'
+        };
         _this.loadMapJs();
         return _this;
     }
@@ -103,7 +109,7 @@ var VortexAMap = function (_React$Component) {
                     resolve(window.AMap);
                 } else {
                     $.getScript(_default2.default.mapServerURL + '/A_content.js', function () {
-                        $.getScript('//webapi.amap.com/maps?v=1.4.14&key=e59ef9272e3788ac59d9a22f0f8cf9fe&plugin=AMap.Geolocation,AMap.MarkerClusterer,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.RangingTool,AMap.MouseTool,AMap.PolyEditor,AMap.CircleEditor,AMap.PlaceSearch,AMap.Heatmap', function () {
+                        $.getScript('//webapi.amap.com/maps?v=1.4.14&key=e59ef9272e3788ac59d9a22f0f8cf9fe&plugin=AMap.Geolocation,AMap.MarkerClusterer,AMap.MapType,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.RangingTool,AMap.MouseTool,AMap.PolyEditor,AMap.CircleEditor,AMap.PlaceSearch,AMap.Heatmap', function () {
                             var PointCollection = new Promise(function (resolve, reject) {
                                 $.getScript(_default2.default.mapServerURL + '/GPointCollection.js', function () {
                                     resolve();
@@ -111,7 +117,7 @@ var VortexAMap = function (_React$Component) {
                             });
                             Promise.all([PointCollection]).then(function () {
                                 (function setTime() {
-                                    var allEvents = [window.AMap, 'MarkerClusterer', 'Scale', 'ToolBar', 'DistrictSearch', 'RangingTool', 'MouseTool', 'PolyEditor', 'CircleEditor', 'PlaceSearch', 'Heatmap'];
+                                    var allEvents = [window.AMap, 'MarkerClusterer', 'MapType', 'Scale', 'ToolBar', 'DistrictSearch', 'RangingTool', 'MouseTool', 'PolyEditor', 'CircleEditor', 'PlaceSearch', 'Heatmap'];
                                     var isLoading = true;
                                     for (var i = 0; i <= allEvents.length - 1; i++) {
                                         if (i === 0) {
@@ -208,7 +214,10 @@ var VortexAMap = function (_React$Component) {
             if (showControl) {
                 t.showControl();
             }
-
+            //添加地图类型控件
+            if (t.props.satelliteSwitch) {
+                t.showMapTypeControl();
+            }
             //画边界线
             if (boundaryName instanceof Array && boundaryName.length > 0) {
                 t.addBaiduBoundary(boundaryName);
@@ -735,11 +744,87 @@ var VortexAMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
-            var t = this;
-            t.state.gis.addControl(t.scale);
-            if (t.props.showControl.type !== 'null' && !!t.props.showControl.type) {
-                t.state.gis.addControl(t.tool);
+        value: function showControl(props) {
+            var t = this,
+                location = 'RT',
+                offset = null;
+            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 (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(props) {
+            var t = this,
+                location = 'RT',
+                offset = null;
+            var config = props || t.props;
+            if (t.mapTypeControl) {
+                t.state.gis.removeControl(t.mapTypeControl);
+            }
+            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);
             }
         }
         //获取图元数据
@@ -2917,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

@@ -322,6 +322,19 @@ var BaiduMap = function (_React$Component) {
             } else {
                 window.VtxMap = {};
             }
+            // 控件位置常量
+            t.AnchorConstant = {
+                tr: BMAP_ANCHOR_TOP_RIGHT,
+                tl: BMAP_ANCHOR_TOP_LEFT,
+                bl: BMAP_ANCHOR_BOTTOM_LEFT,
+                br: BMAP_ANCHOR_BOTTOM_RIGHT
+                // 平移缩放控件大小
+            };t.NavigationConstant = {
+                large: BMAP_NAVIGATION_CONTROL_LARGE,
+                small: BMAP_NAVIGATION_CONTROL_SMALL,
+                pan: BMAP_NAVIGATION_CONTROL_PAN,
+                zoom: BMAP_NAVIGATION_CONTROL_ZOOM
+            };
             var map = window.VtxMap[mapId] = t.state.gis = new BMap.Map(mapId.toString(), {
                 enableMapClick: false,
                 minZoom: options.minZoom,
@@ -340,9 +353,9 @@ var BaiduMap = function (_React$Component) {
             }, 500);
             // 初始化地图,设置中心点坐标和地图级别
             map.centerAndZoom(new BMap.Point(parseFloat(options.center[0]), parseFloat(options.center[1])), options.zoom);
-            //添加地图类型控件(几乎不用,先写着)
+            //添加地图类型控件
             if (t.props.satelliteSwitch) {
-                map.addControl(new BMap.MapTypeControl());
+                t.showMapTypeControl();
             }
             //初始化路况控件
             if (!t._trafficCtrl) {
@@ -2209,47 +2222,64 @@ var BaiduMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
+        value: function showControl(props) {
             var t = this,
-                location = BMAP_ANCHOR_TOP_LEFT,
-                type = '';
-            switch (t.props.showControl.location) {
-                case 'tl':
-                    location = BMAP_ANCHOR_TOP_LEFT;
-                    break;
-                case 'bl':
-                    location = BMAP_ANCHOR_BOTTOM_LEFT;
-                    break;
-                case 'tr':
-                    location = BMAP_ANCHOR_TOP_RIGHT;
-                    break;
-                case 'br':
-                    location = BMAP_ANCHOR_BOTTOM_RIGHT;
-                    break;
+                location = t.AnchorConstant['tr'],
+                type = '',
+                offset = null,
+                scaleOffset = null;
+            var config = props || t.props;
+            if (t.scaleControl) {
+                t.state.gis.removeControl(t.scaleControl);
             }
-            switch (t.props.showControl.type) {
-                case 'all':
-                    type = '';
-                    break;
-                case 'small':
-                    type = BMAP_NAVIGATION_CONTROL_SMALL;
-                    break;
-                case 'pan':
-                    type = BMAP_NAVIGATION_CONTROL_PAN;
-                    break;
-                case 'zoom':
-                    type = BMAP_NAVIGATION_CONTROL_ZOOM;
-                    break;
+            if (t.navigationControl) {
+                t.state.gis.removeControl(t.navigationControl);
+            }
+            if (config.showControl.location) {
+                location = t.AnchorConstant[config.showControl.location];
+            }
+            if (config.showControl.type) {
+                type = t.NavigationConstant[config.showControl.type];
+            }
+            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 });
+            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 });
+                var navigation = new BMap.NavigationControl({ anchor: location, type: type, offset: offset });
                 t.state.gis.addControl(navigation);
+                t.navigationControl = navigation;
             }
         }
+        //展示地图切换控件
+
+    }, {
+        key: 'showMapTypeControl',
+        value: function showMapTypeControl(props) {
+            var t = this,
+                location = t.AnchorConstant['br'],
+                offset = null;
+            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 (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({ mapTypes: mapTypes, anchor: location, type: BMAP_MAPTYPE_CONTROL_HORIZONTAL, offset: offset });
+            t.state.gis.addControl(control);
+            t.mapTypeControl = control;
+        }
         /*设置显示区域*/
 
     }, {
@@ -3104,6 +3134,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',
@@ -3117,7 +3155,7 @@ var BaiduMap = function (_React$Component) {
             if (t.moveToTimer) {
                 clearInterval(t.moveToTimer);
             }
-            window.VtxMap[t.state.mapId] = null;
+            window.VtxMap && (window.VtxMap[t.state.mapId] = null);
         }
     }]);
 

package/lib/VtxMap/TMap/TMap.js

@@ -218,7 +218,10 @@ var TMap = function (_React$Component) {
             if (showControl) {
                 t.showControl();
             }
-
+            //添加地图类型控件
+            if (t.props.satelliteSwitch) {
+                t.showMapTypeControl();
+            }
             // //画边界线
             // if(boundaryName instanceof Array && boundaryName.length>0){
             //     t.addBaiduBoundary(boundaryName);
@@ -263,6 +266,13 @@ var TMap = function (_React$Component) {
             if (!window.VtxMap) {
                 window.VtxMap = {};
             }
+            // 控件位置常量
+            t.AnchorConstant = {
+                tr: T_ANCHOR_TOP_RIGHT,
+                tl: T_ANCHOR_TOP_LEFT,
+                bl: T_ANCHOR_BOTTOM_LEFT,
+                br: T_ANCHOR_BOTTOM_RIGHT
+            };
             window.VtxMap[mapId] = t.state.gis = new T.Map(mapId.toString(), {
                 //zoom等级,和百度一样默认10
                 zoom: mapZoomLevel || 10,
@@ -555,63 +565,74 @@ var TMap = function (_React$Component) {
 
     }, {
         key: 'showControl',
-        value: function showControl() {
-            var t = this;
-            var zlt = T_ANCHOR_BOTTOM_RIGHT;
-            var zls = T_ANCHOR_BOTTOM_RIGHT;
-            if (t.props.showControl) {
-                switch (t.props.showControl.location) {
-                    case 'tl':
-                        zlt = T_ANCHOR_TOP_LEFT;
-                        zls = T_ANCHOR_BOTTOM_LEFT;
-                        break;
-                    case 'bl':
-                        zlt = T_ANCHOR_BOTTOM_LEFT;
-                        zls = T_ANCHOR_BOTTOM_LEFT;
-                        break;
-                    case 'tr':
-                        zlt = T_ANCHOR_TOP_RIGHT;
-                        zls = T_ANCHOR_BOTTOM_RIGHT;
-                        break;
-                    case 'br':
-                        zlt = T_ANCHOR_BOTTOM_RIGHT;
-                        zls = T_ANCHOR_BOTTOM_RIGHT;
-                        break;
-                }
-            }
-            var zoomControl = void 0,
-                scaleControl = void 0;
-            switch (t.props.showControl.type) {
-                case 'all':
-                case 'small':
-                case 'pan':
-                case 'zoom':
-                    zoomControl = new T.Control.Zoom();
-                    scaleControl = new T.Control.Scale();
-                    this.state.gis.addControl(scaleControl);
-                    this.state.gis.addControl(zoomControl);
-                    zoomControl.setPosition(zlt);
-                    scaleControl.setPosition(zls);
-                    break;
-                default:
-                    scaleControl = new T.Control.Scale();
-                    this.state.gis.addControl(scaleControl);
-                    scaleControl.setPosition(zls);
-                    break;
+        value: function showControl(props) {
+            var t = this,
+                location = t.AnchorConstant['tr'],
+                offset = null,
+                scaleOffset = null;
+            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];
+            }
+            // 添加比例尺
+            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(props) {
+            var t = this,
+                location = t.AnchorConstant['br'],
+                offset = null;
+            var config = props || t.props;
+            if (t.mapTypeControl) {
+                t.state.gis.removeControl(t.mapTypeControl);
             }
-            var fdom = document.getElementById(t.props.mapId);
-            //天地图 api问题  使用js dom操作css
-            if (t.props.showControl && t.props.showControl.location == 'bl') {
-                var dom = fdom.getElementsByClassName('tdt-control-scale')[0];
-                dom.style.position = 'relative';
-                dom.style.top = '65px';
-                dom.style.left = '45px';
+            if (config.satelliteSwitch.location) {
+                location = t.AnchorConstant[config.satelliteSwitch.location];
             }
-            if (t.props.showControl && t.props.showControl.location == 'br') {
-                var _dom = fdom.getElementsByClassName('tdt-control-scale')[0];
-                _dom.style.position = 'relative';
-                _dom.style.top = '65px';
-                _dom.style.right = '45px';
+            // 地图切换控件
+            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] });
+                }
             }
         }
         //测距
@@ -3119,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.3",
+  "version": "1.0.7",
   "description": "@vtx/map",
   "main": "lib/index.js",
   "scripts": {