@kq_npm/client3d_webgl_vue 0.8.7-beta → 0.8.9-beta

package/adddata/index.js

@@ -98,16 +98,13 @@ es_namespaceObject.ElMessage.install = (Vue, opts) => {
 };
 
 /* harmony default export */ var message = (es_namespaceObject.ElMessage);
-;// CONCATENATED MODULE: external "@kq_npm/client3d_webgl_vue/_libs/ol/ol"
-var ol_namespaceObject = require("@kq_npm/client3d_webgl_vue/_libs/ol/ol");
-var ol_default = /*#__PURE__*/__webpack_require__.n(ol_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
-
-
-window.ol = (ol_default()); //添加数据逻辑类
+ // import ol from "../_libs/ol/ol";
+// window.ol = ol;
+//添加数据逻辑类
 
 class AddDataViewModel {
   constructor(scenceView, options) {
@@ -134,7 +131,7 @@ class AddDataViewModel {
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
       },
       billboard: {
-        image: '',
+        image: "",
         width: 12,
         height: 12,
         disableDepthTestDistance: 35000000,
@@ -175,7 +172,7 @@ class AddDataViewModel {
       var ret = event.target.result;
       var ext = file.name.replace(/.+\./, "").toLowerCase(); //文件扩展名
 
-      var name = file.name.replace(/(.*\/)*([^.]+).*/ig, "$2"); //文件名
+      var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
 
       switch (ext) {
         case "json":
@@ -314,7 +311,7 @@ class AddDataViewModel {
       let url = options.url;
 
       if (options.type === "stkterrain") {
-        if (url.indexOf('?') > 0) {
+        if (url.indexOf("?") > 0) {
           url = url.replace("?", "layer.json?");
         } else {
           url += "layer.json";
@@ -391,7 +388,7 @@ class AddDataViewModel {
     let node, layer;
 
     switch (type) {
-      case 'kq3dimageryfile':
+      case "kq3dimageryfile":
         //影像瓦片文件
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
           name: name,
@@ -410,7 +407,7 @@ class AddDataViewModel {
 
         break;
 
-      case 'obterrain':
+      case "obterrain":
         //ob地形瓦片文件
         layer = new Cesium.Kq3dFileTerrainProvider({
           name: name,
@@ -435,7 +432,7 @@ class AddDataViewModel {
 
         break;
 
-      case 'stkterrain':
+      case "stkterrain":
         //stk地形瓦片文件
         layer = new Cesium.CesiumTerrainProvider({
           name: name,
@@ -590,7 +587,7 @@ class AddDataViewModel {
           showLayers.reverse(); //获取图层筛选类型时用
 
           showLayers.forEach(layer => {
-            layer.sourceType = 'kqserver';
+            layer.sourceType = "kqserver";
           });
           this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
           showLayers.forEach(layer => {
@@ -971,20 +968,20 @@ const __default__ = {
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts',
             description: language.value.imagertyOGCWMTSdescription
-          }, {
-            type: 'wfs',
-            name: language.value.OGCWFS,
-            namePlaceholder: language.value.wfsLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
-            description: language.value.imagertyOGCWFSdescription
           },
           /*{
-           type: 'mvt',
-           name: language.value.MVT,
-           namePlaceholder: language.value.unnamedLayer,
-           urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
-           stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
-           description: language.value.imagertyMVTdescription
+            type: 'wfs',
+            name: language.value.OGCWFS,
+            namePlaceholder: language.value.wfsLayer,
+            urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
+            description: language.value.imagertyOGCWFSdescription
+          }, {
+            type: 'mvt',
+            name: language.value.MVT,
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
+            stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
+            description: language.value.imagertyMVTdescription
           }, */
           {
             type: 'geojson',

package/index.js

@@ -532,12 +532,15 @@ var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
 var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
 ;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
 var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
+;// CONCATENATED MODULE: external "@turf/turf"
+var turf_namespaceObject = require("@turf/turf");
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
 
 
 
+
  //绘制操作类
 
 class DrawManager {
@@ -817,10 +820,10 @@ class DrawManager {
     if (shape) {
       if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
         let position = that.transformPosition(shape._position);
-        geoFeature = turf.point(position);
+        geoFeature = turf_namespaceObject.point(position);
       } else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
         let center = that.transformPosition(shape.center);
-        geoFeature = turf.circle(center, shape.radius, {
+        geoFeature = turf_namespaceObject.circle(center, shape.radius, {
           steps: 64,
           units: "meters"
         });
@@ -829,14 +832,14 @@ class DrawManager {
         shape.controlPoints.forEach(function (val) {
           position[0].push(that.transformPosition(val));
         });
-        geoFeature = turf.lineStrings(position).features[0];
+        geoFeature = turf_namespaceObject.lineStrings(position).features[0];
       } else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
         let minX = shape.rectangle.west / Math.PI * 180;
         let maxX = shape.rectangle.east / Math.PI * 180;
         let minY = shape.rectangle.south / Math.PI * 180;
         let maxY = shape.rectangle.north / Math.PI * 180;
         let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
-        geoFeature = turf.polygon(positions1);
+        geoFeature = turf_namespaceObject.polygon(positions1);
       } else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
         let positions = [[]];
         let posi;
@@ -852,7 +855,7 @@ class DrawManager {
             positions[0].push(posi);
           }
         });
-        geoFeature = turf.polygon(positions);
+        geoFeature = turf_namespaceObject.polygon(positions);
       }
     }
 
@@ -16559,16 +16562,13 @@ PlaneClip.install = (Vue, opts) => {
 };
 
 
-;// CONCATENATED MODULE: external "@kq_npm/client3d_webgl_vue/_libs/ol/ol"
-var ol_namespaceObject = require("@kq_npm/client3d_webgl_vue/_libs/ol/ol");
-var ol_default = /*#__PURE__*/__webpack_require__.n(ol_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
-
-
-window.ol = (ol_default()); //添加数据逻辑类
+ // import ol from "../_libs/ol/ol";
+// window.ol = ol;
+//添加数据逻辑类
 
 class AddDataViewModel {
   constructor(scenceView, options) {
@@ -16595,7 +16595,7 @@ class AddDataViewModel {
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
       },
       billboard: {
-        image: '',
+        image: "",
         width: 12,
         height: 12,
         disableDepthTestDistance: 35000000,
@@ -16636,7 +16636,7 @@ class AddDataViewModel {
       var ret = event.target.result;
       var ext = file.name.replace(/.+\./, "").toLowerCase(); //文件扩展名
 
-      var name = file.name.replace(/(.*\/)*([^.]+).*/ig, "$2"); //文件名
+      var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
 
       switch (ext) {
         case "json":
@@ -16775,7 +16775,7 @@ class AddDataViewModel {
       let url = options.url;
 
       if (options.type === "stkterrain") {
-        if (url.indexOf('?') > 0) {
+        if (url.indexOf("?") > 0) {
           url = url.replace("?", "layer.json?");
         } else {
           url += "layer.json";
@@ -16852,7 +16852,7 @@ class AddDataViewModel {
     let node, layer;
 
     switch (type) {
-      case 'kq3dimageryfile':
+      case "kq3dimageryfile":
         //影像瓦片文件
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
           name: name,
@@ -16871,7 +16871,7 @@ class AddDataViewModel {
 
         break;
 
-      case 'obterrain':
+      case "obterrain":
         //ob地形瓦片文件
         layer = new Cesium.Kq3dFileTerrainProvider({
           name: name,
@@ -16896,7 +16896,7 @@ class AddDataViewModel {
 
         break;
 
-      case 'stkterrain':
+      case "stkterrain":
         //stk地形瓦片文件
         layer = new Cesium.CesiumTerrainProvider({
           name: name,
@@ -17051,7 +17051,7 @@ class AddDataViewModel {
           showLayers.reverse(); //获取图层筛选类型时用
 
           showLayers.forEach(layer => {
-            layer.sourceType = 'kqserver';
+            layer.sourceType = "kqserver";
           });
           this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
           showLayers.forEach(layer => {
@@ -17432,20 +17432,20 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ':http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts',
             description: language.value.imagertyOGCWMTSdescription
-          }, {
-            type: 'wfs',
-            name: language.value.OGCWFS,
-            namePlaceholder: language.value.wfsLayer,
-            urlPlaceholder: language.value.format + ':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
-            description: language.value.imagertyOGCWFSdescription
           },
           /*{
-           type: 'mvt',
-           name: language.value.MVT,
-           namePlaceholder: language.value.unnamedLayer,
-           urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
-           stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
-           description: language.value.imagertyMVTdescription
+            type: 'wfs',
+            name: language.value.OGCWFS,
+            namePlaceholder: language.value.wfsLayer,
+            urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
+            description: language.value.imagertyOGCWFSdescription
+          }, {
+            type: 'mvt',
+            name: language.value.MVT,
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
+            stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
+            description: language.value.imagertyMVTdescription
           }, */
           {
             type: 'geojson',

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.8.7-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.8.9-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -79,12 +79,15 @@ var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
 var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
 ;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
 var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
+;// CONCATENATED MODULE: external "@turf/turf"
+var turf_namespaceObject = require("@turf/turf");
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
 
 
 
+
  //绘制操作类
 
 class DrawManager {
@@ -364,10 +367,10 @@ class DrawManager {
     if (shape) {
       if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
         let position = that.transformPosition(shape._position);
-        geoFeature = turf.point(position);
+        geoFeature = turf_namespaceObject.point(position);
       } else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
         let center = that.transformPosition(shape.center);
-        geoFeature = turf.circle(center, shape.radius, {
+        geoFeature = turf_namespaceObject.circle(center, shape.radius, {
           steps: 64,
           units: "meters"
         });
@@ -376,14 +379,14 @@ class DrawManager {
         shape.controlPoints.forEach(function (val) {
           position[0].push(that.transformPosition(val));
         });
-        geoFeature = turf.lineStrings(position).features[0];
+        geoFeature = turf_namespaceObject.lineStrings(position).features[0];
       } else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
         let minX = shape.rectangle.west / Math.PI * 180;
         let maxX = shape.rectangle.east / Math.PI * 180;
         let minY = shape.rectangle.south / Math.PI * 180;
         let maxY = shape.rectangle.north / Math.PI * 180;
         let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
-        geoFeature = turf.polygon(positions1);
+        geoFeature = turf_namespaceObject.polygon(positions1);
       } else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
         let positions = [[]];
         let posi;
@@ -399,7 +402,7 @@ class DrawManager {
             positions[0].push(posi);
           }
         });
-        geoFeature = turf.polygon(positions);
+        geoFeature = turf_namespaceObject.polygon(positions);
       }
     }