@kq_npm/client3d_webgl_vue 0.8.6-beta → 0.8.8-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/adddata/index.js +10 -13
- package/index.js +15 -21
- package/package.json +1 -1
- package/scenceview/index.js +5 -8
package/adddata/index.js
CHANGED
|
@@ -98,16 +98,13 @@ es_namespaceObject.ElMessage.install = (Vue, opts) => {
|
|
|
98
98
|
};
|
|
99
99
|
|
|
100
100
|
/* harmony default export */ var message = (es_namespaceObject.ElMessage);
|
|
101
|
-
;// CONCATENATED MODULE: external "@kq_npm/client3d_webgl_vue/_libs/ol/ol"
|
|
102
|
-
var ol_namespaceObject = require("@kq_npm/client3d_webgl_vue/_libs/ol/ol");
|
|
103
|
-
var ol_default = /*#__PURE__*/__webpack_require__.n(ol_namespaceObject);
|
|
104
101
|
;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
|
|
105
102
|
|
|
106
103
|
|
|
107
104
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
// import ol from "../_libs/ol/ol";
|
|
106
|
+
// window.ol = ol;
|
|
107
|
+
//添加数据逻辑类
|
|
111
108
|
|
|
112
109
|
class AddDataViewModel {
|
|
113
110
|
constructor(scenceView, options) {
|
|
@@ -134,7 +131,7 @@ class AddDataViewModel {
|
|
|
134
131
|
distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
|
|
135
132
|
},
|
|
136
133
|
billboard: {
|
|
137
|
-
image:
|
|
134
|
+
image: "",
|
|
138
135
|
width: 12,
|
|
139
136
|
height: 12,
|
|
140
137
|
disableDepthTestDistance: 35000000,
|
|
@@ -175,7 +172,7 @@ class AddDataViewModel {
|
|
|
175
172
|
var ret = event.target.result;
|
|
176
173
|
var ext = file.name.replace(/.+\./, "").toLowerCase(); //文件扩展名
|
|
177
174
|
|
|
178
|
-
var name = file.name.replace(/(.*\/)*([^.]+).*/
|
|
175
|
+
var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
|
|
179
176
|
|
|
180
177
|
switch (ext) {
|
|
181
178
|
case "json":
|
|
@@ -314,7 +311,7 @@ class AddDataViewModel {
|
|
|
314
311
|
let url = options.url;
|
|
315
312
|
|
|
316
313
|
if (options.type === "stkterrain") {
|
|
317
|
-
if (url.indexOf(
|
|
314
|
+
if (url.indexOf("?") > 0) {
|
|
318
315
|
url = url.replace("?", "layer.json?");
|
|
319
316
|
} else {
|
|
320
317
|
url += "layer.json";
|
|
@@ -391,7 +388,7 @@ class AddDataViewModel {
|
|
|
391
388
|
let node, layer;
|
|
392
389
|
|
|
393
390
|
switch (type) {
|
|
394
|
-
case
|
|
391
|
+
case "kq3dimageryfile":
|
|
395
392
|
//影像瓦片文件
|
|
396
393
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
|
|
397
394
|
name: name,
|
|
@@ -410,7 +407,7 @@ class AddDataViewModel {
|
|
|
410
407
|
|
|
411
408
|
break;
|
|
412
409
|
|
|
413
|
-
case
|
|
410
|
+
case "obterrain":
|
|
414
411
|
//ob地形瓦片文件
|
|
415
412
|
layer = new Cesium.Kq3dFileTerrainProvider({
|
|
416
413
|
name: name,
|
|
@@ -435,7 +432,7 @@ class AddDataViewModel {
|
|
|
435
432
|
|
|
436
433
|
break;
|
|
437
434
|
|
|
438
|
-
case
|
|
435
|
+
case "stkterrain":
|
|
439
436
|
//stk地形瓦片文件
|
|
440
437
|
layer = new Cesium.CesiumTerrainProvider({
|
|
441
438
|
name: name,
|
|
@@ -590,7 +587,7 @@ class AddDataViewModel {
|
|
|
590
587
|
showLayers.reverse(); //获取图层筛选类型时用
|
|
591
588
|
|
|
592
589
|
showLayers.forEach(layer => {
|
|
593
|
-
layer.sourceType =
|
|
590
|
+
layer.sourceType = "kqserver";
|
|
594
591
|
});
|
|
595
592
|
this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
|
|
596
593
|
showLayers.forEach(layer => {
|
package/index.js
CHANGED
|
@@ -532,15 +532,12 @@ var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
|
|
|
532
532
|
var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
|
|
533
533
|
;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
|
|
534
534
|
var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
|
|
535
|
-
;// CONCATENATED MODULE: external "@turf/turf"
|
|
536
|
-
var turf_namespaceObject = require("@turf/turf");
|
|
537
535
|
;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
|
|
538
536
|
var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
|
|
539
537
|
;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
|
|
540
538
|
|
|
541
539
|
|
|
542
540
|
|
|
543
|
-
|
|
544
541
|
//绘制操作类
|
|
545
542
|
|
|
546
543
|
class DrawManager {
|
|
@@ -820,10 +817,10 @@ class DrawManager {
|
|
|
820
817
|
if (shape) {
|
|
821
818
|
if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
|
|
822
819
|
let position = that.transformPosition(shape._position);
|
|
823
|
-
geoFeature =
|
|
820
|
+
geoFeature = turf.point(position);
|
|
824
821
|
} else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
|
|
825
822
|
let center = that.transformPosition(shape.center);
|
|
826
|
-
geoFeature =
|
|
823
|
+
geoFeature = turf.circle(center, shape.radius, {
|
|
827
824
|
steps: 64,
|
|
828
825
|
units: "meters"
|
|
829
826
|
});
|
|
@@ -832,14 +829,14 @@ class DrawManager {
|
|
|
832
829
|
shape.controlPoints.forEach(function (val) {
|
|
833
830
|
position[0].push(that.transformPosition(val));
|
|
834
831
|
});
|
|
835
|
-
geoFeature =
|
|
832
|
+
geoFeature = turf.lineStrings(position).features[0];
|
|
836
833
|
} else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
|
|
837
834
|
let minX = shape.rectangle.west / Math.PI * 180;
|
|
838
835
|
let maxX = shape.rectangle.east / Math.PI * 180;
|
|
839
836
|
let minY = shape.rectangle.south / Math.PI * 180;
|
|
840
837
|
let maxY = shape.rectangle.north / Math.PI * 180;
|
|
841
838
|
let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
|
|
842
|
-
geoFeature =
|
|
839
|
+
geoFeature = turf.polygon(positions1);
|
|
843
840
|
} else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
|
|
844
841
|
let positions = [[]];
|
|
845
842
|
let posi;
|
|
@@ -855,7 +852,7 @@ class DrawManager {
|
|
|
855
852
|
positions[0].push(posi);
|
|
856
853
|
}
|
|
857
854
|
});
|
|
858
|
-
geoFeature =
|
|
855
|
+
geoFeature = turf.polygon(positions);
|
|
859
856
|
}
|
|
860
857
|
}
|
|
861
858
|
|
|
@@ -16562,16 +16559,13 @@ PlaneClip.install = (Vue, opts) => {
|
|
|
16562
16559
|
};
|
|
16563
16560
|
|
|
16564
16561
|
|
|
16565
|
-
;// CONCATENATED MODULE: external "@kq_npm/client3d_webgl_vue/_libs/ol/ol"
|
|
16566
|
-
var ol_namespaceObject = require("@kq_npm/client3d_webgl_vue/_libs/ol/ol");
|
|
16567
|
-
var ol_default = /*#__PURE__*/__webpack_require__.n(ol_namespaceObject);
|
|
16568
16562
|
;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
|
|
16569
16563
|
|
|
16570
16564
|
|
|
16571
16565
|
|
|
16572
|
-
|
|
16573
|
-
|
|
16574
|
-
|
|
16566
|
+
// import ol from "../_libs/ol/ol";
|
|
16567
|
+
// window.ol = ol;
|
|
16568
|
+
//添加数据逻辑类
|
|
16575
16569
|
|
|
16576
16570
|
class AddDataViewModel {
|
|
16577
16571
|
constructor(scenceView, options) {
|
|
@@ -16598,7 +16592,7 @@ class AddDataViewModel {
|
|
|
16598
16592
|
distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
|
|
16599
16593
|
},
|
|
16600
16594
|
billboard: {
|
|
16601
|
-
image:
|
|
16595
|
+
image: "",
|
|
16602
16596
|
width: 12,
|
|
16603
16597
|
height: 12,
|
|
16604
16598
|
disableDepthTestDistance: 35000000,
|
|
@@ -16639,7 +16633,7 @@ class AddDataViewModel {
|
|
|
16639
16633
|
var ret = event.target.result;
|
|
16640
16634
|
var ext = file.name.replace(/.+\./, "").toLowerCase(); //文件扩展名
|
|
16641
16635
|
|
|
16642
|
-
var name = file.name.replace(/(.*\/)*([^.]+).*/
|
|
16636
|
+
var name = file.name.replace(/(.*\/)*([^.]+).*/gi, "$2"); //文件名
|
|
16643
16637
|
|
|
16644
16638
|
switch (ext) {
|
|
16645
16639
|
case "json":
|
|
@@ -16778,7 +16772,7 @@ class AddDataViewModel {
|
|
|
16778
16772
|
let url = options.url;
|
|
16779
16773
|
|
|
16780
16774
|
if (options.type === "stkterrain") {
|
|
16781
|
-
if (url.indexOf(
|
|
16775
|
+
if (url.indexOf("?") > 0) {
|
|
16782
16776
|
url = url.replace("?", "layer.json?");
|
|
16783
16777
|
} else {
|
|
16784
16778
|
url += "layer.json";
|
|
@@ -16855,7 +16849,7 @@ class AddDataViewModel {
|
|
|
16855
16849
|
let node, layer;
|
|
16856
16850
|
|
|
16857
16851
|
switch (type) {
|
|
16858
|
-
case
|
|
16852
|
+
case "kq3dimageryfile":
|
|
16859
16853
|
//影像瓦片文件
|
|
16860
16854
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
|
|
16861
16855
|
name: name,
|
|
@@ -16874,7 +16868,7 @@ class AddDataViewModel {
|
|
|
16874
16868
|
|
|
16875
16869
|
break;
|
|
16876
16870
|
|
|
16877
|
-
case
|
|
16871
|
+
case "obterrain":
|
|
16878
16872
|
//ob地形瓦片文件
|
|
16879
16873
|
layer = new Cesium.Kq3dFileTerrainProvider({
|
|
16880
16874
|
name: name,
|
|
@@ -16899,7 +16893,7 @@ class AddDataViewModel {
|
|
|
16899
16893
|
|
|
16900
16894
|
break;
|
|
16901
16895
|
|
|
16902
|
-
case
|
|
16896
|
+
case "stkterrain":
|
|
16903
16897
|
//stk地形瓦片文件
|
|
16904
16898
|
layer = new Cesium.CesiumTerrainProvider({
|
|
16905
16899
|
name: name,
|
|
@@ -17054,7 +17048,7 @@ class AddDataViewModel {
|
|
|
17054
17048
|
showLayers.reverse(); //获取图层筛选类型时用
|
|
17055
17049
|
|
|
17056
17050
|
showLayers.forEach(layer => {
|
|
17057
|
-
layer.sourceType =
|
|
17051
|
+
layer.sourceType = "kqserver";
|
|
17058
17052
|
});
|
|
17059
17053
|
this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
|
|
17060
17054
|
showLayers.forEach(layer => {
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.8.
|
|
1
|
+
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.8.8-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"}}
|
package/scenceview/index.js
CHANGED
|
@@ -79,15 +79,12 @@ var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
|
|
|
79
79
|
var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
|
|
80
80
|
;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
|
|
81
81
|
var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
|
|
82
|
-
;// CONCATENATED MODULE: external "@turf/turf"
|
|
83
|
-
var turf_namespaceObject = require("@turf/turf");
|
|
84
82
|
;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
|
|
85
83
|
var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
|
|
86
84
|
;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
|
|
87
85
|
|
|
88
86
|
|
|
89
87
|
|
|
90
|
-
|
|
91
88
|
//绘制操作类
|
|
92
89
|
|
|
93
90
|
class DrawManager {
|
|
@@ -367,10 +364,10 @@ class DrawManager {
|
|
|
367
364
|
if (shape) {
|
|
368
365
|
if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
|
|
369
366
|
let position = that.transformPosition(shape._position);
|
|
370
|
-
geoFeature =
|
|
367
|
+
geoFeature = turf.point(position);
|
|
371
368
|
} else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
|
|
372
369
|
let center = that.transformPosition(shape.center);
|
|
373
|
-
geoFeature =
|
|
370
|
+
geoFeature = turf.circle(center, shape.radius, {
|
|
374
371
|
steps: 64,
|
|
375
372
|
units: "meters"
|
|
376
373
|
});
|
|
@@ -379,14 +376,14 @@ class DrawManager {
|
|
|
379
376
|
shape.controlPoints.forEach(function (val) {
|
|
380
377
|
position[0].push(that.transformPosition(val));
|
|
381
378
|
});
|
|
382
|
-
geoFeature =
|
|
379
|
+
geoFeature = turf.lineStrings(position).features[0];
|
|
383
380
|
} else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
|
|
384
381
|
let minX = shape.rectangle.west / Math.PI * 180;
|
|
385
382
|
let maxX = shape.rectangle.east / Math.PI * 180;
|
|
386
383
|
let minY = shape.rectangle.south / Math.PI * 180;
|
|
387
384
|
let maxY = shape.rectangle.north / Math.PI * 180;
|
|
388
385
|
let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
|
|
389
|
-
geoFeature =
|
|
386
|
+
geoFeature = turf.polygon(positions1);
|
|
390
387
|
} else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
|
|
391
388
|
let positions = [[]];
|
|
392
389
|
let posi;
|
|
@@ -402,7 +399,7 @@ class DrawManager {
|
|
|
402
399
|
positions[0].push(posi);
|
|
403
400
|
}
|
|
404
401
|
});
|
|
405
|
-
geoFeature =
|
|
402
|
+
geoFeature = turf.polygon(positions);
|
|
406
403
|
}
|
|
407
404
|
}
|
|
408
405
|
|