修复一些例子的本地地址 初始化级别 名字不合理的问题

songyumeng · songyumeng · commit 9838db395d83 · 2018-03-13T14:53:18.000+08:00
diff --git a/dist/include-classic.js b/dist/include-classic.js
@@ -129,5 +129,5 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : 'http://' + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
 })();
diff --git a/dist/include-leaflet.js b/dist/include-leaflet.js
@@ -100,5 +100,5 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : 'http://' + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
 })();
diff --git a/dist/include-mapboxgl.js b/dist/include-mapboxgl.js
@@ -73,5 +73,5 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : 'http://' + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
 })();
diff --git a/dist/include-openlayers.js b/dist/include-openlayers.js
@@ -37,7 +37,7 @@
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
         if (!inArray(excludes, 'ol')) {
             inputCSS("https://cdn.bootcss.com/openlayers/4.6.4/ol.css");
-            inputScript("https://cdn.bootcss.com/openlayers/4.6.4/ol.js");
+            inputScript("https://cdn.bootcss.com/openlayers/4.6.4/ol-debug.js");
         }
         if (inArray(includes, 'mapv')) {
             inputScript("http://mapv.baidu.com/build/mapv.min.js");
@@ -46,7 +46,7 @@
             inputScript("https://cdn.bootcss.com/Turf.js/4.6.1/turf.min.js");
         }
         if (!inArray(excludes, 'iclient9-openlayers')) {
-            inputScript("../../dist/iclient9-openlayers.min.js");
+            inputScript("../../dist/iclient9-openlayers.js");
         }
         if (!inArray(excludes, 'iclient9-openlayers-css')) {
             inputCSS("../../dist/iclient9-openlayers.min.css");
@@ -69,5 +69,5 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : 'http://' + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
 })();
diff --git a/examples/js/include-web.js b/examples/js/include-web.js
@@ -149,6 +149,6 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : 'http://' + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
     window.version = "9.0.1";
 })();
diff --git a/examples/leaflet/12_graphicLayerClover.html b/examples/leaflet/12_graphicLayerClover.html
@@ -16,7 +16,7 @@
         crs: L.CRS.EPSG4326,
         center: {lon: 0, lat: 0},
         maxZoom: 18,
-        zoom: 1
+        zoom: 6
     });
 
 
diff --git a/examples/leaflet/config.js b/examples/leaflet/config.js
@@ -530,18 +530,18 @@ var exampleConfig = {
                 name: "热力图",
                 name_en: "heat map",
                 content: [{
-                    name: "热力图-随机点",
-                    name_en: "heat map - random points",
+                    name: "随机点",
+                    name_en: "random points",
                     thumbnail: "l_heat.png",
                     fileName: "12_heatMap"
                 }, {
-                    name: "热力图-纽约出租车上车点",
-                    name_en: "heat map - NY taxi car point",
+                    name: "纽约出租车上车点",
+                    name_en: "NY taxi car point",
                     thumbnail: "l_heatmap_nyc.png",
                     fileName: "12_heatMap_NY"
                 },{
-                    name: "随机点热点图",
-                    name_en: "random points",
+                    name: "随机点(Classic)",
+                    name_en: "random points (Classic)",
                     thumbnail: "l_heatMapLayer.png",
                     fileName: "heatMapLayer"
                 }]
@@ -1010,7 +1010,7 @@ var exampleConfig = {
                 }]
             }
         }
-    },
+    }
 
 };
 
diff --git a/examples/leaflet/turf_measurement.html b/examples/leaflet/turf_measurement.html
@@ -11,7 +11,7 @@
 <script type="text/javascript" include="turf,leaflet.draw" src="../../dist/include-leaflet.js"></script>
 
 <script type="text/javascript">
-    var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://support.supermap.com.cn:8090",
+    var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090",
         url = host + "/iserver/services/map-jingjin/rest/maps/京津地区地图",
         turfLayer, resultLayer, urlWorld,
         totalLat = 0, totalLng = 0, averageLat, averageLng, distance, geo, coordinate,
diff --git a/examples/locales/en-US/resources.js b/examples/locales/en-US/resources.js
@@ -373,12 +373,12 @@ window.resources = {
         "title_tiledMapLayerNonEarth": "Planar coordinate base map of SuperMap REST",
         "title_tiledMapLayerProj4": "Custom Scale Map",
         "title_interpolationAnalystServiceKriging": "Spatial Analysis -  Kriging Interpolation Analysis",
-        "title_interpolationAnalystServiceKrigingUniversal": "Spatial Analysis -Universal Kriging Interpolation Analysis",
-        "title_findMTSPPathsServiceLogistics": "Multi-traveler Analysis (Logistics Distribution)",
-        "title_findTSPPathsService": "Multi-traveler Analysis (Quality Inspection)",
-        "title_graphicLayer":"High efficiency point layer(points of 180K NY taxis)",
-        "title_graphicLayerClovers":"High efficiency point layer(clover)",
-        "title_graphicLayerTaxi":"High efficiency point layer(picture drawing of 180K NY taxis)",
+        "title_interpolationAnalystServiceKrigingUniversal": "Spatial Analysis - Universal Kriging Interpolation Analysis",
+        "title_findMTSPPathsServiceLogistics": "Multi-traveler Analysis - Logistics Distribution ",
+        "title_findTSPPathsService": "Multi-traveler Analysis - Quality Inspection",
+        "title_graphicLayer":"High efficiency point layer - points of 180K NY taxis",
+        "title_graphicLayerClovers":"High efficiency point layer - clover",
+        "title_graphicLayerTaxi":"High efficiency point layer - picture drawing of 180K NY taxis",
         "title_heatMap": "Heat map",
         "title_heatMapNY": "Heat map of New York Taxis",
         "title_markerCluster": "Marker Cluster",
@@ -1339,6 +1339,6 @@ window.resources = {
         "style_width420px": 'width: 500px',
         "style_width350px": 'width: 400px',
         "style_heatMapWidth": "width: 340px",
-        "style_plotAnimation": "width: 170px; height: 35px; margin-bottom: 0; border-bottom-right-radius: 4px; border-top-right-radius: 4px;",
+        "style_plotAnimation": "width: 170px; height: 35px; margin-bottom: 0; border-bottom-right-radius: 4px; border-top-right-radius: 4px;"
     }
 };
diff --git a/examples/locales/zh-CN/resources.js b/examples/locales/zh-CN/resources.js
@@ -376,9 +376,9 @@ window.resources = {
         "title_interpolationAnalystServiceKrigingUniversal":"空间分析-泛克吕金插值分析",
         "title_findMTSPPathsServiceLogistics":"网络分析服务-多旅行商分析(物流配送)",
         "title_findTSPPathsService":"网络分析服务-多旅行商分析(质检巡查)",
-        "title_graphicLayer":"高效率点图层(18万纽约出租车点)",
-        "title_graphicLayerClovers":"高效率点图层(三叶草)",
-        "title_graphicLayerTaxi":"高效率点图层(18万纽约出租车图片绘制)",
+        "title_graphicLayer":"高效率点图层-18万纽约出租车点",
+        "title_graphicLayerClovers":"高效率点图层-三叶草",
+        "title_graphicLayerTaxi":"高效率点图层-18万纽约出租车图片绘制",
         "title_heatMap":"热力图",
         "title_heatMapNY":"纽约出租车上车点热力图",
         "title_markerCluster":"点聚合",
diff --git a/examples/mapboxgl/config.js b/examples/mapboxgl/config.js
@@ -296,7 +296,7 @@ var exampleConfig = {
                 name: "热力图",
                 name_en: "heat map",
                 content: [{
-                    name: "随机点热点图",
+                    name: "随机点",
                     name_en: "random points",
                     thumbnail: "mb_heatMapLayer.png",
                     fileName: "heatmapLayer"
@@ -307,7 +307,7 @@ var exampleConfig = {
                 name_en: "vector tile",
                 content: [
                     {
-                        name: "China-矢量瓦片",
+                        name: "China",
                         name_en: "China",
                         thumbnail: "mvtVectorTile.png",
                         fileName: "mvtVectorTile"
@@ -542,8 +542,8 @@ var exampleConfig = {
                 name_en: "threejs",
                 content: [
                     {
-                        name: "threejs 3D建筑模型",
-                        name_en: "threejs 3D buildings",
+                        name: "3D建筑模型",
+                        name_en: "3D buildings",
                         thumbnail: "mb_threejs_buildings.png",
                         fileName: "threejsLayer_buildings"
                     }
diff --git a/examples/openlayers/02_editFeatures.html b/examples/openlayers/02_editFeatures.html
@@ -88,7 +88,7 @@ <h5 class='panel-title text-center' data-i18n="resources.text_editSingle"></h5><
 <script type="text/javascript">
     var map, id = [], pointFeature, vectorSource, resultLayer, editFeaturesService, alertDiv,
         addPointsSource, addPointsLayer,
-        host = window.isLocal ? window.server + "//" + document.location.host : "http://support.supermap.com.cn:8090",
+        host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090",
         baseUrl = host + "/iserver/services/map-world/rest/maps/World",
         url = host + "/iserver/services/data-world/rest/data",
         container = document.getElementById('popup'),
diff --git a/examples/openlayers/07_graphiclayer_canvas.html b/examples/openlayers/07_graphiclayer_canvas.html
@@ -52,7 +52,7 @@
     <div id="popup-content"></div>
 </div>
 <script type="text/javascript">
-    var url = (window.isLocal ? document.location.host : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
+    var url = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
 
     var map;
     var colorCount = 10;
diff --git a/examples/openlayers/07_graphiclayer_clover.html b/examples/openlayers/07_graphiclayer_clover.html
@@ -55,7 +55,7 @@
         <div id="popup-content"></div>
     </div>
     <script type="text/javascript">
-        var url = (window.isLocal ? document.location.host : "http://support.supermap.com.cn:8090") +
+        var url = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090") +
             "/iserver/services/map-china400/rest/maps/China_4326";
         //初始化各种参数
         var count = 180000;
@@ -99,7 +99,7 @@
                     .extend([new ol.supermap.control.Logo()]),
                 view: new ol.View({
                     center: [0, 0],
-                    zoom: 3,
+                    zoom: 7,
                     projection: 'EPSG:4326'
                 }),
                 overlays: [overlay],
@@ -125,7 +125,7 @@
                                 color: "rgba(0,166,0,1)",
                             }),
                             fill: new ol.style.Fill({
-                                color: "rgba(0,166,0,1)",
+                                color: "rgba(0,200,0,0.6)",
                             }),
                         })
                     );
diff --git a/examples/openlayers/07_graphiclayer_image.html b/examples/openlayers/07_graphiclayer_image.html
@@ -52,7 +52,7 @@
     <div id="popup-content"></div>
 </div>
 <script type="text/javascript">
-    var url = (window.isLocal ? document.location.host : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
+    var url = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
     var map;
     $.get('../data/nyc_taxi.json', function (nycData) {
         new ol.supermap.MapService(url).getMapInfo(function (serviceResult) {
diff --git a/examples/openlayers/07_graphiclayer_webgl.html b/examples/openlayers/07_graphiclayer_webgl.html
@@ -52,7 +52,7 @@
     <div id="popup-content"></div>
 </div>
 <script type="text/javascript">
-    var url = (window.isLocal ? document.location.host : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
+    var url = (window.isLocal ? window.server : "http://support.supermap.com.cn:8090") + "/iserver/services/map-china400/rest/maps/ChinaDark";
 
     var map;
     var colorCount = 10;
diff --git a/examples/openlayers/config.js b/examples/openlayers/config.js
@@ -489,8 +489,8 @@ var exampleConfig = {
                     thumbnail: "ol_heatmap.png",
                     fileName: "07_HeatMap"
                 },{
-                    name: "随机点热点图",
-                    name_en: "random points",
+                    name: "随机点(Claasic)",
+                    name_en: "random points (Claasic)",
                     thumbnail: "ol_heatMapLayer.png",
                     fileName: "heatMapLayer"
                 }]
diff --git a/src/openlayers/overlay/theme/Theme.js b/src/openlayers/overlay/theme/Theme.js
@@ -559,7 +559,7 @@ export class Theme extends ol.source.ImageCanvas {
             var linearRings = new LinearRing(points);
             geometry = new Polygon([linearRings]);
         }
-        if (geometry.length === 3) {
+        if (geometry && geometry.length === 3) {
             geometry = new GeoText(geometry[0], geometry[1], geometry[2]);
         }
         return new GeometryVector(geometry, attributes);
