Merge branch 'master' of https://git.oschina.net/isupermap/iClient9

zhurc · zhurc · commit b953a88dbb1c · 2017-02-24T18:52:32.000+08:00
diff --git a/build/deps.js b/build/deps.js
@@ -81,7 +81,7 @@ var deps = {
             "title": "SuperMap",
             "description": "--对接SuperMap服务",
             "Map": {
-                "name": "Map服务",
+                "name": "地图服务",
                 "src": [
                     "./src/Leaflet/SuperMap/iServer/TiledMapLayer.js",
                     "./src/Leaflet/SuperMap/iServer/MapService.js",
@@ -95,7 +95,7 @@ var deps = {
                 ]
             },
             "Data": {
-                "name": "Data服务",
+                "name": "数据服务",
                 "src": [
                     "./src/Leaflet/SuperMap/iServer/FieldStatisticService.js",
                     "./src/Leaflet/SuperMap/iServer/GetFeaturesService.js",
@@ -168,7 +168,7 @@ var deps = {
             "title": "SuperMap",
             "description": "--对接SuperMap服务",
             "Map": {
-                "name": "Map服务",
+                "name": "地图服务",
                 "src": [
                     "./src/OL3/SuperMap/iServer/TiledMapLayer.js",
                     "./src/OL3/SuperMap/iServer/MapService.js",
@@ -182,7 +182,7 @@ var deps = {
                 ]
             },
             "Data": {
-                "name": "Data服务",
+                "name": "数据服务",
                 "src": [
                     "./src/OL3/SuperMap/iServer/FieldStatisticService.js",
                     "./src/OL3/SuperMap/iServer/GetFeaturesService.js",
diff --git a/examples/ol3/01_measure.html b/examples/ol3/01_measure.html
@@ -39,7 +39,7 @@
                         if (MapBrowserPointerEvent) {
                             var measureService = new ol.supermap.MeasureService(url, {measureMode: ""});
                             measureService.on("complete", function (serviceResult) {
-                                alert(serviceResult.element.result.distance);
+                                alert(serviceResult.element.result.distance + "米");
                             });
                             var line = new ol.geom.LineString();
                             var points = MapBrowserPointerEvent.frameState.pixelToCoordinateTransform;
@@ -61,7 +61,7 @@
                         if (MapBrowserPointerEvent) {
                             var measureService = new ol.supermap.MeasureService(url, {measureMode: ""});
                             measureService.on("complete", function (serviceResult) {
-                                alert(serviceResult.element.result.area);
+                                alert(serviceResult.element.result.area + "平方米");
                             });
                             var points = MapBrowserPointerEvent.frameState.pixelToCoordinateTransform;
                             var polygonCoords = [];
diff --git a/examples/ol3/01_tiledMapLayer3857.html b/examples/ol3/01_tiledMapLayer3857.html
@@ -8,7 +8,7 @@
     <script type="text/javascript" src="https://openlayers.org/en/v4.0.1/build/ol-debug.js"></script>
     <script type="text/javascript" src="../../dist/SuperMapiClient9 for OL3.js"></script>
     <script type="text/javascript">
-        var map, url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
+        var map, url = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China";
         function init() {
             var map = new ol.Map({
                 target: 'map',
diff --git a/examples/ol3/01_tiledMapLayer4326.html b/examples/ol3/01_tiledMapLayer4326.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>SuperMap REST 地图服务底图</title>
+    <link rel="stylesheet" href="../css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://openlayers.org/en/v4.0.1/css/ol.css">
+    <script type="text/javascript" src="https://openlayers.org/en/v4.0.1/build/ol-debug.js"></script>
+    <script type="text/javascript" src="../../dist/SuperMapiClient9 for OL3.js"></script>
+    <script type="text/javascript">
+        var map, url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
+        function init() {
+            var map = new ol.Map({
+                target: 'map',
+                view: new ol.View({
+                    center: [0, 0],
+                    zoom: 2,
+                    projection: 'EPSG:4326'
+                })
+            });
+            map.addLayer(new ol.supermap.TiledMapLayer(url, {"pro": "4326"}));
+        }
+    </script>
+</head>
+<body onload="init()" style=" margin: 0;overflow: hidden;background: #fff;">
+<div id="map" style="margin:0 auto;position: relative; height: 510px;border: 1px solid #3473b7;"></div>
+</body>
+</html>
diff --git a/examples/ol3/examples.html b/examples/ol3/examples.html
@@ -52,7 +52,8 @@ <h3>Openlayers3范例分类</h3>
                         </div>
                         <div class="span10">
                             <ul class='nav nav-pills'>
-                                <li><a href='javascript:void(0)' target='_self' data-name='01_tiledMapLayer'>iServer4326地图</a></li>
+                                <li><a href='javascript:void(0)' target='_self' data-name='01_tiledMapLayer4326'>iServer4326地图</a></li>
+                                <li><a href='javascript:void(0)' target='_self' data-name='01_tiledMapLayer3857'>iServer3857地图</a></li>
                             </ul>
                         </div>
                     </div>
