xy-map 1.1.39 → 1.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {

package/xy-map.common.js

@@ -1,27 +1,6 @@
 /******/ (function() { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 5033:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2389);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7125);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__);
-// Imports
-
-
-var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
-// Module
-___CSS_LOADER_EXPORT___.push([module.id, ".el-scrollbar .el-scrollbar__view .el-select-dropdown__item[data-v-5a009b74]{height:auto;max-height:274px;padding:0;overflow:hidden;overflow-y:auto}.el-select-dropdown__item.selected[data-v-5a009b74]{font-weight:400}ul li[data-v-5a009b74] .el-tree .el-tree-node__content{height:auto;padding:0 20px}.el-tree-node__label[data-v-5a009b74]{font-weight:400}.el-tree[data-v-5a009b74] .is-current .el-tree-node__label{color:#409eff;font-weight:700}.el-tree[data-v-5a009b74] .is-current .el-tree-node__children .el-tree-node__label{color:#606266;font-weight:400}.selectInput[data-v-5a009b74]{padding:0 5px;box-sizing:border-box}", ""]);
-// Exports
-/* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
-
-
-/***/ }),
-
 /***/ 5203:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -42800,22 +42779,6 @@ function defaultCompare(a, b) {
 
 /***/ }),
 
-/***/ 5650:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__(5033);
-if(content.__esModule) content = content.default;
-if(typeof content === 'string') content = [[module.id, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("903f873a", content, true, {"sourceMap":false,"shadowMode":false});
-
-/***/ }),
-
 /***/ 6957:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
@@ -43682,7 +43645,6 @@ __webpack_require__.d(__webpack_exports__, {
   "drawPoint": function() { return /* reexport */ draw_point; },
   "drawPolygon": function() { return /* reexport */ draw_polygon; },
   "drawTools": function() { return /* reexport */ draw; },
-  "elTreeSelect": function() { return /* reexport */ el_tree_select; },
   "jsonFile": function() { return /* reexport */ jsonFile; },
   "mapDraw": function() { return /* reexport */ mapDraw; },
   "mapEvent": function() { return /* reexport */ mapEvent; },
@@ -43782,7 +43744,6 @@ __webpack_require__.d(package_namespaceObject, {
   "Qd": function() { return draw_point; },
   "is": function() { return draw_polygon; },
   "Cx": function() { return draw; },
-  "FC": function() { return el_tree_select; },
   "tP": function() { return jsonFile; },
   "Gx": function() { return mapDraw; },
   "A": function() { return mapEvent; },
@@ -43950,6 +43911,245 @@ const setHigh = (id, filter) => {
   } = package_map;
   map.setFilter(id + '-high', filter);
 };
+;// CONCATENATED MODULE: ./src/package/util/mapboxgl-control-minimap.js
+
+function Minimap(options) {
+  Object.assign(this.options, options);
+  this._ticking = false;
+  this._lastMouseMoveEvent = null;
+  this._parentMap = null;
+  this._isDragging = false;
+  this._isCursorOverFeature = false;
+  this._previousPoint = [0, 0];
+  this._currentPoint = [0, 0];
+  this._trackingRectCoordinates = [[[], [], [], [], []]];
+}
+Minimap.prototype = Object.assign({}, (mapbox_gl_default()).NavigationControl.prototype, {
+  options: {
+    id: 'mapboxgl-minimap',
+    width: '320px',
+    height: '180px',
+    style: 'mapbox://styles/mapbox/satellite-v9',
+    center: [0, 0],
+    zoom: 6,
+    // should be a function; will be bound to Minimap
+    zoomAdjust: null,
+    // if parent map zoom >= 18 and minimap zoom >= 14, set minimap zoom to 16
+    zoomLevels: [[18, 14, 16], [16, 12, 14], [14, 10, 12], [12, 8, 10], [10, 6, 8]],
+    lineColor: '#ff0000',
+    lineWidth: 1,
+    lineOpacity: 1,
+    fillColor: '#fff',
+    fillOpacity: 0.1,
+    dragPan: false,
+    scrollZoom: false,
+    boxZoom: false,
+    dragRotate: false,
+    keyboard: false,
+    doubleClickZoom: false,
+    touchZoomRotate: false
+  },
+  onAdd: function (parentMap) {
+    this._parentMap = parentMap;
+    var opts = this.options;
+    var container = this._container = this._createContainer(parentMap);
+    var miniMap = this._miniMap = new (mapbox_gl_default()).Map({
+      attributionControl: false,
+      container: container,
+      style: opts.style,
+      zoom: opts.zoom,
+      center: opts.center
+    });
+    if (opts.maxBounds) miniMap.setMaxBounds(opts.maxBounds);
+    miniMap.on('load', this._load.bind(this));
+    return this._container;
+  },
+  _load: function () {
+    var opts = this.options;
+    var parentMap = this._parentMap;
+    var miniMap = this._miniMap;
+    var interactions = ['dragPan', 'scrollZoom', 'boxZoom', 'dragRotate', 'keyboard', 'doubleClickZoom', 'touchZoomRotate'];
+    interactions.forEach(function (i) {
+      if (opts[i] !== true) {
+        miniMap[i].disable();
+      }
+    });
+    if (typeof opts.zoomAdjust === 'function') {
+      this.options.zoomAdjust = opts.zoomAdjust.bind(this);
+    } else if (opts.zoomAdjust === null) {
+      this.options.zoomAdjust = this._zoomAdjust.bind(this);
+    }
+    var bounds = miniMap.getBounds();
+    this._convertBoundsToPoints(bounds);
+    miniMap.addSource('trackingRect', {
+      'type': 'geojson',
+      'data': {
+        'type': 'Feature',
+        'properties': {
+          'name': 'trackingRect'
+        },
+        'geometry': {
+          'type': 'Polygon',
+          'coordinates': this._trackingRectCoordinates
+        }
+      }
+    });
+    miniMap.addLayer({
+      'id': 'trackingRectOutline',
+      'type': 'line',
+      'source': 'trackingRect',
+      'layout': {},
+      'paint': {
+        'line-color': opts.lineColor,
+        'line-width': opts.lineWidth,
+        'line-opacity': opts.lineOpacity
+      }
+    });
+
+    // needed for dragging
+    miniMap.addLayer({
+      'id': 'trackingRectFill',
+      'type': 'fill',
+      'source': 'trackingRect',
+      'layout': {},
+      'paint': {
+        'fill-color': opts.fillColor,
+        'fill-opacity': opts.fillOpacity
+      }
+    });
+    this._trackingRect = this._miniMap.getSource('trackingRect');
+    this._update();
+    parentMap.on('move', this._update.bind(this));
+    miniMap.on('mousemove', this._mouseMove.bind(this));
+    miniMap.on('mousedown', this._mouseDown.bind(this));
+    miniMap.on('mouseup', this._mouseUp.bind(this));
+    miniMap.on('touchmove', this._mouseMove.bind(this));
+    miniMap.on('touchstart', this._mouseDown.bind(this));
+    miniMap.on('touchend', this._mouseUp.bind(this));
+    this._miniMapCanvas = miniMap.getCanvasContainer();
+    this._miniMapCanvas.addEventListener('wheel', this._preventDefault);
+    this._miniMapCanvas.addEventListener('mousewheel', this._preventDefault);
+  },
+  _mouseDown: function (e) {
+    if (this._isCursorOverFeature) {
+      this._isDragging = true;
+      this._previousPoint = this._currentPoint;
+      this._currentPoint = [e.lngLat.lng, e.lngLat.lat];
+    }
+  },
+  _mouseMove: function (e) {
+    this._ticking = false;
+    var miniMap = this._miniMap;
+    var features = miniMap.queryRenderedFeatures(e.point, {
+      layers: ['trackingRectFill']
+    });
+
+    // don't update if we're still hovering the area
+    if (!(this._isCursorOverFeature && features.length > 0)) {
+      this._isCursorOverFeature = features.length > 0;
+      this._miniMapCanvas.style.cursor = this._isCursorOverFeature ? 'move' : '';
+    }
+    if (this._isDragging) {
+      this._previousPoint = this._currentPoint;
+      this._currentPoint = [e.lngLat.lng, e.lngLat.lat];
+      var offset = [this._previousPoint[0] - this._currentPoint[0], this._previousPoint[1] - this._currentPoint[1]];
+      var newBounds = this._moveTrackingRect(offset);
+      this._parentMap.fitBounds(newBounds, {
+        duration: 80,
+        noMoveStart: true
+      });
+    }
+  },
+  _mouseUp: function () {
+    this._isDragging = false;
+    this._ticking = false;
+  },
+  _moveTrackingRect: function (offset) {
+    var source = this._trackingRect;
+    var data = source._data;
+    var bounds = data.properties.bounds;
+    bounds._ne.lat -= offset[1];
+    bounds._ne.lng -= offset[0];
+    bounds._sw.lat -= offset[1];
+    bounds._sw.lng -= offset[0];
+    this._convertBoundsToPoints(bounds);
+    source.setData(data);
+    return bounds;
+  },
+  _setTrackingRectBounds: function (bounds) {
+    var source = this._trackingRect;
+    var data = source._data;
+    data.properties.bounds = bounds;
+    this._convertBoundsToPoints(bounds);
+    source.setData(data);
+  },
+  _convertBoundsToPoints: function (bounds) {
+    var ne = bounds._ne;
+    var sw = bounds._sw;
+    var trc = this._trackingRectCoordinates;
+    trc[0][0][0] = ne.lng;
+    trc[0][0][1] = ne.lat;
+    trc[0][1][0] = sw.lng;
+    trc[0][1][1] = ne.lat;
+    trc[0][2][0] = sw.lng;
+    trc[0][2][1] = sw.lat;
+    trc[0][3][0] = ne.lng;
+    trc[0][3][1] = sw.lat;
+    trc[0][4][0] = ne.lng;
+    trc[0][4][1] = ne.lat;
+  },
+  _update: function (e) {
+    if (this._isDragging) {
+      return;
+    }
+    var parentBounds = this._parentMap.getBounds();
+    this._setTrackingRectBounds(parentBounds);
+    if (typeof this.options.zoomAdjust === 'function') {
+      this.options.zoomAdjust();
+    }
+  },
+  _zoomAdjust: function () {
+    var miniMap = this._miniMap;
+    var parentMap = this._parentMap;
+    var miniZoom = parseInt(miniMap.getZoom(), 10);
+    var parentZoom = parseInt(parentMap.getZoom(), 10);
+    var levels = this.options.zoomLevels;
+    var found = false;
+    levels.forEach(function (zoom) {
+      if (!found && parentZoom >= zoom[0]) {
+        if (miniZoom >= zoom[1]) {
+          miniMap.setZoom(zoom[2]);
+        }
+        miniMap.setCenter(parentMap.getCenter());
+        found = true;
+      }
+    });
+    if (!found && miniZoom !== this.options.zoom) {
+      if (typeof this.options.bounds === 'object') {
+        miniMap.fitBounds(this.options.bounds, {
+          duration: 50
+        });
+      }
+      miniMap.setZoom(this.options.zoom);
+    }
+  },
+  _createContainer: function (parentMap) {
+    var opts = this.options;
+    var container = document.createElement('div');
+    container.className = 'mapboxgl-ctrl-minimap mapboxgl-ctrl';
+    container.setAttribute('style', 'width: ' + opts.width + '; height: ' + opts.height + ';');
+    container.addEventListener('contextmenu', this._preventDefault);
+    parentMap.getContainer().appendChild(container);
+    if (opts.id !== '') {
+      container.id = opts.id;
+    }
+    return container;
+  },
+  _preventDefault: function (e) {
+    e.preventDefault();
+  }
+});
+(mapbox_gl_default()).Minimap = Minimap;
 ;// CONCATENATED MODULE: ./src/package/map.js
 // 天地图token
 const tdtToken = (/* unused pure expression or super */ null && (['150bad890e9d004885a4b2a94062a46e', '337996a733e1ea41cd73124f67f4795d', '48282c15cce091a1154a674512372eec', 'f3c2ca3a170f5712abd7b6858e038f18']));
@@ -44041,6 +44241,7 @@ class mapSdk {
     this.accessToken = 'pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg';
     this.options = defaultOptions; // 初始参数
     this.map = null;
+    (mapbox_gl_default()).miniMap = Minimap;
     this.mapBoxGl = (mapbox_gl_default());
     this.setInterval = ''; // 定时器
   }
@@ -70985,18 +71186,13 @@ const addFlashPoint = (option = {}, layerId) => {
     }); // 2倍屏分辨率
   }
 
-  const opt = {
-    id: option.id,
-    data: option.data,
-    style: {
-      layout: {
-        'icon-image': imgId
-      },
-      paint: {
-        'text-opacity': 0
-      }
-    }
-  };
+  let layout = option.layout || {};
+  Object.assign(layout, {
+    'icon-image': imgId
+  });
+  const opt = Object.assign({}, option, {
+    layout
+  });
   if (hasLayer(opt.id)) {
     setSource(opt.id, opt.data);
   } else {
@@ -118911,215 +119107,6 @@ var mapFullScreen_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapFullScreen = (mapFullScreen_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/components/el-tree-select.vue?vue&type=template&id=5a009b74&scoped=true&
-var el_tree_selectvue_type_template_id_5a009b74_scoped_true_render = function render() {
-  var _vm = this,
-    _c = _vm._self._c;
-  return _c('el-select', _vm._b({
-    ref: "treeSelect",
-    staticStyle: {
-      "width": "100%"
-    },
-    attrs: {
-      "size": "small",
-      "value": _vm.valueTitle,
-      "clearable": _vm.clearable,
-      "popper-append-to-body": false
-    },
-    on: {
-      "clear": _vm.clearHandle
-    }
-  }, 'el-select', _vm.$attrs, false), [_c('div', [_c('el-input', _vm._b({
-    staticClass: "selectInput",
-    attrs: {
-      "size": "small",
-      "placeholder": _vm.placeholder
-    },
-    model: {
-      value: _vm.filterText,
-      callback: function ($$v) {
-        _vm.filterText = $$v;
-      },
-      expression: "filterText"
-    }
-  }, 'el-input', _vm.$attrs, false)), _c('el-option', {
-    staticClass: "options",
-    attrs: {
-      "value": _vm.valueTitle,
-      "label": _vm.valueTitle
-    }
-  }, [_c('el-tree', _vm._b({
-    ref: "selectTree",
-    attrs: {
-      "id": "tree-option",
-      "size": "small",
-      "accordion": _vm.accordion,
-      "data": _vm.options,
-      "props": _vm.props,
-      "node-key": _vm.props.value,
-      "default-expanded-keys": _vm.defaultExpandedKey,
-      "filter-node-method": _vm.filterNode
-    },
-    on: {
-      "node-click": _vm.handleNodeClick
-    }
-  }, 'el-tree', _vm.$attrs, false))], 1)], 1)]);
-};
-var el_tree_selectvue_type_template_id_5a009b74_scoped_true_staticRenderFns = [];
-
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/components/el-tree-select.vue?vue&type=script&lang=js&
-/* harmony default export */ var el_tree_selectvue_type_script_lang_js_ = ({
-  name: 'el-tree-select',
-  props: {
-    /* 配置项 */
-    props: {
-      type: Object,
-      default: () => {
-        return {
-          value: 'id',
-          // ID字段名
-          label: 'title',
-          // 显示名称
-          children: 'children' // 子级字段名
-        };
-      }
-    },
-
-    /* 选项列表数据(树形结构的对象数组) */
-    options: {
-      type: Array,
-      default: () => {
-        return [];
-      }
-    },
-    /* 初始值 */
-    value: {
-      type: Number,
-      default: () => {
-        return null;
-      }
-    },
-    /* 可清空选项 */
-    clearable: {
-      type: Boolean,
-      default: () => {
-        return true;
-      }
-    },
-    /* 自动收起 */
-    accordion: {
-      type: Boolean,
-      default: () => {
-        return false;
-      }
-    },
-    placeholder: {
-      type: String,
-      default: () => {
-        return '搜索关键字';
-      }
-    }
-  },
-  data() {
-    return {
-      filterText: '',
-      valueId: this.value,
-      // 初始值
-      valueTitle: '',
-      defaultExpandedKey: []
-    };
-  },
-  mounted() {
-    this.initHandle();
-  },
-  methods: {
-    // 初始化值
-    initHandle() {
-      if (this.valueId) {
-        this.valueTitle = this.$refs.selectTree.getNode(this.valueId).data[this.props.label]; // 初始化显示
-        this.$refs.selectTree.setCurrentKey(this.valueId); // 设置默认选中
-        this.defaultExpandedKey = [this.valueId]; // 设置默认展开
-      }
-
-      this.initScroll();
-    },
-    // 初始化滚动条
-    initScroll() {
-      this.$nextTick(() => {
-        let scrollWrap = document.querySelectorAll('.el-scrollbar .el-select-dropdown__wrap')[0];
-        let scrollBar = document.querySelectorAll('.el-scrollbar .el-scrollbar__bar');
-        scrollWrap.style.cssText = 'margin: 0px; max-height: none; overflow: hidden;';
-        scrollBar.forEach(ele => ele.style.width = 0);
-      });
-    },
-    // 切换选项
-    handleNodeClick(node) {
-      this.valueTitle = node[this.props.label];
-      this.valueId = node[this.props.value];
-      this.$emit('getValue', this.valueId);
-      this.$emit('input', this.valueId);
-      // console.log(this.valueId)
-      this.defaultExpandedKey = [];
-      if (!node.children || !node.children.length) {
-        //补录选择完选项弹框不能收起
-        this.$refs.treeSelect.blur();
-      }
-    },
-    // 清除选中
-    clearHandle() {
-      this.valueTitle = '';
-      this.valueId = null;
-      this.defaultExpandedKey = [];
-      this.clearSelected();
-      this.$emit('getValue', null);
-    },
-    /* 清空选中样式 */
-    clearSelected() {
-      let allNode = document.querySelectorAll('#tree-option .el-tree-node');
-      allNode.forEach(element => element.classList.remove('is-current'));
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.name.indexOf(value) !== -1;
-    }
-  },
-  watch: {
-    value() {
-      this.valueId = this.value;
-      this.initHandle();
-    },
-    filterText(val) {
-      this.$refs.selectTree.filter(val);
-    }
-  }
-});
-;// CONCATENATED MODULE: ./src/package/components/el-tree-select.vue?vue&type=script&lang=js&
- /* harmony default export */ var components_el_tree_selectvue_type_script_lang_js_ = (el_tree_selectvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/components/el-tree-select.vue?vue&type=style&index=0&id=5a009b74&prod&scoped=true&lang=css&
-var el_tree_selectvue_type_style_index_0_id_5a009b74_prod_scoped_true_lang_css_ = __webpack_require__(5650);
-;// CONCATENATED MODULE: ./src/package/components/el-tree-select.vue?vue&type=style&index=0&id=5a009b74&prod&scoped=true&lang=css&
-
-;// CONCATENATED MODULE: ./src/package/components/el-tree-select.vue
-
-
-
-;
-
-
-/* normalize component */
-
-var el_tree_select_component = normalizeComponent(
-  components_el_tree_selectvue_type_script_lang_js_,
-  el_tree_selectvue_type_template_id_5a009b74_scoped_true_render,
-  el_tree_selectvue_type_template_id_5a009b74_scoped_true_staticRenderFns,
-  false,
-  null,
-  "5a009b74",
-  null
-  
-)
-
-/* harmony default export */ var el_tree_select = (el_tree_select_component.exports);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/components/mapStyle.vue?vue&type=template&id=1a040aed&scoped=true&
 var mapStylevue_type_template_id_1a040aed_scoped_true_render = function render() {
   var _vm = this,
@@ -120535,6 +120522,7 @@ const mapTools = {
   loadImage: loadImage,
   ranging: ranging,
   drawArea: drawArea,
+  spArray: spArray,
   clearDraw: clearDraw,
   distance: mapTools_distance,
   lineCenter: lineCenter,
@@ -120558,7 +120546,7 @@ const mapEvent = {
 
 
 
- // 选择树组件
+// import elTreeSelect from './components/el-tree-select.vue' // 选择树组件
  // 修改地图风格