Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Yuki-Zhao · Yuki-Zhao · commit 2fc500851bf0 · 2019-06-06T17:00:20.000+08:00
diff --git a/dist/mapboxgl/iclient9-mapboxgl-vue.js b/dist/mapboxgl/iclient9-mapboxgl-vue.js
@@ -38427,7 +38427,7 @@ var LayerModel_LayerModel = function LayerModel() {
   this.minzoom = options.minzoom;
   this.source = options.source;
   this.type = options.type;
-  this.visibility = options.visibility;
+  this.visibility = options.visibility || 'visible';
 };
 
 /* harmony default export */ var web_map_LayerModel = (LayerModel_LayerModel);
diff --git a/dist/mapboxgl/iclient9-mapboxgl-vue.min.js b/dist/mapboxgl/iclient9-mapboxgl-vue.min.js
diff --git a/examples/leaflet/config.js b/examples/leaflet/config.js
@@ -1169,11 +1169,11 @@ var exampleConfig = {
             }
         }
     },
-    "widgets": {
+    "components": {
         name: "组件",
-        name_en: "Widgets",
+        name_en: "Components",
         content: {
-            "widgetsSuperMap": {
+            "componentsSuperMap": {
                 name: "基础",
                 name_en: "Basic",
                 content: [{
@@ -1229,7 +1229,7 @@ var exampleConfig = {
             
             ]
             },
-            "widgetsAdvanced": {
+            "componentsAdvanced": {
                 name: "扩展",
                 name_en: "Advanced",
                 content: [{
@@ -1334,7 +1334,7 @@ var sideBarIconConfig = {
     "plot": "fa-edit",
     "dynamicPlot": "fa-pencil",
     "control": "fa-sliders",
-    "widgets": "fa-window-restore",
+    "components": "fa-window-restore",
     "clientSpatialAnalyst": "fa-object-group",
     "viz": "fa-map",
     "OGC": "fa-globe",
@@ -1355,7 +1355,7 @@ var exampleIconConfig = {
     "plot": "fa-edit",
     "dynamicPlot": "fa-pencil",
     "control": "fa-sliders",
-    "widgets": "fa-window-restore",
+    "components": "fa-window-restore",
     "clientSpatialAnalyst": "fa-object-group",
     "viz": "fa-map",
     "OGC": "fa-globe",
diff --git a/examples/openlayers/01_tiledMapLayerNoProj.html b/examples/openlayers/01_tiledMapLayerNoProj.html
@@ -15,6 +15,7 @@
     var url = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/map-changchun/rest/maps/长春市区图";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm',
         getPointResolution:function(resolution, point){
diff --git a/examples/openlayers/04_bufferAnalystService.html b/examples/openlayers/04_bufferAnalystService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_bufferAnalystService_geometry.html b/examples/openlayers/04_bufferAnalystService_geometry.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_densityKernelAnalystService.html b/examples/openlayers/04_densityKernelAnalystService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_generateSpatialDataService.html b/examples/openlayers/04_generateSpatialDataService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_Density.html b/examples/openlayers/04_interpolationAnalystService_Density.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_IDW_dataset.html b/examples/openlayers/04_interpolationAnalystService_IDW_dataset.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_IDW_geometry.html b/examples/openlayers/04_interpolationAnalystService_IDW_geometry.html
@@ -19,6 +19,7 @@
     var mapService = new ol.supermap.MapService(baseUrl);
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_Kriging.html b/examples/openlayers/04_interpolationAnalystService_Kriging.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_KrigingUniversal.html b/examples/openlayers/04_interpolationAnalystService_KrigingUniversal.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_interpolationAnalystService_RBF.html b/examples/openlayers/04_interpolationAnalystService_RBF.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_routeCalculateMeasureService.html b/examples/openlayers/04_routeCalculateMeasureService.html
@@ -69,6 +69,7 @@
     }));
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_routeLocatorService_line.html b/examples/openlayers/04_routeLocatorService_line.html
@@ -18,6 +18,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_routeLocatorService_point.html b/examples/openlayers/04_routeLocatorService_point.html
@@ -60,6 +60,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_surfaceAnalystService.html b/examples/openlayers/04_surfaceAnalystService.html
@@ -18,6 +18,7 @@
     var mapService = new ol.supermap.MapService(baseUrl);
     var extent = [-2640403.63, 1873792.1, 3247669.39, 5921501.4];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_thiessenAnalystService_datasets.html b/examples/openlayers/04_thiessenAnalystService_datasets.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/04_thiessenAnalystService_geometry.html b/examples/openlayers/04_thiessenAnalystService_geometry.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findClosestFacilitiesService.html b/examples/openlayers/05_findClosestFacilitiesService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findLocationService.html b/examples/openlayers/05_findLocationService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findMTSPPathsService.html b/examples/openlayers/05_findMTSPPathsService.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findPathService.html b/examples/openlayers/05_findPathService.html
@@ -27,6 +27,7 @@
     //最佳路径分析是按照站点添加顺序对站点进行访问的
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findServiceAreas.html b/examples/openlayers/05_findServiceAreas.html
@@ -17,6 +17,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090")+"/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/05_findTSPPathsService.html b/examples/openlayers/05_findTSPPathsService.html
@@ -27,6 +27,7 @@
     //多旅行商分析是无序的路径分析
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/06_trafficTransferAnalystService.html b/examples/openlayers/06_trafficTransferAnalystService.html
@@ -57,6 +57,7 @@
         serviceUrl = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090") + "/iserver/services/traffictransferanalyst-sample/restjsr/traffictransferanalyst/Traffic-Changchun";
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
diff --git a/examples/openlayers/echartsAnimatorCar.html b/examples/openlayers/echartsAnimatorCar.html
@@ -17,6 +17,7 @@
 
     var extent = [48.4, -7668.25, 8958.85, -55.58];
     var projection = new ol.proj.Projection({
+        code:'',
         extent: extent,
         units: 'm'
     });
