1 leaflet 添加交通换乘分析服务 2.修改leaflet iServer底图服务参数

zhurc · zhurc · commit 09847ccb700b · 2017-02-22T09:58:36.000+08:00
diff --git a/build/deps.js b/build/deps.js
@@ -104,6 +104,12 @@ var deps = {
                     "./src/Leaflet/SuperMap/iServer/EditFeaturesService.js",
                     "./src/Leaflet/SuperMap/iServer/GetGridCellInfosService.js"
                 ]
+            },
+            "TrafficTransferAnalyst": {
+                "name": "交通换乘分析服务",
+                "src": [
+                    "./src/Leaflet/SuperMap/iServer/TrafficTransferAnalystService.js"
+                ]
             }
         },
         "Visual": {
diff --git a/examples/leaflet/01_layerService.html b/examples/leaflet/01_layerService.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
         }
 
         function layerService() {
diff --git a/examples/leaflet/01_mapQueryByBounds.html b/examples/leaflet/01_mapQueryByBounds.html
@@ -17,7 +17,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
             polygon = L.polygon([[0, 0], [39, 0], [39, 116], [0, 116], [0, 0]]);
         }
         function query() {
diff --git a/examples/leaflet/01_mapQueryByDistance.html b/examples/leaflet/01_mapQueryByDistance.html
@@ -17,7 +17,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
             circleMarker = L.circleMarker([30, 104]).addTo(map);
         }
         function query() {
diff --git a/examples/leaflet/01_mapQueryByGeometry.html b/examples/leaflet/01_mapQueryByGeometry.html
@@ -17,7 +17,7 @@
                 maxZoom: 18,
                 zoom: 3
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
             polygon = L.polygon([[0, 20], [-30, 20], [-10, 50], [0, 20]], {color: 'red'});
         }
         function query() {
diff --git a/examples/leaflet/01_mapQueryBySQL.html b/examples/leaflet/01_mapQueryBySQL.html
@@ -17,7 +17,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
         }
         function query() {
             clearLayer();
diff --git a/examples/leaflet/01_mapService.html b/examples/leaflet/01_mapService.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
         }
 
         function mapService() {
diff --git a/examples/leaflet/01_measure.html b/examples/leaflet/01_measure.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 3
             });
-            L.supermap.tiledMapLayer(url, {projection: "4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
             resultLayer = L.featureGroup().addTo(map);
         }
 
diff --git a/examples/leaflet/01_tiledMapLayer.html b/examples/leaflet/01_tiledMapLayer.html
@@ -12,11 +12,11 @@
         function init() {
             map = L.map('map', {
                 crs: L.CRS.EPSG4326,
-                center: {lon: 0, lat: 0},
+                center: [0,0],
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(url).addTo(map);
         }
 
     </script>
diff --git a/examples/leaflet/02_editFeatures.html b/examples/leaflet/02_editFeatures.html
@@ -7,7 +7,7 @@
     <script type="text/javascript" src="http://cdn.leafletjs.com/leaflet/v1.0.2/leaflet.js"></script>
     <script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
     <script type="text/javascript">
-        var map, marker, featureGroup, is, resultLayer,
+        var map, marker, featureGroup, id, resultLayer,
                 baseUrl = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World",
                 urlCapital = "http://support.supermap.com.cn:8090/iserver/services/data-world/rest/data/datasources/World/datasets/Capitals",
                 url = "http://support.supermap.com.cn:8090/iserver/services/data-world/rest/data";
@@ -19,9 +19,8 @@
                 maxZoom: 18,
                 zoom: 3
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
             featureGroup = L.featureGroup().addTo(map);
-            marker = L.circleMarker([34, 108], {color: "red"});
             initFeature();
         }
         function initFeature() {
@@ -40,7 +39,13 @@
         }
         function addMarker() {
             if (!featureGroup.hasLayer(marker)) {
+                var xmax = 120, xmin = 100, ymax = 50, ymin = 20;
+                marker = L.circleMarker([
+                    Math.floor(Math.random() * (ymax - ymin + 1) + ymin),
+                    Math.floor(Math.random() * (xmax - xmin + 1) + xmin)
+                ], {color: "red"});
                 featureGroup.addLayer(marker);
+                map.setView(marker.getLatLng());
             } else {
                 alert("请先清除结果");
             }
@@ -69,19 +74,22 @@
             if (!featureGroup.hasLayer(marker)) {
                 return;
             }
-            L.supermap.editFeaturesService(urlCapital).editFeatures({
-                IDs: [id],
-                editType: "delete"
-            }).on("complete", function (serviceResult) {
-                if (serviceResult.result.succeed) {
-                    resultLayer.removeFrom(map);
-                    me.initFeature();
-                } else {
-                    alert("删除失败")
-                }
-            });
+            if (id) {
+                L.supermap.editFeaturesService(urlCapital).editFeatures({
+                    IDs: [id],
+                    editType: "delete"
+                }).on("complete", function (serviceResult) {
+                    if (serviceResult.result.succeed) {
+                        resultLayer.removeFrom(map);
+                        me.initFeature();
+                    } else {
+                        alert("删除失败")
+                    }
+                });
+            }
             if (featureGroup && featureGroup.hasLayer(marker)) {
                 featureGroup.removeLayer(marker);
+                marker=null;
             }
         }
     </script>
diff --git a/examples/leaflet/02_filedStatistics.html b/examples/leaflet/02_filedStatistics.html
@@ -30,7 +30,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(mapURL,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(mapURL).addTo(map);
             initResultInfoWin();
             showLayersInfo();
             document.getElementById("layerSelect").onchange = function () {
diff --git a/examples/leaflet/02_filedsService.html b/examples/leaflet/02_filedsService.html
@@ -19,7 +19,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
         }
 
         function fieldsService() {
diff --git a/examples/leaflet/02_getFeatureByBounds.html b/examples/leaflet/02_getFeatureByBounds.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 3
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
             polygon = L.polygon([[-20, 20], [0, 20], [0, 40], [-20, 40], [-20, 20]], {color: 'red'});
         }
         function query() {
diff --git a/examples/leaflet/02_getFeatureByBuffer.html b/examples/leaflet/02_getFeatureByBuffer.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
             polygon = L.polygon([[-20, 20], [0, 20], [0, 40], [-20, 40], [-20, 20]], {color: 'red'});
         }
         function query() {
diff --git a/examples/leaflet/02_getFeatureByGeometry.html b/examples/leaflet/02_getFeatureByGeometry.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 2
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
             polygon = L.polygon([[0, 0], [-30, 0], [-10, 30], [0, 0]], {color: 'red'});
         }
         function query() {
diff --git a/examples/leaflet/02_getFeatureByIDs.html b/examples/leaflet/02_getFeatureByIDs.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
 
         }
         function query() {
diff --git a/examples/leaflet/02_getFeatureBySQL.html b/examples/leaflet/02_getFeatureBySQL.html
@@ -18,7 +18,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
         }
         function query() {
             clearLayer();
diff --git a/examples/leaflet/02_getGridCellInfos.html b/examples/leaflet/02_getGridCellInfos.html
@@ -19,7 +19,7 @@
                 maxZoom: 18,
                 zoom: 1
             });
-            L.supermap.tiledMapLayer(baseUrl,{projection:"4326"}).addTo(map);
+            L.supermap.tiledMapLayer(baseUrl).addTo(map);
 
             map.on("click", function (evt) {
 
diff --git a/src/Leaflet/SuperMap/iServer/TiledMapLayer.js b/src/Leaflet/SuperMap/iServer/TiledMapLayer.js
@@ -1,8 +1,8 @@
 /**
- * Class: L.SuperMap.TileLayer
+ * Class: TileLayer
  * SuperMap iServer 的 REST 地图服务的图层(SuperMap iServer Java 6R 及以上分块动态 REST 图层)
  * 用法：
- *      L.superMap.TileLayer(url,{projection:"3857"}).addTo(map);
+ *      L.superMap.TileLayer(url,{CRS:L.CRS.EPSG4326}).addTo(map);
  */
 require('../../base');
 require('../../../Core/base');
@@ -14,7 +14,7 @@ TiledMapLayer = L.TileLayer.extend({
         transparent: null,
         cacheEnabled: null,
         layersID: null, //如果有layersID，则是在使用专题图
-        projection: null
+        crs: null
     },
 
     initialize: function (url, options) {
@@ -30,23 +30,15 @@ TiledMapLayer = L.TileLayer.extend({
     },
 
     getTileUrl: function (coords) {
-        var x = coords.x;
-        var y = coords.y;
-        var zoom = coords.z;
-
+        var x = coords.x, y = coords.y, zoom = coords.z;
         //使用ViewBounds出图
         var tileBounds = this._tileCoordsToBounds(coords),
             nw = this._crs.project(tileBounds.getNorthWest()),
-            se = this._crs.project(tileBounds.getSouthEast()),
-            left = nw.x,
-            bottom = se.y,
-            right = se.x,
-            top = nw.y;
-
-        var tileUrl = this._layerUrl + "&viewBounds=" + "{\"leftBottom\" : {\"x\":" + left + ",\"y\":" + bottom + "},\"rightTop\" : {\"x\":" + right + ",\"y\":" + top + "}}";
-        tileUrl += "&scale=" + this._scales[zoom];
-        var epsg = this.options.projection === "4326" ? 4326 : 3857;
-        tileUrl += "&prjCoordSys={\"epsgCode\":" + epsg + "}";
+            se = this._crs.project(tileBounds.getSouthEast());
+        var tileUrl = this._layerUrl + "&viewBounds=" + "{\"leftBottom\" : {\"x\":" + nw.x + ",\"y\":" + se.y + "},\"rightTop\" : {\"x\":" + se.x + ",\"y\":" + nw.y + "}}";
+
+        var crs = this._crs, scale = crs.scale(zoom);
+        tileUrl += "&scale=" + scale;
         return tileUrl;
     },
 
@@ -55,13 +47,11 @@ TiledMapLayer = L.TileLayer.extend({
         if (!options.url) {
             return;
         }
-        //如果有projection，并且只能是4326或者3857的地图。
-        options.projection = (options.projection && options.projection === "4326") ? "4326" : "3857";
         this._layerUrl = this._initLayerUrl(options);
-        this._scales = this._initScales(options.projection);
     },
 
     _initLayerUrl: function (options) {
+
         var layerUrl = options.url + "/image.png?redirect=false&width=256&height=256";
 
         //为url添加安全认证信息片段
@@ -79,26 +69,7 @@ TiledMapLayer = L.TileLayer.extend({
             layerUrl += "&layersID=" + options.layersID;
         }
 
-        layerUrl += "&projection=" + options.projection;
         return layerUrl;
-    },
-
-    _initScales: function (projection) {
-        var resLen = 17, resStart = 0, dpi = 95.99999999999984, scales = [];
-        if (projection === "3857") {
-            for (var i = resStart; i <= resLen; i++) {
-                var res3857 = 156543.0339 / Math.pow(2, i);
-                var scale3857 = 0.0254 / dpi / res3857;
-                scales.push(scale3857);
-            }
-        } else {
-            for (var i = resStart; i <= resLen; i++) {
-                var res4326 = 1.40625 / Math.pow(2, i);
-                var scale4326 = 0.0254 * 360 / dpi / res4326 / Math.PI / 2 / 6378137;
-                scales.push(scale4326);
-            }
-        }
-        return scales;
     }
 });
 
diff --git a/src/Leaflet/SuperMap/iServer/TrafficTransferAnalystService.js b/src/Leaflet/SuperMap/iServer/TrafficTransferAnalystService.js

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,12 @@ var deps = {`
`104`	`104`	`"./src/Leaflet/SuperMap/iServer/EditFeaturesService.js",`
`105`	`105`	`"./src/Leaflet/SuperMap/iServer/GetGridCellInfosService.js"`
`106`	`106`	`]`
	`107`	`+ },`
	`108`	`+ "TrafficTransferAnalyst": {`
	`109`	`+ "name": "交通换乘分析服务",`
	`110`	`+ "src": [`
	`111`	`+ "./src/Leaflet/SuperMap/iServer/TrafficTransferAnalystService.js"`
	`112`	`+ ]`
`107`	`113`	`}`
`108`	`114`	`},`
`109`	`115`	`"Visual": {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`maxZoom: 18,`
`19`	`19`	`zoom: 2`
`20`	`20`	`});`
`21`		`- L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);`
	`21`	`+ L.supermap.tiledMapLayer(url).addTo(map);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`function layerService() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`maxZoom: 18,`
`18`	`18`	`zoom: 1`
`19`	`19`	`});`
`20`		`- L.supermap.tiledMapLayer(url,{projection:"4326"}).addTo(map);`
	`20`	`+ L.supermap.tiledMapLayer(url).addTo(map);`
`21`	`21`	`polygon = L.polygon([[0, 0], [39, 0], [39, 116], [0, 116], [0, 0]]);`
`22`	`22`	`}`
`23`	`23`	`function query() {`