Merge branch 'master' of https://github.com/MapGIS/WebClient-JavaScript

CQ-bliss · CQ-bliss · commit 15a79514ddc3 · 2018-10-18T10:29:37.000+08:00
diff --git a/config/config-leaflet.js b/config/config-leaflet.js
@@ -370,13 +370,29 @@ var config = {
                     folder: "customtile",
                     leaffolder: true,
                     childs: [{
-                        name: "高斯投影-3857",
+                        name: "高斯投影-开源实现",
                         file: "gauss",
                         diffcult: "1",
                         detail: "高斯投影",
                         icon: "gauss.png",
                         update: "最后更新时间：2018-06-05",
                         person:"基础平台/创新中心-潘卓然"
+                    },{
+                        name: "EPSG4610-中地内置",
+                        file: "epsg4610",
+                        diffcult: "1",
+                        detail: "EPSG4610: 经纬度裁图，西安80椭球 ",
+                        icon: "epsg4610.png",
+                        update: "最后更新时间：2018-10-17",
+                        person:"基础平台-龚跃健"
+                    },{
+                        name: "EPSG4610-开源实现",
+                        file: "epsg4610proj",
+                        diffcult: "1",
+                        detail: "EPSG4610: 经纬度裁图，西安80椭球 ",
+                        icon: "epsg4610proj.png",
+                        update: "最后更新时间：2018-10-17",
+                        person:"基础平台/创新中心-潘卓然"
                     }]
                 }
             ]
diff --git a/demo/leaflet/example/map/customtile/epsg4610.htm b/demo/leaflet/example/map/customtile/epsg4610.htm
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>EPSG4610: 经纬度裁图，西安80椭球</title>
+    <script include="jquery" src="../../libs/zondyclient/include-lib-local.js"></script>
+    <script src="../../libs/zondyclient/include-leaflet-local.js"></script>
+    <style>
+        #map {
+            height: 800px
+        }
+    </style>
+</head>
+
+<body>
+    <div id="map"></div>
+    <script>
+        //EPSG4610: 经纬度裁图，西安80椭球
+        map = L.map('map', {
+            crs: L.CRS.EPSG4610,
+            center: [37.09, 114.80], //注意这里要使用经纬度坐标
+            zoom: 1,
+            continuousWorld: true,
+            worldCopyJump: false,
+        });
+
+        L.tileLayer('http://192.168.10.185:6163/igs/rest/mrms/tile/EPSG_4610/{z}/{y}/{x}', {
+            attribution: '<a href="#">EPSG4610: 经纬度裁图，西安80椭球</a>',
+            maxZoom: 5,
+            minZoom: 0
+        }).addTo(map);
+
+        L.circle([37.09, 114.80], {
+            radius: 100,
+            color: 'red',
+            fillColor: '#f03',
+            fillOpacity: 1
+        }).addTo(map);
+    </script>
+</body>
+
+</html>
diff --git a/demo/leaflet/example/map/customtile/epsg4610proj.htm b/demo/leaflet/example/map/customtile/epsg4610proj.htm
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>EPSG4610: 经纬度裁图，西安80椭球</title>
+    <script include="jquery" src="../../libs/zondyclient/include-lib-local.js"></script>
+    <script include="proj4" src="../../libs/zondyclient/include-leaflet-local.js"></script>
+    <style>
+        #map {
+            height: 800px
+        }
+    </style>
+</head>
+
+<body>
+    <div id="map"></div>
+    <script>
+        var Xian80_Resolutions = [];
+        for (var i = 1; i < 19; i++) {
+            //360度  除以 256像素 
+            Xian80_Resolutions.push(0.703125 * 2 / (Math.pow(2, i)));
+        }
+
+        //EPSG4610: 经纬度裁图，西安80椭球
+        var epsg4610 = new L.Proj.CRS("EPSG:4610", 
+            "+proj=longlat +a=6378140 +b=6356755.288157528 +units=degrees +no_defs",
+            {
+                resolutions: Xian80_Resolutions,
+                origin: [-180, 90],
+                bounds: L.bounds([-180, -90], [180, 90])
+            });
+
+        map = L.map('map', {
+            crs: epsg4610,
+            center: [37.09, 114.80], //注意这里要使用经纬度坐标
+            zoom: 1,
+            continuousWorld: true,
+            worldCopyJump: false,
+        });
+
+        L.tileLayer('http://192.168.10.185:6163/igs/rest/mrms/tile/EPSG_4610/{z}/{y}/{x}', {
+            attribution: '<a href="#">EPSG4610: 经纬度裁图，西安80椭球</a>',
+            maxZoom: 5,
+            minZoom: 0
+        }).addTo(map);
+
+        L.circle([37.09, 114.80], {
+            radius: 100,
+            color: 'red',
+            fillColor: '#f03',
+            fillOpacity: 1
+        }).addTo(map);
+    </script>
+</body>
+
+</html>
diff --git a/demo/leaflet/example/map/customtile/gauss.htm b/demo/leaflet/example/map/customtile/gauss.htm
@@ -39,7 +39,7 @@
                 worldCopyJump: false,
             });
 
-        L.tileLayer('http://localhost:6163/igs/rest/mrms/tile/高斯坐标/{z}/{y}/{x}', {
+        L.tileLayer('http://192.168.10.185:6163/igs/rest/mrms/tile/高斯坐标/{z}/{y}/{x}', {
             attribution: '<a href="#">MapGIS高斯坐标</a>',
             maxZoom: 5,
             minZoom: 0
diff --git a/demo/leaflet/gallery/map/customtile/epsg4610.png b/demo/leaflet/gallery/map/customtile/epsg4610.png
diff --git a/demo/leaflet/gallery/map/customtile/epsg4610proj.png b/demo/leaflet/gallery/map/customtile/epsg4610proj.png
