Skip to content

Commit b7a1960

Browse files
author
潘卓然 Parn Deedlit
authored
Merge branch 'dev' into example
2 parents ad5320a + 81f0fb9 commit b7a1960

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+947
-144
lines changed

‎website/public/static/demo/config/config-vue-mapboxgl.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@
312312
"detail": "arcgis图例组件",
313313
"icon": "legend.png",
314314
"update": "最后更新时间：2021-06-07"
315+
"name": "表格组件",
316+
"file": "table",
317+
"diffcult": "3",
318+
"detail": "",
319+
"icon": "table.png",
320+
"update": "最后更新时间：2021-6-7"
315321
}
316322
]
317323
},

‎website/public/static/demo/mapboxgl/example/client-view/echarts/echartsflight.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
function updateView() {
5353
$.get('../../static/data/echartsgl/lines/lines.geojson', function (data) {
54+
data = JSON.parse(data);
5455
function getAirportCoord(idx) {
5556
return [data.airports[idx][3], data.airports[idx][4]];
5657
}

‎website/public/static/demo/mapboxgl/example/client-view/echarts/echartsline.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
function updateView() {
5353
$.get('../../static/data/echarts/line-bus.geojson', function (data) {
54+
data = JSON.parse(data);
5455
busLines = [].concat.apply([], data.map(function (busLine, idx) {
5556
var prevPt;
5657
var points = [];

‎website/public/static/demo/mapboxgl/example/client-view/echarts/echartslineanimate.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
function updateView() {
5353
$.get('../../static/data/echarts/line-bus.geojson', function (data) {
54+
data = JSON.parse(data);
5455
var hStep = 300 / (data.length - 1);
5556
busLines = [].concat.apply([], data.map(function (busLine, idx) {
5657
var prevPt;

‎website/public/static/demo/mapboxgl/example/client-view/echarts/echartsweibo.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
]
6060
var layer;
6161
$.get('../../static/data/echarts/weibo.geojson', function (weiboData) {
62+
weiboData = JSON.parse(weiboData);
6263
weiboData = weiboData.map(function (serieData, idx) {
6364
var px = serieData[0] / 1000;
6465
var py = serieData[1] / 1000;

‎website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_animate.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
var data = [];
5151

5252
$.get('../../static/data/mapv/china-point.geojson', function (rs) {
53+
rs = JSON.parse(rs);
5354
for (var i = 0; i < rs[0].length; i++) {
5455
var geoCoord = rs[0][i].geoCoord;
5556
data.push({

‎website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_weibo.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
4949
});
5050
$.get('../../static/data/mapv/weibo.geojson', function (rs) {
51+
rs = JSON.parse(rs);
5152
var data1 = [];
5253
var data2 = [];
5354
var data3 = [];

‎website/public/static/demo/mapboxgl/example/client-view/mapv/mapvrender_polygon.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
4949
});
5050
$.get('../../static/data/mapv/beijing-village.geojson', function (data) {
51-
51+
data = JSON.parse(data);
5252
var dataSet = new mapv.DataSet(data);
5353

5454
var options = {

‎website/public/static/demo/mapboxgl/example/client-view/mapv/mapvsimplemigrate.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
5050
});
5151
$.get('../../static/data/mapv/china.geojson', function (geojson) {
52-
52+
geojson = JSON.parse(geojson);
5353
var geojsonOptions = {
5454
gradient: {
5555
0: 'rgba(55, 50, 250, 0.4)',

‎website/public/static/demo/vue-cesium/example/control/draw.htm‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,21 @@
3535
<body>
3636
<div id="app">
3737
<mapgis-web-scene
38-
:animation="false"
39-
:timeline="false"
4038
v-on:load="handleLoad"
4139
lib-path="./static/libs/cdn/cesium/Cesium.js"
4240
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
4341
>
44-
<mapgis-3d-draw ref="drawref" :vue-key="vueKey" v-on:load="handleDrawLoad" v-on:drawcreate="handleCreate">
42+
<mapgis-3d-draw ref="drawref" v-on:load="handleDrawLoad" v-on:drawcreate="handleCreate">
4543
<div id="toolbar-wrapper">
4644
<div class="toolbar-item" v-on:click="togglePoint">画点</div>
4745
<div class="toolbar-item" v-on:click="togglePolyline">画线</div>
4846
<div class="toolbar-item" v-on:click="togglePolygon">画区</div>
47+
<div class="toolbar-item" v-on:click="toggleRectangle">画矩形</div>
4948
<div class="toolbar-item" v-on:click="toggleDelete">删除</div>
5049
</div>
5150
</mapgis-3d-draw>
5251
<mapgis-3d-raster-layer :base-url="baseUrl"></mapgis-3d-raster-layer>
53-
</mapgis-web-globe>
52+
</mapgis-web-scene>
5453
</div>
5554
<script>
5655
new Vue({
@@ -83,6 +82,9 @@
8382
togglePolygon() {
8483
this.drawer && this.drawer.enableDrawPolygon();
8584
},
85+
toggleRectangle() {
86+
this.drawer && this.drawer.enableDrawRectangle();
87+
},
8688
toggleDelete() {
8789
this.drawer && this.drawer.removeEntities();
8890
}

0 commit comments

Comments
 (0)