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

zhurc · zhurc · commit f7ad7985ba87 · 2017-02-27T15:58:04.000+08:00
diff --git a/build/deps.js b/build/deps.js
@@ -170,7 +170,7 @@ var deps = {
             "Map": {
                 "name": "地图服务",
                 "src": [
-                    "./src/OL3/SuperMap/iServer/TiledMap.js",
+                    "./src/OL3/SuperMap/iServer/Tile.js",
                     "./src/OL3/SuperMap/iServer/MapService.js",
                     "./src/OL3/SuperMap/iServer/QueryService.js",
                     "./src/OL3/SuperMap/iServer/ChartQueryService.js",
diff --git a/examples/ol3/01_layerService.html b/examples/ol3/01_layerService.html
@@ -88,7 +88,7 @@
                 overlays: [overlay],
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_mapQueryByBounds.html b/examples/ol3/01_mapQueryByBounds.html
@@ -33,7 +33,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_mapQueryByDistance.html b/examples/ol3/01_mapQueryByDistance.html
@@ -33,7 +33,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_mapQueryByGeometry.html b/examples/ol3/01_mapQueryByGeometry.html
@@ -33,7 +33,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_mapQueryBySQL.html b/examples/ol3/01_mapQueryBySQL.html
@@ -33,7 +33,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_mapService.html b/examples/ol3/01_mapService.html
@@ -89,7 +89,7 @@
                 overlays: [overlay],
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_measure.html b/examples/ol3/01_measure.html
@@ -35,7 +35,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_tiledMapLayer3857.html b/examples/ol3/01_tiledMapLayer3857.html
@@ -36,7 +36,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_tiledMapLayer4326.html b/examples/ol3/01_tiledMapLayer4326.html
@@ -34,7 +34,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: url,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/01_tiledMapLayerNoProj.html b/examples/ol3/01_tiledMapLayerNoProj.html
@@ -0,0 +1,41 @@
+<!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-changchun/rest/maps/长春市区图";
+        var extent = [48.4, -7668.25, 8958.85, -55.58];
+        var projection = new ol.proj.Projection({
+            extent: extent,
+            units: 'm'
+        });
+        function init() {
+            var mapService = new ol.supermap.MapService(url);
+            mapService.on("complete", function (serviceResult) {
+                var mapJSONObj = serviceResult.element.result;
+                var map = new ol.Map({
+                    target: 'map',
+                    view: new ol.View({
+                        center: [mapJSONObj.center.x, mapJSONObj.center.y],
+                        zoom: 0,
+                        projection: projection
+                    })
+                });
+                var layer = new ol.layer.Tile({
+                    source: new ol.supermap.Tile(ol.supermap.Tile.optionsFromMapJSON(url, mapJSONObj))
+                });
+                map.addLayer(layer);
+            });
+            mapService.getMapStatus();
+        }
+    </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/01_tiledMapLayerOverlapped .html b/examples/ol3/01_tiledMapLayerOverlapped .html
@@ -0,0 +1,66 @@
+<!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";
+        var url2 = "http://support.supermap.com.cn:8090/iserver/services/map-jingjin/rest/maps/京津地区地图";
+        var extent = [-180.0, -90.0, 180, 90];
+        var extentjj = [114.59, 37.76, 119.51, 42.31];
+        var dpi = 96;
+        var resolutions = [
+            ol.supermap.Util.scaleToResolution(1.6901635716026555E-9, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(3.375595414562003E-9, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(6.751190829124006E-9, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(1.3502381658248012E-8, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(2.7004763316496024E-8, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(5.400952663299205E-8, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(1.080190532659841E-7, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(2.1603810653196843E-7, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(4.320762130639359E-7, dpi, Unit.DEGREE),
+            ol.supermap.Util.scaleToResolution(8.641524261278681E-7, dpi, Unit.DEGREE),
+        ];
+
+        function init() {
+            var map = new ol.Map({
+                target: 'map',
+                view: new ol.View({
+                    center: [116.85, 39.79],
+                    zoom: 6,
+                    projection: 'EPSG:4326'
+                })
+            });
+            var layer = new ol.layer.Tile({
+                source: new ol.supermap.Tile({
+                    url: url,
+                    tileGrid: new ol.tilegrid.TileGrid({
+                        extent: extent,
+                        resolutions: resolutions,
+                    })
+                }),
+                projection: 'EPSG:4326'
+            })
+            map.addLayer(layer);
+            var jjLayer = new ol.layer.Tile({
+                source: new ol.supermap.Tile({
+                    url: url2,
+                    tileGrid: new ol.tilegrid.TileGrid({
+                        extent: extentjj,
+                        resolutions: resolutions,
+                    })
+                }),
+                projection: 'EPSG:4326'
+            })
+            map.addLayer(jjLayer);
+        }
+    </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/02_editFeatures.html b/examples/ol3/02_editFeatures.html
@@ -35,7 +35,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_filedStatistics.html b/examples/ol3/02_filedStatistics.html
@@ -78,7 +78,7 @@
             overlays: [overlay],
         });
         var layer = new ol.layer.Tile({
-            source: new ol.supermap.TiledMap({
+            source: new ol.supermap.Tile({
                 url: mapURL,
                 tileGrid: new ol.tilegrid.TileGrid({
                     extent: extent,
diff --git a/examples/ol3/02_filedsService.html b/examples/ol3/02_filedsService.html
@@ -89,7 +89,7 @@
                 overlays: [overlay],
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getFeatureByBounds.html b/examples/ol3/02_getFeatureByBounds.html
@@ -34,7 +34,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getFeatureByBuffer.html b/examples/ol3/02_getFeatureByBuffer.html
@@ -34,7 +34,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getFeatureByGeometry.html b/examples/ol3/02_getFeatureByGeometry.html
@@ -33,7 +33,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getFeatureByIDs.html b/examples/ol3/02_getFeatureByIDs.html
@@ -34,7 +34,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getFeatureBySQL.html b/examples/ol3/02_getFeatureBySQL.html
@@ -34,7 +34,7 @@
                 })
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/02_getGridCellInfos.html b/examples/ol3/02_getGridCellInfos.html
@@ -88,7 +88,7 @@
                 overlays: [overlay]
             });
             var layer = new ol.layer.Tile({
-                source: new ol.supermap.TiledMap({
+                source: new ol.supermap.Tile({
                     url: baseUrl,
                     tileGrid: new ol.tilegrid.TileGrid({
                         extent: extent,
diff --git a/examples/ol3/examples.html b/examples/ol3/examples.html
@@ -54,6 +54,8 @@ <h3>Openlayers3范例分类</h3>
                             <ul class='nav nav-pills'>
                                 <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>
+                                <li><a href='javascript:void(0)' target='_self' data-name='01_tiledMapLayerNoProj'>iServer平面坐标系地图</a></li>
+                                <li><a href='javascript:void(0)' target='_self' data-name='01_tiledMapLayerOverlapped '>iServer图层叠加</a></li>
                             </ul>
                         </div>
                     </div>
diff --git a/src/OL3/SuperMap/iServer/Tile.js b/src/OL3/SuperMap/iServer/Tile.js
diff --git a/src/OL3/SuperMap/iServer/TiledMap.js b/src/OL3/SuperMap/iServer/TiledMap.js
