xy-map 1.1.36 → 1.1.37

package/xy-map.common.js

@@ -287,7 +287,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-57aca7b6]{position:rela
 
 /***/ }),
 
-/***/ 5547:
+/***/ 5406:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -301,7 +301,7 @@ __webpack_require__.r(__webpack_exports__);
 
 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, ".upload[data-v-3bd5e448]{position:relative}.upload input[data-v-3bd5e448]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-3b26555c]{position:relative}.upload input[data-v-3b26555c]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42960,19 +42960,19 @@ var update = add("f559c59c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 411:
+/***/ 4112:
 /***/ (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__(5547);
+var content = __webpack_require__(5406);
 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("f27a3ec2", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("81936f9e", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -43697,6 +43697,24 @@ __webpack_require__.d(__webpack_exports__, {
   "shpFile": function() { return /* reexport */ shpFile; }
 });
 
+// NAMESPACE OBJECT: ./src/package/util/mapTools.js
+var mapTools_namespaceObject = {};
+__webpack_require__.r(mapTools_namespaceObject);
+__webpack_require__.d(mapTools_namespaceObject, {
+  "YK": function() { return clearDraw; },
+  "TE": function() { return mapTools_distance; },
+  "N5": function() { return drawArea; },
+  "tL": function() { return geometryCollectionToFeatureCollection; },
+  "yQ": function() { return getElevation; },
+  "yJ": function() { return lineCenter; },
+  "po": function() { return loadImage; },
+  "bZ": function() { return pointToGeoJson; },
+  "j_": function() { return polygonCenter; },
+  "Do": function() { return ranging; },
+  "b4": function() { return spArray; },
+  "rg": function() { return toGeoJson; }
+});
+
 // NAMESPACE OBJECT: ./node_modules/@loaders.gl/gltf/dist/esm/lib/extensions/EXT_meshopt_compression.js
 var EXT_meshopt_compression_namespaceObject = {};
 __webpack_require__.r(EXT_meshopt_compression_namespaceObject);
@@ -43829,6 +43847,127 @@ var style_map = __webpack_require__(7193);
 // EXTERNAL MODULE: ./node_modules/html2canvas/dist/html2canvas.js
 var html2canvas = __webpack_require__(2269);
 var html2canvas_default = /*#__PURE__*/__webpack_require__.n(html2canvas);
+;// CONCATENATED MODULE: ./src/package/layers/index.js
+// import mapBoxGl from 'mapbox-gl'
+
+
+// 更新数据
+const setSource = (id, data) => {
+  let {
+    map
+  } = package_map;
+  let hasSource = map.getSource(id);
+  if (hasSource) {
+    map.getSource(id).setData(data);
+  }
+};
+// 判断图层是否存在
+const hasLayer = id => {
+  let {
+    map
+  } = package_map;
+  return map.getLayer(id);
+};
+
+// 判断数据是否存在
+const hasSource = id => {
+  let {
+    map
+  } = package_map;
+  return map.getSource(id);
+};
+
+// 删除图层
+const removeLayer = id => {
+  let {
+    map
+  } = package_map;
+  map.removeLayer(id);
+  let arr = getLayerAll();
+  let layers = arr.filter(item => item.id.includes(id + '-'));
+  layers.forEach(item => {
+    if (hasLayer(item.id)) {
+      map.removeLayer(item.id);
+    }
+  });
+};
+
+/**
+ * 获取所有图层
+ */
+const getLayerAll = () => {
+  let {
+    map
+  } = package_map;
+  let data = map.getStyle().layers;
+  // console.log(data)
+  return data;
+};
+
+// 显示隐藏图层
+const showLayer = (id, show = false) => {
+  let {
+    map
+  } = package_map;
+  show = show ? 'visible' : 'none';
+  map.setLayoutProperty(id, 'visibility', show);
+  let arr = getLayerAll();
+  let layers = arr.filter(item => item.id.includes(id + '-'));
+  layers.forEach(item => {
+    if (hasLayer(item.id)) {
+      map.setLayoutProperty(item.id, 'visibility', show);
+    }
+  });
+};
+
+// 显隐文字
+const showLayerText = (show, id = '') => {
+  let {
+    map
+  } = package_map;
+  if (id) {
+    setPaint(id, 'text-opacity', show ? 1 : 0);
+  } else {
+    let textLayer = map.getStyle().layers;
+    textLayer.forEach(layer => {
+      if (layer.type === 'symbol') {
+        setPaint(layer.id, 'text-opacity', show ? 1 : 0);
+      }
+    });
+  }
+};
+
+// 修改Layout
+const setLayout = (id, key, value) => {
+  let {
+    map
+  } = package_map;
+  map.setLayoutProperty(id, key, value);
+};
+
+// 修改Paint
+const setPaint = (id, key, value) => {
+  let {
+    map
+  } = package_map;
+  map.setPaintProperty(id, key, value);
+};
+
+// 修改Filter
+const setFilter = (key, filter) => {
+  let {
+    map
+  } = package_map;
+  map.setFilter(key, filter);
+};
+
+// 设置高亮
+const setHigh = (id, filter) => {
+  let {
+    map
+  } = package_map;
+  map.setFilter(id + '-high', filter);
+};
 ;// CONCATENATED MODULE: ./src/package/map.js
 // 天地图token
 const tdtToken = (/* unused pure expression or super */ null && (['150bad890e9d004885a4b2a94062a46e', '337996a733e1ea41cd73124f67f4795d', '48282c15cce091a1154a674512372eec', 'f3c2ca3a170f5712abd7b6858e038f18']));
@@ -43908,6 +44047,7 @@ var defaultOptions = {
 
 
 
+
 // import { Message } from 'element-ui'
 
 var popup = null;
@@ -44049,6 +44189,7 @@ class mapSdk {
         'star-intensity': 0.1
       });
     } else {
+      if (hasLayer('sky')) return;
       // 天空
       map.addLayer({
         'id': 'sky',
@@ -44358,127 +44499,6 @@ class mapSdk {
   }
 }
 /* harmony default export */ var package_map = (new mapSdk());
-;// CONCATENATED MODULE: ./src/package/layers/index.js
-// import mapBoxGl from 'mapbox-gl'
-
-
-// 更新数据
-const setSource = (id, data) => {
-  let {
-    map
-  } = package_map;
-  let hasSource = map.getSource(id);
-  if (hasSource) {
-    map.getSource(id).setData(data);
-  }
-};
-// 判断图层是否存在
-const hasLayer = id => {
-  let {
-    map
-  } = package_map;
-  return map.getLayer(id);
-};
-
-// 判断数据是否存在
-const hasSource = id => {
-  let {
-    map
-  } = package_map;
-  return map.getSource(id);
-};
-
-// 删除图层
-const removeLayer = id => {
-  let {
-    map
-  } = package_map;
-  map.removeLayer(id);
-  let arr = getLayerAll();
-  let layers = arr.filter(item => item.id.includes(id + '-'));
-  layers.forEach(item => {
-    if (hasLayer(item.id)) {
-      map.removeLayer(item.id);
-    }
-  });
-};
-
-/**
- * 获取所有图层
- */
-const getLayerAll = () => {
-  let {
-    map
-  } = package_map;
-  let data = map.getStyle().layers;
-  // console.log(data)
-  return data;
-};
-
-// 显示隐藏图层
-const showLayer = (id, show = false) => {
-  let {
-    map
-  } = package_map;
-  show = show ? 'visible' : 'none';
-  map.setLayoutProperty(id, 'visibility', show);
-  let arr = getLayerAll();
-  let layers = arr.filter(item => item.id.includes(id + '-'));
-  layers.forEach(item => {
-    if (hasLayer(item.id)) {
-      map.setLayoutProperty(item.id, 'visibility', show);
-    }
-  });
-};
-
-// 显隐文字
-const showLayerText = (show, id = '') => {
-  let {
-    map
-  } = package_map;
-  if (id) {
-    setPaint(id, 'text-opacity', show ? 1 : 0);
-  } else {
-    let textLayer = map.getStyle().layers;
-    textLayer.forEach(layer => {
-      if (layer.type === 'symbol') {
-        setPaint(layer.id, 'text-opacity', show ? 1 : 0);
-      }
-    });
-  }
-};
-
-// 修改Layout
-const setLayout = (id, key, value) => {
-  let {
-    map
-  } = package_map;
-  map.setLayoutProperty(id, key, value);
-};
-
-// 修改Paint
-const setPaint = (id, key, value) => {
-  let {
-    map
-  } = package_map;
-  map.setPaintProperty(id, key, value);
-};
-
-// 修改Filter
-const setFilter = (key, filter) => {
-  let {
-    map
-  } = package_map;
-  map.setFilter(key, filter);
-};
-
-// 设置高亮
-const setHigh = (id, filter) => {
-  let {
-    map
-  } = package_map;
-  map.setFilter(id + '-high', filter);
-};
 ;// CONCATENATED MODULE: ./src/package/layers/Text.js
 
 
@@ -66803,8 +66823,8 @@ const Line_defaultOptions = {
   click: null
 };
 
-/**
- * 添加线图层
+/**
+ * 添加线图层
  */
 const addLayerLine = (option, layerId) => {
   let {
@@ -66873,9 +66893,9 @@ const addLayerLine = (option, layerId) => {
   }
 };
 
-/**
- * 添加动画线图层
- * addLayerLine配置图层
+/**
+ * 添加动画线图层
+ * addLayerLine配置图层
  */
 const addLayerLineAnimation = (option, layerId) => {
   let {
@@ -69766,9 +69786,9 @@ let after = null;
 let textColor = '#fff';
 let lineColor = '#f00';
 
-/**
- * 测距
- * @param mapObject
+/**
+ * 测距
+ * @param mapObject
  */
 function measureLineLength(mapObject) {
   const currentMapContainerId = mapObject._container.getAttribute('id');
@@ -69886,9 +69906,9 @@ function measureLineLength(mapObject) {
           deleteTips.remove();
         }
       });
-      /**
-       * 点击测距点位触发
-       * @param event
+      /**
+       * 点击测距点位触发
+       * @param event
        * */
       // eslint-disable-next-line no-undef,no-inner-declarations
       function clickMeasurePointsHandler(event) {
@@ -69972,8 +69992,8 @@ function measureLineLength(mapObject) {
   resultData.map.on('dblclick', dblclickHandler);
 }
 
-/**
- * 清除测距相关
+/**
+ * 清除测距相关
  */
 function clearMeasureLine(mapObject) {
   const resultData = getBeforeOrAfterDataByMapContainerIdHandler(mapObject);
@@ -69995,9 +70015,9 @@ function clearMeasureLine(mapObject) {
   }
 }
 
-/**
- * 创建label marker
- * @returns {*} 返回marker对象
+/**
+ * 创建label marker
+ * @returns {*} 返回marker对象
  */
 function createMeasurLineLabelMarkerHandler(mapObject) {
   const resultData = getBeforeOrAfterDataByMapContainerIdHandler(mapObject);
@@ -70020,11 +70040,11 @@ function createMeasurLineLabelMarkerHandler(mapObject) {
   };
 }
 
-/**
- * 创建测距需要的layers，points、line、measure-line-move
- * @param jsonPoint
- * @param jsonLine
- * @param mapObject
+/**
+ * 创建测距需要的layers，points、line、measure-line-move
+ * @param jsonPoint
+ * @param jsonLine
+ * @param mapObject
  */
 function createMeasureLinePLLHandler(jsonPoint, jsonLine, mapObject) {
   const resultData = getBeforeOrAfterDataByMapContainerIdHandler(mapObject);
@@ -70085,8 +70105,8 @@ function createMeasureLinePLLHandler(jsonPoint, jsonLine, mapObject) {
   moveLayerHandler(resultData.map);
 }
 
-/**
- * 将测距的三个图层移到最上层级
+/**
+ * 将测距的三个图层移到最上层级
  */
 function moveLayerHandler(mapObject) {
   const {
@@ -70104,12 +70124,12 @@ function moveLayerHandler(mapObject) {
   }
 }
 
-/**
- * 添加点位layer
- * @param jsonPoint
- * @param jsonLine
- * @param coords
- * @param mapObject
+/**
+ * 添加点位layer
+ * @param jsonPoint
+ * @param jsonLine
+ * @param coords
+ * @param mapObject
  */
 function addMeasureLinePoint(jsonPoint, jsonLine, coords, mapObject) {
   const {
@@ -70152,11 +70172,11 @@ function addMeasureLinePoint(jsonPoint, jsonLine, coords, mapObject) {
   map.getSource('measure-line-points').setData(jsonPoint);
 }
 
-/**
- * 获取两坐标点之间的距离
- * @param points
- * @param coords
- * @returns {string}
+/**
+ * 获取两坐标点之间的距离
+ * @param points
+ * @param coords
+ * @returns {string}
  */
 function getMeasureLineLength(points, coords) {
   const _points = points.concat([coords]);
@@ -70172,12 +70192,12 @@ function getMeasureLineLength(points, coords) {
   return len;
 }
 
-/**
- * 点击地图添加点位触发给当前点位绑定测距结果的labelMarker
- * @param points
- * @param jsonPoint
- * @param coords
- * @param mapObject
+/**
+ * 点击地图添加点位触发给当前点位绑定测距结果的labelMarker
+ * @param points
+ * @param jsonPoint
+ * @param coords
+ * @param mapObject
  * */
 function addMeasureLineRes(points, jsonPoint, coords, mapObject) {
   const {
@@ -70205,11 +70225,11 @@ function addMeasureLineRes(points, jsonPoint, coords, mapObject) {
   new (mapbox_gl_default()).Marker(option).setLngLat(coords).addTo(map);
 }
 
-/**
- * 点击测距点位重新触发计算两点位之间的距离
- * @param resultPoints
- * @param coords
- * @returns {string}
+/**
+ * 点击测距点位重新触发计算两点位之间的距离
+ * @param resultPoints
+ * @param coords
+ * @returns {string}
  */
 function getMetersHandler(resultPoints, coords) {
   if (resultPoints.length > 1) {
@@ -70227,13 +70247,13 @@ function getMetersHandler(resultPoints, coords) {
   }
 }
 
-/**
- * 获取两点位之间的角度
- * @param lng1
- * @param lat1
- * @param lng2
- * @param lat2
- * @returns {number}
+/**
+ * 获取两点位之间的角度
+ * @param lng1
+ * @param lat1
+ * @param lng2
+ * @param lat2
+ * @returns {number}
  */
 function getAngleHandle(lng1, lat1, lng2, lat2) {
   const a = (90 - lat2) * Math.PI / 180;
@@ -70264,11 +70284,11 @@ function getAngleHandle(lng1, lat1, lng2, lat2) {
   return res;
 }
 
-/**
- * 创建关闭按钮
- * @param clickMeasurePointsHandler
- * @param coords
- * @param mapObject
+/**
+ * 创建关闭按钮
+ * @param clickMeasurePointsHandler
+ * @param coords
+ * @param mapObject
  */
 function createCloseMarkerHandler(clickMeasurePointsHandler, coords, mapObject) {
   const resultData = getBeforeOrAfterDataByMapContainerIdHandler(mapObject);
@@ -70291,8 +70311,8 @@ function createCloseMarkerHandler(clickMeasurePointsHandler, coords, mapObject)
   };
 }
 
-/**
- * 关闭触发
+/**
+ * 关闭触发
  */
 function closeMeasureLine(mapObject) {
   if (!mapObject) return;
@@ -70585,20 +70605,19 @@ const pointToGeoJson = (position = [0, 0]) => {
   return data;
 };
 
-// arcGis坐标转geoJson
-const arcGisToGeoJson = Json => {
-  let data = {
-    type: 'FeatureCollection',
-    features: []
-  };
-  Json.geometries.forEach(item => {
-    data.features.push({
-      type: 'Feature',
-      geometry: item,
-      properties: {}
-    });
+// geoJson 格式 GeometryCollection 转 FeatureCollection
+const geometryCollectionToFeatureCollection = geometryCollection => {
+  const features = [];
+
+  // 遍历 GeometryCollection 中的每个几何对象
+  geometryCollection.geometries.forEach(geometry => {
+    const feature = es_feature(geometry);
+    features.push(feature);
   });
-  return data;
+
+  // 创建 FeatureCollection
+  const featureCollection = es_featureCollection(features);
+  return featureCollection;
 };
 
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
@@ -71266,8 +71285,8 @@ const Polygon_defaultOptions = {
   click: null
 };
 
-/**
- * 添加面图层
+/**
+ * 添加面图层
  */
 const addLayerPolygon = (option, layerId) => {
   let {
@@ -71369,8 +71388,8 @@ const circle_defaultOptions = {
   click: null
 };
 
-/**
- * 添加面图层
+/**
+ * 添加面图层
  */
 const addLayerCircle = (option, layerId) => {
   let {
@@ -71500,8 +71519,8 @@ const circleAnimate_defaultOptions = {
   click: null
 };
 
-/**
- * 添加圆图层
+/**
+ * 添加圆图层
  */
 const addCircleAnimate = (option, layerId) => {
   let {
@@ -77313,6 +77332,168 @@ const addLayerModel = (option, layerId = '') => {
     }
   });
 };
+;// CONCATENATED MODULE: ./src/package/layers/pipe.js
+
+
+
+
+
+
+
+
+
+
+const pipe_defaultOptions = {
+  id: 'pipe',
+  position: [103.353557, 23.362395],
+  // 位置
+  hight: 0,
+  // 高度
+  edit: false
+};
+
+/**
+ * 添加管道
+ */
+const addLayerPipe = (option, layerId = '') => {
+  return new Promise(resolve => {
+    let {
+      map
+    } = package_map;
+    let opt = Object.assign({}, pipe_defaultOptions, option);
+    let camera = '';
+    let scene = '';
+    let group = '';
+    let renderer = '';
+    let customLayer = '';
+    let pipeMesh = '';
+    if (hasLayer(opt.id)) {
+      removeLayer(opt.id);
+    }
+    addPipe();
+    map.addLayer(customLayer, layerId);
+    resolve(group);
+    function addPipe() {
+      const modelOrigin = opt.position; // 中心点
+      const modelAltitude = opt.elevation; // 海拔高度
+      const modelRotate = [Math.PI / 2, 0, 0];
+      const modelAsMercatorCoordinate = mapbox_gl_default().MercatorCoordinate.fromLngLat(modelOrigin, modelAltitude);
+      const modelTransform = {
+        translateX: modelAsMercatorCoordinate.x,
+        translateY: modelAsMercatorCoordinate.y,
+        translateZ: modelAsMercatorCoordinate.z,
+        rotateX: modelRotate[0],
+        rotateY: modelRotate[1],
+        rotateZ: modelRotate[2],
+        scale: modelAsMercatorCoordinate.meterInMercatorCoordinateUnits()
+      };
+
+      // 根据CustomLayerInterface为三维模型配置自定义层
+      customLayer = {
+        id: opt.id,
+        type: 'custom',
+        renderingMode: '3d',
+        onAdd: (map, gl) => {
+          const container = map.getCanvas();
+
+          // 摄像机
+          camera = new PerspectiveCamera(50, container.clientWidth / container.clientHeight, 1, 5000);
+
+          // 场景
+          scene = new Scene();
+          group = new Group();
+          group.name = 'pipe';
+          scene.add(group);
+
+          // 管道
+          let geometry = getPipeGeometry(modelAsMercatorCoordinate, opt);
+          const bottomMat = new MeshBasicMaterial({
+            color: opt.color || 0x7597dc,
+            side: DoubleSide,
+            transparent: true,
+            opacity: 0.5
+          });
+          pipeMesh = new Mesh(geometry, bottomMat);
+          scene.position.y = opt.hight;
+          group.add(pipeMesh);
+          group.rotation.x = -Math.PI / 2;
+
+          // 渲染器
+          renderer = new WebGLRenderer({
+            canvas: map.getCanvas(),
+            context: gl,
+            logarithmicDepthBuffer: true,
+            antialias: true
+          });
+          renderer.autoClear = false;
+          renderer.physicallyCorrectLights = true;
+          // renderer.outputEncoding = THREE.sRGBEncoding
+          renderer.setSize(container.clientWidth, container.clientHeight);
+
+          // 调试工具
+          const gui = opt.edit ? new GUI$1() : null;
+          if (gui) {
+            gui.add(group.position, 'y').step(0.1).name('高度(米)');
+            gui.add(group.rotation, 'x').step(0.1).name('旋转x');
+            gui.add(group.rotation, 'y').step(0.1).name('旋转y');
+            gui.add(group.rotation, 'z').step(0.1).name('旋转z');
+          }
+        },
+        render: (gl, matrix) => {
+          const rotationX = new three_module_Matrix4().makeRotationAxis(new three_module_Vector3(1, 0, 0), modelTransform.rotateX);
+          const rotationY = new three_module_Matrix4().makeRotationAxis(new three_module_Vector3(0, 1, 0), modelTransform.rotateY);
+          const rotationZ = new three_module_Matrix4().makeRotationAxis(new three_module_Vector3(0, 0, 1), modelTransform.rotateZ);
+          const m = new three_module_Matrix4().fromArray(matrix);
+          const l = new three_module_Matrix4().makeTranslation(modelTransform.translateX, modelTransform.translateY, modelTransform.translateZ).scale(new three_module_Vector3(modelTransform.scale, -modelTransform.scale, modelTransform.scale)).multiply(rotationX).multiply(rotationY).multiply(rotationZ);
+          camera.projectionMatrix.elements = matrix;
+          camera.projectionMatrix = m.multiply(l);
+          renderer.resetState();
+          renderer.render(scene, camera);
+          map.triggerRepaint();
+        }
+      };
+      return customLayer;
+
+      //获取管道
+      function getPipeGeometry(center, opt) {
+        if (opt.data) {
+          let points = [];
+          opt.data.features.forEach(geo => {
+            geo.geometry.coordinates.forEach(item => {
+              let mercatorCoordinate = mapbox_gl_default().MercatorCoordinate.fromLngLat(item, 0);
+              let units = mercatorCoordinate.meterInMercatorCoordinateUnits();
+              points.push(new three_module_Vector2((mercatorCoordinate.x - center.x) / units, -1 * (mercatorCoordinate.y - center.y) / units));
+            });
+          });
+          let mesh = '';
+          if (points.length > 1) {
+            // const shape = new THREE.Shape(points)
+            points = points.map(vector => {
+              return new three_module_Vector3(vector.x, vector.y, 0);
+            });
+            mesh = transition3d(points); // 创建管道
+          }
+
+          return mesh;
+        } else {
+          const curve = new CatmullRomCurve3([new three_module_Vector3(-10, 0, 0), new three_module_Vector3(0, 10, 0), new three_module_Vector3(10, 0, 0)]);
+          return new TubeGeometry(curve, 4, 2, 8, false);
+        }
+      }
+
+      // 将shape转换为ExtrudeGeometry
+      function transition3d(points) {
+        // console.log(points, 'points')
+        // 创建一条曲线
+        const curve = new CatmullRomCurve3(points, false, 'catmullrom', 0.5);
+
+        // 创建管道
+        const geometry = new TubeGeometry(curve, 4, 1, 8, false);
+        return geometry;
+      }
+    }
+  });
+};
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__(2482);
 ;// CONCATENATED MODULE: ./node_modules/@luma.gl/engine/dist/esm/animation/timeline.js
@@ -119224,7 +119405,7 @@ var jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns = [];
           if (json) {
             json = JSON.parse(json);
             if (!json.features) {
-              json = arcGisToGeoJson(json);
+              json = (0,mapTools_namespaceObject.arcGisToGeoJson)(json);
             }
             const bbox = es(json);
             if (bbox.length > 0 && bbox[0] > 180) {
@@ -119265,8 +119446,8 @@ var jsonFile_component = normalizeComponent(
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_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/draw/shpFile.vue?vue&type=template&id=3bd5e448&scoped=true&
-var shpFilevue_type_template_id_3bd5e448_scoped_true_render = function render() {
+;// 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/draw/shpFile.vue?vue&type=template&id=3b26555c&scoped=true&
+var shpFilevue_type_template_id_3b26555c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -119286,7 +119467,7 @@ var shpFilevue_type_template_id_3bd5e448_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_3b26555c_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/draw/shpFile.vue?vue&type=script&lang=js&
 
@@ -119309,7 +119490,7 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
             shapeFile.read(result).then(json => {
               const bbox = es(json);
               if (!json.features) {
-                json = arcGisToGeoJson(json);
+                json = geometryCollectionToFeatureCollection(json);
               }
               if (bbox.length > 0 && bbox[0] > 180) {
                 // 墨卡托坐标需要转换
@@ -119327,9 +119508,9 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.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-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_3bd5e448_prod_lang_scss_scoped_true_ = __webpack_require__(411);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.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-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3b26555c&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_3b26555c_prod_lang_scss_scoped_true_ = __webpack_require__(4112);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3b26555c&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -119342,11 +119523,11 @@ var shpFilevue_type_style_index_0_id_3bd5e448_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_3bd5e448_scoped_true_render,
-  shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_3b26555c_scoped_true_render,
+  shpFilevue_type_template_id_3b26555c_scoped_true_staticRenderFns,
   false,
   null,
-  "3bd5e448",
+  "3b26555c",
   null
   
 )
@@ -120331,6 +120512,7 @@ var polygon_component = normalizeComponent(
 
 
 
+
 // 图层操作
 const mapLayers = {
   showLayerText: showLayerText,
@@ -120359,6 +120541,7 @@ const mapDraw = {
   addLayerCircle: addLayerCircle,
   addCircleAnimate: addCircleAnimate,
   addLayerModel: addLayerModel,
+  addLayerPipe: addLayerPipe,
   addLayerWater: addLayerWater,
   load3DTiles: load3DTiles
 };
@@ -120376,7 +120559,8 @@ const mapTools = {
   polygonCenter: polygonCenter,
   GeoAddress: GeoAddress,
   Geolocation: Geolocation,
-  getElevation: getElevation
+  getElevation: getElevation,
+  geometryCollectionToFeatureCollection: geometryCollectionToFeatureCollection
 };
 
 // 地图事件