Merge branch 'dev'

Author: 潘卓然ParnDeedlit

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

@@ -42,7 +42,7 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <mapgis-3d-rastertile-layer v-bind:url="url"> </mapgis-3d-rastertile-layer>
+                <mapgis-3d-raster-layer v-bind:url="url"> </mapgis-3d-raster-layer>
                 <mapgis-3d-draw ref="drawref" v-on:load="handleDrawLoad" v-on:drawcreate="handleCreate">
                     <div id="toolbar-wrapper">
                         <div class="toolbar-item" v-on:click="togglePoint">画点</div>

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

@@ -59,7 +59,7 @@
                     lib-path="./static/libs/cdn/cesium/Cesium.js"
                     plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
                 >
-                    <mapgis-3d-rastertile-layer v-bind:url="url1"> </mapgis-3d-rastertile-layer>
+                    <mapgis-3d-raster-layer v-bind:url="url1"> </mapgis-3d-raster-layer>
                     <mapgis-3d-link v-bind:enable="link"></mapgis-3d-link>
                 </mapgis-web-scene>
             </div>
@@ -72,7 +72,7 @@
                     libPath="./static/libs/cdn/cesium/Cesium.js"
                     pluginPath="./static/libs/cdn/cesium/webclient-cesium-plugin.js"
                 >
-                    <mapgis-3d-rastertile-layer v-bind:url="url2"> </mapgis-3d-rastertile-layer>
+                    <mapgis-3d-raster-layer v-bind:url="url2"> </mapgis-3d-raster-layer>
                     <mapgis-3d-link v-bind:enable="link"></mapgis-3d-link>
                 </mapgis-web-scene>
             </div>
@@ -85,7 +85,7 @@
                     libPath="./static/libs/cdn/cesium/Cesium.js"
                     pluginPath="./static/libs/cdn/cesium/webclient-cesium-plugin.js"
                 >
-                    <mapgis-3d-rastertile-layer v-bind:url="url3"> </mapgis-3d-rastertile-layer>
+                    <mapgis-3d-raster-layer v-bind:url="url3"> </mapgis-3d-raster-layer>
                 </mapgis-web-scene>
             </div>
             <div class="item bottom-right">

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

@@ -23,7 +23,7 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <mapgis-3d-rastertile-layer :url="url" />
+                <mapgis-3d-raster-layer :url="url" />
                 <mapgis-3d-statebar />
             </mapgis-web-scene>
         </div>

website/public/static/demo/vue-cesium/example/model/igsm3d.htm

@@ -23,7 +23,7 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <cesium-igs-m3d v-bind:url="url"> </cesium-igs-m3d>
+                <mapgis-3d-igs-m3d v-bind:url="url"> </mapgis-3d-igs-m3d>
                 <mapgis-3d-ogc-wmts-layer v-bind:url="tiandidu" v-bind:options="tiandiduoptions"></mapgis-3d-ogc-wmts-layer>
             </mapgis-web-scene>
         </div>

website/public/static/demo/vue-cesium/example/model/tileset.htm

@@ -23,7 +23,7 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <cesium-3d-tileset v-bind:url="url"> </cesium-3d-tileset>
+                <mapgis-3d-tileset v-bind:url="url"> </mapgis-3d-tileset>
                 <mapgis-3d-ogc-wmts-layer v-bind:url="tiandidu" v-bind:options="tiandiduoptions"></mapgis-3d-ogc-wmts-layer>
             </mapgis-web-scene>
         </div>

website/public/static/demo/vue-cesium/example/raster/document.htm

@@ -23,13 +23,13 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <cesium-igs-doc-layer
+                <mapgis-3d-igs-doc-layer
                     v-bind:ip="ip" 
                     v-bind:port="port" 
                     v-bind:protocol="protocol" 
                     v-bind:server-name="serverName"
                 >
-                </cesium-igs-doc-layer>
+                </mapgis-3d-igs-doc-layer>
             </mapgis-web-scene >
         </div>
         <script>

website/public/static/demo/vue-cesium/example/raster/raster.htm

@@ -23,7 +23,7 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <mapgis-3d-rastertile-layer v-bind:url="url"> </mapgis-3d-rastertile-layer>
+                <mapgis-3d-raster-layer v-bind:url="url"> </mapgis-3d-raster-layer>
             </mapgis-web-scene>
         </div>
         <script>

website/public/static/demo/vue-cesium/example/raster/tile.htm

@@ -23,13 +23,13 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <cesium-igs-tile-layer
+                <mapgis-3d-igs-tile-layer
                     v-bind:ip="ip" 
                     v-bind:port="port" 
                     v-bind:protocol="protocol" 
                     v-bind:server-name="serverName"
                 >
-                </cesium-igs-tile-layer>
+                </mapgis-3d-igs-tile-layer>
             </mapgis-web-scene>
         </div>
         <script>

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

@@ -21,7 +21,7 @@
 
   <body>
     <div id="app">
-      <mapbox-map
+      <mapgis-web-map
         id="map"
         :access-token="accessToken"
         :map-style="mapStyle"
@@ -30,17 +30,17 @@
         :crs="mapCrs"
         v-on:load="handleMapLoad"
         >
-        <mapbox-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl">
-        </mapbox-ogc-wmts-layer>
-        <mapbox-raster-layer
+        <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl">
+        </mapgis-ogc-wmts-layer>
+        <mapgis-rastertile-layer
           :layer="layerRaster"
           :layer-id="layerRasterId"
           :source="sourceRaster"
           :source-id="sourceRasterId"
           >
-        </mapbox-raster-layer>
-        <mapbox-attribution-control :position="position" :compact="compact" :custom-attribution="attrbution"/>
-      </mapbox-map>
+        </mapgis-rastertile-layer>
+        <mapgis-attribution :position="position" :compact="compact" :custom-attribution="attrbution"/>
+      </mapgis-web-map>
     </div>
     <script>
       new Vue({

website/public/static/demo/vue-mapboxgl/example/vue-control/compare-hori.htm

@@ -39,7 +39,7 @@
 
     <body>
         <div id="app">
-            <mapbox-map
+            <mapgis-web-map
                 id="left"
                 class="map"
                 ref="leftmap"
@@ -49,12 +49,12 @@
                 :crs="mapCrs"
                 v-on:load="handleLeftMapLoad"
             >
-                <mapbox-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl1"> </mapbox-ogc-wmts-layer>
-                <mapbox-compare ref="compare">
+                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl1"> </mapgis-ogc-wmts-layer>
+                <mapgis-compare ref="compare">
                     <div class="custom-compare-toolbar" v-on:click="handleEnable">卷帘</div>
-                </mapbox-compare>
-            </mapbox-map>
-            <mapbox-map
+                </mapgis-compare>
+            </mapgis-web-map>
+            <mapgis-web-map
                 id="right"
                 class="map"
                 :map-style="mapStyle"
@@ -63,8 +63,8 @@
                 :crs="mapCrs"
                 v-on:load="handleRightMapLoad"
             >
-                <mapbox-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl2"> </mapbox-ogc-wmts-layer>
-            </mapbox-map>
+                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl2"> </mapgis-ogc-wmts-layer>
+            </mapgis-web-map>
         </div>
         <script>
             var leftMap, rightMap;