gis-map-universal 1.1.1 → 1.1.2

package/gismap.umd.js

@@ -21720,6 +21720,17 @@ exports.push([module.i, ".Popup[data-v-4267aeb6]{width:2.1rem;height:1.4rem}.vid
 module.exports = exports;
 
 
+/***/ }),
+
+/***/ "2f93":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7de86bf4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("ef57");
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7de86bf4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7de86bf4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "2fe6":
@@ -23765,17 +23776,6 @@ if(content.locals) module.exports = content.locals;
 var add = __webpack_require__("499e").default
 var update = add("60415e6c", content, true, {"sourceMap":false,"shadowMode":false});
 
-/***/ }),
-
-/***/ "3b7b":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7803e4d4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("8747");
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7803e4d4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AreaAnalysisTool_vue_vue_type_style_index_0_id_7803e4d4_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "3bbe":
@@ -25323,20 +25323,6 @@ var update = add("3a9f9956", content, true, {"sourceMap":false,"shadowMode":fals
 module.exports = {};
 
 
-/***/ }),
-
-/***/ "400f":
-/***/ (function(module, exports, __webpack_require__) {
-
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
-exports = ___CSS_LOADER_API_IMPORT___(false);
-// Module
-exports.push([module.i, ".area-analysis-tool[data-v-7803e4d4]{position:absolute;top:0;left:0;z-index:999;background:hsla(0,0%,100%,.95);border:1px solid #dcdfe6;border-radius:4px;padding:10px;margin:10px}.analysis-result[data-v-7803e4d4]{margin-top:10px;max-height:300px;overflow-y:auto}.result-item[data-v-7803e4d4]{margin-bottom:10px}.label[data-v-7803e4d4]{width:80px;font-weight:700}.label[data-v-7803e4d4],.value[data-v-7803e4d4]{display:inline-block}.value[data-v-7803e4d4]{margin-left:5px;background-color:#f0f9ff;padding:2px 6px;border-radius:3px;color:#333}.intersection-list[data-v-7803e4d4],.road-list[data-v-7803e4d4]{display:inline-block;vertical-align:top;max-width:calc(100% - 100px)}.point-result[data-v-7803e4d4],.route-result[data-v-7803e4d4]{margin-bottom:15px}.intersection-tag[data-v-7803e4d4],.road-tag[data-v-7803e4d4]{margin:2px}.clear-button[data-v-7803e4d4]{margin-top:10px}.road-intersection-item[data-v-7803e4d4]{margin-bottom:10px;padding:8px;background-color:#f8f9fa;border-radius:4px;border-left:3px solid #409eff}.road-name[data-v-7803e4d4]{font-weight:700;color:#409eff;margin-bottom:5px}.intersection-points[data-v-7803e4d4]{font-size:12px;color:#606266}.intersection-point[data-v-7803e4d4]{display:block;margin-top:2px;padding-left:10px}", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "4085":
@@ -47697,22 +47683,6 @@ class Stroke {
 });
 
 
-/***/ }),
-
-/***/ "8747":
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__("400f");
-if(content.__esModule) content = content.default;
-if(typeof content === 'string') content = [[module.i, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var add = __webpack_require__("499e").default
-var update = add("232d5f44", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ "8778":
@@ -76377,6 +76347,20 @@ module.exports = function (FULL_NAME, wrapper, FORCED, IS_AGGREGATE_ERROR) {
 };
 
 
+/***/ }),
+
+/***/ "e630":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Imports
+var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
+exports = ___CSS_LOADER_API_IMPORT___(false);
+// Module
+exports.push([module.i, ".area-analysis-tool[data-v-7de86bf4]{position:absolute;top:0;left:0;z-index:999;background:hsla(0,0%,100%,.95);border:1px solid #dcdfe6;border-radius:4px;padding:10px;margin:10px}.analysis-result[data-v-7de86bf4]{margin-top:10px;max-height:300px;overflow-y:auto}.result-item[data-v-7de86bf4]{margin-bottom:10px}.label[data-v-7de86bf4]{width:80px;font-weight:700}.label[data-v-7de86bf4],.value[data-v-7de86bf4]{display:inline-block}.value[data-v-7de86bf4]{margin-left:5px;background-color:#f0f9ff;padding:2px 6px;border-radius:3px;color:#333}.intersection-list[data-v-7de86bf4],.road-list[data-v-7de86bf4]{display:inline-block;vertical-align:top;max-width:calc(100% - 100px)}.point-result[data-v-7de86bf4],.route-result[data-v-7de86bf4]{margin-bottom:15px}.intersection-tag[data-v-7de86bf4],.road-tag[data-v-7de86bf4]{margin:2px}.clear-button[data-v-7de86bf4]{margin-top:10px}.road-intersection-item[data-v-7de86bf4]{margin-bottom:10px;padding:8px;background-color:#f8f9fa;border-radius:4px;border-left:3px solid #409eff}.road-name[data-v-7de86bf4]{font-weight:700;color:#409eff;margin-bottom:5px}.intersection-points[data-v-7de86bf4]{font-size:12px;color:#606266}.intersection-point[data-v-7de86bf4]{display:block;margin-top:2px;padding-left:10px}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "e667":
@@ -79227,6 +79211,22 @@ exports.push([module.i, ".clusterListPopup[data-v-008ab10f]{width:400px;height:2
 module.exports = exports;
 
 
+/***/ }),
+
+/***/ "ef57":
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__("e630");
+if(content.__esModule) content = content.default;
+if(typeof content === 'string') content = [[module.i, content, '']];
+if(content.locals) module.exports = content.locals;
+// add the styles to the DOM
+var add = __webpack_require__("499e").default
+var update = add("28fb44e7", content, true, {"sourceMap":false,"shadowMode":false});
+
 /***/ }),
 
 /***/ "f02e":
@@ -264400,8 +264400,8 @@ function layersApi_getCongestionEventLayerData() {
 // 旅游走廊
 // 重大活动--活动地点
 /* harmony default export */ var js_initBaseLayers = ({data(){return{lastHoverFeature:null,// 记录上一次悬停的要素
-isCluster:false,eventCluster:true,echartslayer:null,congestedRoadLayer:null,tiandituLayer:null,darkUrl:"http://service.sdmap.gov.cn/tileservice/dsfg_asdxb?",// lightUrl: "https://service.sdmap.gov.cn/tileservice/dsfg_qsb?",
-lightUrl:"https://service.sdmap.gov.cn/tileservice/sdpubmap?",geoJSONUrl:"/china_full.json",sdAreaUrl:"/sdArea.json",subwayLineUrl:"/ditieline.json",darkFillColor:"#1b2639",lightFillColor:"#eeeee9",darkStrokeColor:"#3578E0",lightStrokeColor:"#b4b4b1"};},methods:{initBaseLayers(){let that=this;// 加载WMTS
+isCluster:false,eventCluster:true,echartslayer:null,congestedRoadLayer:null,tiandituLayer:null,darkUrl:"http://service.sdmap.gov.cn/tileservice/dsfg_asdxb?",lightUrl:"https://service.sdmap.gov.cn/tileservice/dsfg_qsb?",// lightUrl: "https://service.sdmap.gov.cn/tileservice/sdpubmap?",
+geoJSONUrl:"/china_full.json",sdAreaUrl:"/sdArea.json",subwayLineUrl:"/ditieline.json",darkFillColor:"#1b2639",lightFillColor:"#eeeee9",darkStrokeColor:"#3578E0",lightStrokeColor:"#b4b4b1"};},methods:{initBaseLayers(){let that=this;// 加载WMTS
 // let resolutions = [
 //   0.010986328125, 0.0054931640625, 0.00274658283125, 0.001373291815625,
 //   0.0006866455078125, 0.00034332275390625, 0.000171661376953125,
@@ -268118,8 +268118,8 @@ var flexible = __webpack_require__("59a2");
 // EXTERNAL MODULE: ./packages/gisMapTianditu/src/js/json/sfzFlow.json
 var sfzFlow = __webpack_require__("d701");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0e2c32fd-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=template&id=7803e4d4&scoped=true
-var AreaAnalysisToolvue_type_template_id_7803e4d4_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0e2c32fd-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=template&id=7de86bf4&scoped=true
+var AreaAnalysisToolvue_type_template_id_7de86bf4_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -268162,9 +268162,9 @@ var AreaAnalysisToolvue_type_template_id_7803e4d4_scoped_true_render = function
     }
   }, [_vm._v(" " + _vm._s(_vm.isDrawing ? "结束绘制" : "风险区域绘制") + " ")]) : _vm._e()], 1);
 };
-var AreaAnalysisToolvue_type_template_id_7803e4d4_scoped_true_staticRenderFns = [];
+var AreaAnalysisToolvue_type_template_id_7de86bf4_scoped_true_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=template&id=7803e4d4&scoped=true
+// CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=template&id=7de86bf4&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/@turf/turf/turf.min.js
 var turf_min = __webpack_require__("595b");
@@ -268508,8 +268508,12 @@ var turf_min = __webpack_require__("595b");
         });
       }
 
-      // 结束绘制
-      this.stopDraw();
+      // 根据当前绘制模式调用相应的停止方法
+      if (this.isRouteMode) {
+        this.stopRouteMode();
+      } else {
+        this.stopDraw();
+      }
     },
     // 处理地图点击事件
     handleMapClick(event) {
@@ -268620,64 +268624,74 @@ var turf_min = __webpack_require__("595b");
     // 开始路线绘制模式
     startRouteMode() {
       if (!this.map) {
-        this.$message.error("地图未初始化完成，无法开始绘制路线");
+        this.$message.error("地图未初始化完成，无法开始绘制");
         return;
       }
+      this.initHighwayFeatures();
+      // 检查是否有高速公路数据
+      if (this.highwayFeatures.length === 0) {
+        // this.$message.warning("未找到高速公路数据，将只进行区域绘制");
+      }
 
-      // 清除之前的绘制和分析结果
+      // 清除之前的绘制
       this.clearVectorLayer();
       this.clearResult();
-
-      // 停止其他绘制模式
-      if (this.isPointDrawing) {
-        this.stopPointDraw();
-      }
-      if (this.isDrawing) {
-        this.stopDraw();
-      }
-      if (!this.vectorLayer) {
-        this.vectorSource = new source_Vector["default"]();
-        this.vectorLayer = new layer_Vector["default"]({
-          source: this.vectorSource,
-          zIndex: 100
-        });
-        this.map.addLayer(this.vectorLayer);
-      } else {
-        // 清除现有要素但保留图层
-        this.vectorSource.clear();
+      // 如果正在进行路线绘制，先停止
+      if (this.isRouteMode) {
+        this.stopRouteMode();
       }
 
-      // 重置起点和终点
-      this.startPoint = null;
-      this.endPoint = null;
-      this.routeFeatures = [];
+      // 创建矢量图层
+      this.vectorSource = new source_Vector["default"]();
+      this.vectorLayer = new layer_Vector["default"]({
+        source: this.vectorSource,
+        style: new Style["default"]({
+          fill: new Fill["default"]({
+            color: "rgba(30, 144, 255, 0.1)"
+          }),
+          stroke: new Stroke["default"]({
+            color: "#1E90FF",
+            width: 2
+          })
+        }),
+        zIndex: 100
+      });
+      this.map.addLayer(this.vectorLayer);
 
-      // 保存当前的地图点击事件处理函数，以便后续移除
-      this.routeClickHandler = this.handleRouteMapClick.bind(this);
+      // 创建绘制交互
+      this.draw = new interaction_Draw({
+        source: this.vectorSource,
+        type: "Polygon",
+        style: new Style["default"]({
+          fill: new Fill["default"]({
+            color: "rgba(30, 144, 255, 0.2)"
+          }),
+          stroke: new Stroke["default"]({
+            color: "#1E90FF",
+            width: 2
+          })
+        })
+      });
 
-      // 添加地图点击事件
-      this.map.on("click", this.routeClickHandler);
+      // 监听绘制结束事件
+      this.draw.on("drawend", this.onDrawEnd);
 
-      // 设置绘制状态标志
+      // 添加到地图
+      this.map.addInteraction(this.draw);
+
+      // 设置绘制状态标志，防止地图点击时重置中心点
       this.map.set("isAreaAnalysisDrawing", true);
       this.isRouteMode = true;
 
       // 设置鼠标指针样式
       this.map.getViewport().style.cursor = "crosshair";
-      this.$message.info("请先点击选择起点");
+      this.$message.success("请圈选出对应路段");
     },
     // 停止路线绘制模式
     stopRouteMode() {
-      // 移除地图点击事件监听
-      if (this.mapClickHandler) {
-        this.map.un("click", this.mapClickHandler);
-        this.mapClickHandler = null;
-      }
-
-      // 移除路线点击事件监听
-      if (this.routeClickHandler) {
-        this.map.un("click", this.routeClickHandler);
-        this.routeClickHandler = null;
+      if (this.draw) {
+        this.map.removeInteraction(this.draw);
+        this.draw = null;
       }
 
       // 移除绘制状态标志
@@ -269238,8 +269252,8 @@ var turf_min = __webpack_require__("595b");
 });
 // CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=script&lang=js
  /* harmony default export */ var component_AreaAnalysisToolvue_type_script_lang_js = (AreaAnalysisToolvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=style&index=0&id=7803e4d4&prod&scoped=true&lang=css
-var AreaAnalysisToolvue_type_style_index_0_id_7803e4d4_prod_scoped_true_lang_css = __webpack_require__("3b7b");
+// EXTERNAL MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue?vue&type=style&index=0&id=7de86bf4&prod&scoped=true&lang=css
+var AreaAnalysisToolvue_type_style_index_0_id_7de86bf4_prod_scoped_true_lang_css = __webpack_require__("2f93");
 
 // CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/AreaAnalysisTool.vue
 
@@ -269252,11 +269266,11 @@ var AreaAnalysisToolvue_type_style_index_0_id_7803e4d4_prod_scoped_true_lang_css
 
 var AreaAnalysisTool_component = normalizeComponent(
   component_AreaAnalysisToolvue_type_script_lang_js,
-  AreaAnalysisToolvue_type_template_id_7803e4d4_scoped_true_render,
-  AreaAnalysisToolvue_type_template_id_7803e4d4_scoped_true_staticRenderFns,
+  AreaAnalysisToolvue_type_template_id_7de86bf4_scoped_true_render,
+  AreaAnalysisToolvue_type_template_id_7de86bf4_scoped_true_staticRenderFns,
   false,
   null,
-  "7803e4d4",
+  "7de86bf4",
   null
   
 )

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "gis-map-universal",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "GIS通用组件",
   "main": "gismap.umd.js",
   "private": false,
-
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },