Merge remote-tracking branch 'origin/dev' into dev

killer1992 · killer1992 · commit 80255a2b441d · 2021-06-07T20:44:06.000+08:00
diff --git a/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsflight.htm b/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsflight.htm
@@ -51,6 +51,7 @@
 
     function updateView() {
       $.get('../../static/data/echartsgl/lines/lines.geojson', function (data) {
+        data = JSON.parse(data);
         function getAirportCoord(idx) {
           return [data.airports[idx][3], data.airports[idx][4]];
         }
diff --git a/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsline.htm b/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsline.htm
@@ -51,6 +51,7 @@
 
     function updateView() {
       $.get('../../static/data/echarts/line-bus.geojson', function (data) {
+        data = JSON.parse(data);
         busLines = [].concat.apply([], data.map(function (busLine, idx) {
           var prevPt;
           var points = [];
diff --git a/website/public/static/demo/mapboxgl/example/client-view/echarts/echartslineanimate.htm b/website/public/static/demo/mapboxgl/example/client-view/echarts/echartslineanimate.htm
@@ -51,6 +51,7 @@
 
     function updateView() {
       $.get('../../static/data/echarts/line-bus.geojson', function (data) {
+        data = JSON.parse(data);
         var hStep = 300 / (data.length - 1);
         busLines = [].concat.apply([], data.map(function (busLine, idx) {
           var prevPt;
diff --git a/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsweibo.htm b/website/public/static/demo/mapboxgl/example/client-view/echarts/echartsweibo.htm
@@ -59,6 +59,7 @@
       ]
       var layer;
       $.get('../../static/data/echarts/weibo.geojson', function (weiboData) {
+        weiboData = JSON.parse(weiboData);
         weiboData = weiboData.map(function (serieData, idx) {
           var px = serieData[0] / 1000;
           var py = serieData[1] / 1000;
diff --git a/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_animate.htm b/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_animate.htm
@@ -50,6 +50,7 @@
     var data = [];
 
     $.get('../../static/data/mapv/china-point.geojson', function (rs) {
+      rs = JSON.parse(rs);
       for (var i = 0; i < rs[0].length; i++) {
         var geoCoord = rs[0][i].geoCoord;
         data.push({
diff --git a/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_weibo.htm b/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvpoint_weibo.htm
@@ -48,6 +48,7 @@
       document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
     });
     $.get('../../static/data/mapv/weibo.geojson', function (rs) {
+      rs = JSON.parse(rs);
       var data1 = [];
       var data2 = [];
       var data3 = [];
diff --git a/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvrender_polygon.htm b/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvrender_polygon.htm
@@ -48,7 +48,7 @@
       document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
     });
     $.get('../../static/data/mapv/beijing-village.geojson', function (data) {
-
+      data = JSON.parse(data);
       var dataSet = new mapv.DataSet(data);
 
       var options = {
diff --git a/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvsimplemigrate.htm b/website/public/static/demo/mapboxgl/example/client-view/mapv/mapvsimplemigrate.htm
@@ -49,7 +49,7 @@
       document.getElementById('mouse-position').innerHTML = "X轴：" + x.toFixed(2) + "，Y轴：" + y.toFixed(2);
     });
     $.get('../../static/data/mapv/china.geojson', function (geojson) {
-
+      geojson = JSON.parse(geojson);
       var geojsonOptions = {
         gradient: {
           0: 'rgba(55, 50, 250, 0.4)',
diff --git a/website/public/static/demo/vue-cesium/example/control/draw.htm b/website/public/static/demo/vue-cesium/example/control/draw.htm
@@ -35,8 +35,6 @@
     <body>
         <div id="app">
             <mapgis-web-scene
-                :animation="false"
-                :timeline="false"
                 v-on:load="handleLoad"
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
@@ -51,7 +49,7 @@
                     </div>
                 </mapgis-3d-draw>
                 <mapgis-3d-raster-layer :base-url="baseUrl"></mapgis-3d-raster-layer>
-            </mapgis-web-globe>
+            </mapgis-web-scene>
         </div>
         <script>
             new Vue({
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-ogc/reversebbox.htm b/website/public/static/demo/vue-mapboxgl/example/vue-ogc/reversebbox.htm
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-        <title>Vue-测量</title>
+        <title>Vue-reversebbox</title>
         <!--引入第三方的jquery脚本库-->
         <script include="vue" exclude="plugin" src="./static/libs/include-mapboxgl-local.js"></script>
         <style type="text/css">
@@ -76,7 +76,6 @@
                 el: '#app',
                 data() {
                     return {
-                        accessToken: 'pk.eyJ1IjoicGFybmRlZWRsaXQiLCJhIjoiY2o1MjBtYTRuMDhpaTMzbXhpdjd3YzhjdCJ9.sCoubaHF9-nhGTA-sgz0sA', // 使用mapbox样式需要的秘钥
                         mapStyle: {
                             //设置版本号，一定要设置
                             version: 8,
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-ogc/wmts-arcgis.htm b/website/public/static/demo/vue-mapboxgl/example/vue-ogc/wmts-arcgis.htm
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-        <title>Vue-测量</title>
+        <title>Vue-arcgis</title>
         <!--引入第三方的jquery脚本库-->
         <script include="vue" exclude="plugin" src="./static/libs/include-mapboxgl-local.js"></script>
         <style type="text/css">
@@ -47,27 +47,28 @@
         <div id="app">
             <mapgis-web-map
                 id="map"
-                v-bind:access-token="accessToken"
                 v-bind:map-style="mapStyle"
                 v-bind:zoom="mapZoom"
                 v-bind:center="outerCenter"
                 v-bind:crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-igs-tdt-layer
-                    v-bind:layer="layer"
-                    v-bind:layer-id="layerId"
-                    v-bind:source-id="sourceId"
-                    v-bind:baseURL="baseURL"
-                    v-bind:token="token"
-                >
-                </mapgis-igs-tdt-layer>
-                <mapgis-ogc-wmts-layer 
+                <mapgis-ogc-wmts-layer
+                   v-bind:layer-id="layerTdtId"
+                   v-bind:source-id="sourceTdtId"
+                   v-bind:base-url="tdturl"
+                   v-bind:tile-matrix-set="tileMatrixSetTdt"
+                   v-bind:wmts-layer="layer"
+                   v-bind:format="format"
+                   v-bind:token="token">
+                </mapgis-ogc-wmts-layer>
+                <mapgis-ogc-wmts-layer
                     v-bind:wmts-layer="layerWmts"
                     v-bind:layer-id="layerWmtsId" 
                     v-bind:source-id="sourceWmtsId" 
                     v-bind:base-url="wmtsurl"
                     v-bind:zoom-offset="offset"
+                    v-bind:tile-matrix-set="tileMatrixSet"
                 >
                 </mapgis-ogc-wmts-layer>
             </mapgis-web-map>
@@ -77,7 +78,6 @@
                 el: '#app',
                 data() {
                     return {
-                        accessToken: 'pk.eyJ1IjoicGFybmRlZWRsaXQiLCJhIjoiY2o1MjBtYTRuMDhpaTMzbXhpdjd3YzhjdCJ9.sCoubaHF9-nhGTA-sgz0sA', // 使用mapbox样式需要的秘钥
                         mapStyle: {
                             //设置版本号，一定要设置
                             version: 8,
@@ -90,16 +90,20 @@
                         outerCenter: [116.39, 40.20], // 地图显示中心
                         mapCrs: 'EPSG:4326',
 
-                        layerId: 'igsLayer_layerId',
-                        sourceId: 'igsLayer_sourceId',
-                        layer: {}, // 图层配置信息
-                        baseURL: 'http://t2.tianditu.gov.cn/vec_c/wmts', // 请求基地址
-                        token: '2ddaabf906d4b5418aed0078e1657029', // 请求天地图的key值
+                        layerTdtId: 'igsLayer_layerId',
+                        sourceTdtId: 'igsLayer_sourceId',
+                        layerTdt: {}, // 图层配置信息
+                        tdturl: 'http://t0.tianditu.gov.cn/vec_c/wmts',
+                        layer:"vec",
+                        tileMatrixSetTdt:"c",
+                        format:"tiles",
+                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerWmts: '0,2,4,6,8,10',
+                        layerWmts: '10wanZH',
                         layerWmtsId: 'ogcwmts_layerId',
                         sourceWmtsId: 'ogcwmts_sourceId',
-                        wmtsurl: 'http://219.142.81.85/arcgis/rest/services/10wanZH/MapServer',
+                        wmtsurl: 'http://219.142.81.85/arcgis/rest/services/10wanZH/MapServer/WMTS',
+                        tileMatrixSet:"default",
                         offset: -1,  //这里一定不能去掉
                     };
                 },
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-ogc/wmts.htm b/website/public/static/demo/vue-mapboxgl/example/vue-ogc/wmts.htm
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-        <title>Vue-测量</title>
+        <title>Vue-wmts</title>
         <!--引入第三方的jquery脚本库-->
         <script include="vue" exclude="plugin" src="./static/libs/include-mapboxgl-local.js"></script>
         <style type="text/css">
@@ -47,22 +47,12 @@
         <div id="app">
             <mapgis-web-map
                 id="map"
-                :access-token="accessToken"
                 :map-style="mapStyle"
                 :zoom="mapZoom"
                 :center="outerCenter"
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer
-                :layer-id="layerTdtId"
-                :source-id="sourceTdtId"
-                :base-url="tdturl"
-                :tile-matrix-set="tileMatrixSet"
-                :wmts-layer="layer"
-                :format="format"
-                :token="token">
-                </mapgis-ogc-wmts-layer>
                 <mapgis-ogc-wmts-layer
                 :wmts-layer="layerArcGis"
                 :layer-id="layerWmtsId"
@@ -77,7 +67,6 @@
                 el: '#app',
                 data() {
                     return {
-                        accessToken: 'pk.eyJ1IjoicGFybmRlZWRsaXQiLCJhIjoiY2o1MjBtYTRuMDhpaTMzbXhpdjd3YzhjdCJ9.sCoubaHF9-nhGTA-sgz0sA', // 使用mapbox样式需要的秘钥
                         mapStyle: {
                             //设置版本号，一定要设置
                             version: 8,
@@ -90,15 +79,6 @@
                         outerCenter: [116.39, 40.2], // 地图显示中心
                         mapCrs: 'EPSG:3857',
 
-                        layerTdtId: 'igsLayer_layerId',
-                        sourceTdtId: 'igsLayer_sourceId',
-                        layerTdt: {}, // 图层配置信息
-                        tdturl: 'http://t0.tianditu.gov.cn/vec_w/wmts',
-                        layer:"vec",
-                        tileMatrixSet:"w",
-                        format:"tiles",
-                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
-
                         layerWmtsId: 'ogcwmts_layerId',
                         sourceWmtsId: 'ogcwmts_sourceId',
 
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/circle.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/circle.htm
@@ -29,10 +29,26 @@
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
-                <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
+                <mapgis-ogc-wmts-layer
+                    :layer-id="layerWmtsId"
+                    :source-id="sourceWmtsId"
+                    :base-url="wmtsurl"
+                    :tile-matrix-set="tileMatrixSet"
+                    :wmts-layer="layer"
+                    :format="format"
+                    :token="token">
+                </mapgis-ogc-wmts-layer>
+                <mapgis-vector-layer
+                    :layer="layerVector"
+                    :layer-id="layerVectorId"
+                    :source="sourceVector"
+                    :source-id="sourceVectorId">
                 </mapgis-vector-layer>
-                <mapgis-vector-layer :layer="layerSymbol" :layer-id="layerSymbolId" :source="sourceSymbol" :source-id="sourceSymbolId">
+                <mapgis-vector-layer
+                     :layer="layerSymbol"
+                     :layer-id="layerSymbolId"
+                     :source="sourceSymbol"
+                     :source-id="sourceSymbolId">
                 </mapgis-vector-layer>
             </mapgis-web-map>
         </div>
@@ -82,7 +98,11 @@
 
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
-                        wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
+                        wmtsurl: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                        layer:"img",
+                        tileMatrixSet:"c",
+                        format:"tiles",
+                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
                         sourceVectorId: 'vector_source_id',
                         layerVectorId: 'vector_layer_id',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill-extrusion.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill-extrusion.htm
@@ -31,8 +31,20 @@
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
-                <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
+                <mapgis-ogc-wmts-layer
+                   :layer-id="layerWmtsId"
+                   :source-id="sourceWmtsId"
+                   :base-url="wmtsurl"
+                   :tile-matrix-set="tileMatrixSet"
+                   :wmts-layer="layer"
+                   :format="format"
+                   :token="token">
+                </mapgis-ogc-wmts-layer>
+                <mapgis-vector-layer
+                    :layer="layerVector"
+                    :layer-id="layerVectorId"
+                    :source="sourceVector"
+                    :source-id="sourceVectorId">
                 </mapgis-vector-layer>
             </mapgis-web-map>
         </div>
@@ -168,7 +180,11 @@
 
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
-                        wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
+                        wmtsurl: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                        layer:"img",
+                        tileMatrixSet:"c",
+                        format:"tiles",
+                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
                         sourceVectorId: 'vector_source_id',
                         layerVectorId: 'vector_layer_id',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill.htm
@@ -29,8 +29,20 @@
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
-                <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
+                <mapgis-ogc-wmts-layer
+                   :layer-id="layerWmtsId"
+                   :source-id="sourceWmtsId"
+                   :base-url="wmtsurl"
+                   :tile-matrix-set="tileMatrixSet"
+                   :wmts-layer="layer"
+                   :format="format"
+                   :token="token">
+                </mapgis-ogc-wmts-layer>
+                <mapgis-vector-layer
+                   :layer="layerVector"
+                   :layer-id="layerVectorId"
+                   :source="sourceVector"
+                   :source-id="sourceVectorId">
                 </mapgis-vector-layer>
             </mapgis-web-map>
         </div>
@@ -161,7 +173,11 @@
 
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
-                        wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
+                        wmtsurl: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                        layer:"img",
+                        tileMatrixSet:"c",
+                        format:"tiles",
+                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
                         sourceVectorId: 'vector_source_id',
                         layerVectorId: 'vector_layer_id',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/line.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/line.htm
@@ -29,8 +29,20 @@
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
-                <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
+                <mapgis-ogc-wmts-layer
+                   :layer-id="layerWmtsId"
+                   :source-id="sourceWmtsId"
+                   :base-url="wmtsurl"
+                   :tile-matrix-set="tileMatrixSet"
+                   :wmts-layer="layer"
+                   :format="format"
+                   :token="token">
+                </mapgis-ogc-wmts-layer>
+                <mapgis-vector-layer
+                   :layer="layerVector"
+                   :layer-id="layerVectorId"
+                   :source="sourceVector"
+                   :source-id="sourceVectorId">
                 </mapgis-vector-layer>
             </mapgis-web-map>
         </div>
@@ -118,7 +130,11 @@
 
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
-                        wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
+                        wmtsurl: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                        layer:"img",
+                        tileMatrixSet:"c",
+                        format:"tiles",
+                        token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
                         sourceVectorId: 'vector_source_id',
                         layerVectorId: 'vector_layer_id',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/symbol.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/symbol.htm

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@`
`51`	`51`
`52`	`52`	`function updateView() {`
`53`	`53`	`$.get('../../static/data/echartsgl/lines/lines.geojson', function (data) {`
	`54`	`+ data = JSON.parse(data);`
`54`	`55`	`function getAirportCoord(idx) {`
`55`	`56`	`return [data.airports[idx][3], data.airports[idx][4]];`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@`
`59`	`59`	`]`
`60`	`60`	`var layer;`
`61`	`61`	`$.get('../../static/data/echarts/weibo.geojson', function (weiboData) {`
	`62`	`+ weiboData = JSON.parse(weiboData);`
`62`	`63`	`weiboData = weiboData.map(function (serieData, idx) {`
`63`	`64`	`var px = serieData[0] / 1000;`
`64`	`65`	`var py = serieData[1] / 1000;`