Skip to content

Commit 13991f1

Browse files
zhangying-zy618zhangying-zy618
authored
Merge branch 'dev' into modify_zy
2 parents 97e89b9 + 4ed7c0d commit 13991f1

File tree

20 files changed

+55
-111
lines changed

20 files changed

+55
-111
lines changed

‎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
}

‎website/public/static/demo/vue-cesium/gallery/control/draw.png‎

745 KB
Loading

‎website/public/static/demo/vue-cesium/gallery/raster/raster.png‎

353 KB
Loading

‎website/public/static/demo/vue-mapboxgl/example/vue-control/attribution.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
:token="token">
4040
</mapgis-ogc-wmts-layer>
4141
<mapgis-rastertile-layer
42-
:layer="layerRaster"
4342
:layer-id="layerRasterId"
4443
:source="sourceRaster"
4544
:source-id="sourceRasterId">
@@ -76,7 +75,6 @@
7675
format:"tiles",
7776
token:"f5347cab4b28410a6e8ba5143e3d5a35",
7877

79-
layerRaster: {},
8078
sourceRaster: {
8179
type: 'raster',
8280
tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']

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

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
v-bind:crs="mapCrs"
5353
>
5454
<mapgis-igs-tdt-layer
55-
v-bind:layer="layer"
5655
v-bind:layer-id="layerId"
5756
v-bind:source-id="sourceId"
5857
v-bind:baseURL="baseURL"
@@ -64,15 +63,15 @@
6463
class="custom-draw-wrapper"
6564
position="top-left"
6665
v-bind:controls="controls"
67-
v-on:added="handleAdded1"
68-
v-on:drawcreate="handleCreate1"
69-
ref="drawref1"
66+
v-on:added="handleAdded"
67+
v-on:drawcreate="handleCreate"
68+
ref="drawref"
7069
>
7170
<div id="toolbar-wrapper1">
72-
<div class="toolbar-item" v-on:click="togglePoint1">画点</div>
73-
<div class="toolbar-item" v-on:click="togglePolyline1">画线</div>
74-
<div class="toolbar-item" v-on:click="togglePolygon1">画区</div>
75-
<div class="toolbar-item" v-on:click="toggleDelete1">删除</div>
71+
<div class="toolbar-item" v-on:click="togglePoint">画点</div>
72+
<div class="toolbar-item" v-on:click="togglePolyline">画线</div>
73+
<div class="toolbar-item" v-on:click="togglePolygon">画区</div>
74+
<div class="toolbar-item" v-on:click="toggleDelete">删除</div>
7675
</div>
7776
</mapgis-draw>
7877
</mapgis-web-map>
@@ -97,7 +96,6 @@
9796

9897
layerId: 'igsLayer_layerId',
9998
sourceId: 'igsLayer_sourceId',
100-
layer: {}, // 图层配置信息
10199
baseURL: 'http://t2.tianditu.gov.cn/vec_c/wmts', // 请求基地址
102100
token: '2ddaabf906d4b5418aed0078e1657029', // 请求天地图的key值
103101
controls: {
@@ -112,44 +110,34 @@
112110
};
113111
},
114112
methods: {
115-
enableDrawer1() {
116-
const component = this.$refs.drawref1;
113+
enableDrawer() {
114+
const component = this.$refs.drawref;
117115
if (component) {
118116
component.enableDrawer();
119117
}
120118
},
121-
enableDrawer2() {
122-
const component = this.$refs.drawref2;
123-
if (component) {
124-
component.enableDrawer();
125-
}
126-
},
127-
handleAdded1(e, data) {
119+
handleAdded(e, data) {
128120
var { drawer, map } = e;
129-
this.drawer1 = drawer;
121+
this.drawer = drawer;
130122
},
131-
handleCreate1(e) {
123+
handleCreate(e) {
132124
console.log('create', e);
133-
// this.drawer1 && this.drawer1.deleteAll();
134125
},
135-
togglePoint1(e) {
136-
this.enableDrawer1();
137-
this.drawer1 && this.drawer1.changeMode('draw_point');
126+
togglePoint(e) {
127+
this.enableDrawer();
128+
this.drawer && this.drawer.changeMode('draw_point');
138129
},
139-
togglePolyline1() {
140-
this.enableDrawer1();
141-
this.drawer1 && this.drawer1.changeMode('draw_line_string');
130+
togglePolyline() {
131+
this.enableDrawer();
132+
this.drawer && this.drawer.changeMode('draw_line_string');
142133
},
143-
togglePolygon1() {
144-
this.enableDrawer1();
134+
togglePolygon() {
135+
this.enableDrawer();
145136
this.mode = 'QueryByPolygon';
146-
this.drawer1 && this.drawer1.changeMode('draw_polygon');
147-
},
148-
toggleDelete1() {
149-
this.drawer1 && this.drawer1.deleteAll();
137+
this.drawer && this.drawer.changeMode('draw_polygon');
150138
},
151-
toggleDelete2() {
152-
this.drawer2 && this.drawer2.deleteAll();
139+
toggleDelete() {
140+
this.drawer && this.drawer.deleteAll();
153141
}
154142
}
155143
});

‎website/public/static/demo/vue-mapboxgl/example/vue-control/fps.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
>
4141
</mapgis-ogc-wmts-layer>
4242
<mapgis-rastertile-layer
43-
v-bind:layer="layerRaster"
4443
v-bind:layer-id="layerRasterId"
4544
v-bind:source="sourceRaster"
4645
v-bind:source-id="sourceRasterId"
@@ -76,7 +75,6 @@
7675
format:"tiles",
7776
token:"f5347cab4b28410a6e8ba5143e3d5a35",
7877

79-
layerRaster: {},
8078
sourceRaster: {
8179
type: 'raster',
8280
tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']

‎website/public/static/demo/vue-mapboxgl/example/vue-control/fullscreen.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
:token="token">
4040
</mapgis-ogc-wmts-layer>
4141
<mapgis-rastertile-layer
42-
:layer="layerRaster"
4342
:layer-id="layerRasterId"
4443
:source="sourceRaster"
4544
:source-id="sourceRasterId">
@@ -77,7 +76,6 @@
7776
format:"tiles",
7877
token:"f5347cab4b28410a6e8ba5143e3d5a35",
7978

80-
layerRaster: {},
8179
sourceRaster: {
8280
type: 'raster',
8381
tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']

‎website/public/static/demo/vue-mapboxgl/example/vue-control/geolocate.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
:token="token">
4141
</mapgis-ogc-wmts-layer>
4242
<mapgis-rastertile-layer
43-
:layer="layerRaster"
4443
:layer-id="layerRasterId"
4544
:source="sourceRaster"
4645
:source-id="sourceRasterId"
@@ -76,7 +75,6 @@
7675
format:"tiles",
7776
token:"f5347cab4b28410a6e8ba5143e3d5a35",
7877

79-
layerRaster: {},
8078
sourceRaster: {
8179
type: 'raster',
8280
tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']

‎website/public/static/demo/vue-mapboxgl/example/vue-control/marker.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
v-bind:token="token">
4646
</mapgis-ogc-wmts-layer>
4747
<mapgis-rastertile-layer
48-
v-bind:layer="layerRaster"
4948
v-bind:layer-id="layerRasterId"
5049
v-bind:source="sourceRaster"
5150
v-bind:source-id="sourceRasterId"
@@ -83,7 +82,6 @@
8382
format:"tiles",
8483
token:"f5347cab4b28410a6e8ba5143e3d5a35",
8584

86-
layerRaster: {},
8785
sourceRaster: {
8886
type: 'raster',
8987
tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']

‎website/public/static/demo/vue-mapboxgl/example/vue-control/measure.htm‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
v-on:load="handleMapLoad"
5454
>
5555
<mapgis-igs-tdt-layer
56-
:layer="layer"
57-
:layer-id="layerId"
56+
:layer-id="layerId"
5857
:source-id="sourceId"
5958
:baseURL="baseURL"
6059
:token="token"
@@ -101,7 +100,6 @@
101100

102101
layerId: 'igsLayer_layerId',
103102
sourceId: 'igsLayer_sourceId',
104-
layer: {}, // 图层配置信息
105103
baseURL: 'http://t2.tianditu.gov.cn/vec_c/wmts', // 请求基地址
106104
token: '2ddaabf906d4b5418aed0078e1657029', // 请求天地图的key值
107105
controls: {

0 commit comments

Comments
 (0)