From 40458f949d3622b90fb5dab1b27534be7be42b9c Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sat, 7 Feb 2015 04:05:04 +0000
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B3=A8=E8=AE=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AC=A1=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scripts/data/landuse-compare.phtml  | 103 +++++++++---------
 .../default/views/scripts/data/landuse.phtml  |  49 ++++-----
 2 files changed, 75 insertions(+), 77 deletions(-)

diff --git a/application/default/views/scripts/data/landuse-compare.phtml b/application/default/views/scripts/data/landuse-compare.phtml
index 47a3a901..18fee38d 100644
--- a/application/default/views/scripts/data/landuse-compare.phtml
+++ b/application/default/views/scripts/data/landuse-compare.phtml
@@ -62,31 +62,6 @@ $this->nav[] = array('link'=>"/data/landuse",'title'=>'三江源多期土地利
 				]
 			}),
 
-			new ol.layer.Group({
-				title: '城市',
-				layers: [
-					new ol.layer.Tile({
-						title: '城市名称',
-						visible: false,
-						extent: projectionExtent,
-						source: new ol.source.WMTS({
-
-							url: 'http://t0.tianditu.com/cva_w/wmts',
-							layer: 'cva',
-							matrixSet: 'w',
-							format: 'tiles',
-							projection: projection,
-							tileGrid: new ol.tilegrid.WMTS({
-								origin: ol.extent.getTopLeft(projectionExtent),
-								resolutions: resolutions,
-								matrixIds: matrixIds
-							}),
-							style: 'default'
-						})
-					})
-				]
-			}),
-
 			new ol.layer.Group({
 				title: '年份',
 				layers: [
@@ -180,7 +155,31 @@ $this->nav[] = array('link'=>"/data/landuse",'title'=>'三江源多期土地利
 						})
 					})
 				]
-			})
+			}),
+			new ol.layer.Group({
+				title: '城市',
+				layers: [
+					new ol.layer.Tile({
+						title: '城市名称',
+						visible: false,
+						extent: projectionExtent,
+						source: new ol.source.WMTS({
+
+							url: 'http://t0.tianditu.com/cva_w/wmts',
+							layer: 'cva',
+							matrixSet: 'w',
+							format: 'tiles',
+							projection: projection,
+							tileGrid: new ol.tilegrid.WMTS({
+								origin: ol.extent.getTopLeft(projectionExtent),
+								resolutions: resolutions,
+								matrixIds: matrixIds
+							}),
+							style: 'default'
+						})
+					})
+				]
+			}),			
 		],
 
 		target: 'mapl',
@@ -223,31 +222,6 @@ $this->nav[] = array('link'=>"/data/landuse",'title'=>'三江源多期土地利
 				]
 			}),
 
-			new ol.layer.Group({
-				title: '城市',
-				layers: [
-					new ol.layer.Tile({
-						title: '城市名称',
-						visible: false,
-						extent: projectionExtent,
-						source: new ol.source.WMTS({
-
-							url: 'http://t0.tianditu.com/cva_w/wmts',
-							layer: 'cva',
-							matrixSet: 'w',
-							format: 'tiles',
-							projection: projection,
-							tileGrid: new ol.tilegrid.WMTS({
-								origin: ol.extent.getTopLeft(projectionExtent),
-								resolutions: resolutions,
-								matrixIds: matrixIds
-							}),
-							style: 'default'
-						})
-					})
-				]
-			}),
-
 			new ol.layer.Group({
 				title: '年份',
 				layers: [
@@ -340,7 +314,32 @@ $this->nav[] = array('link'=>"/data/landuse",'title'=>'三江源多期土地利
 						})
 					}),
 				]
-			})
+			}),
+			new ol.layer.Group({
+				title: '城市',
+				layers: [
+					new ol.layer.Tile({
+						title: '城市名称',
+						visible: false,
+						extent: projectionExtent,
+						source: new ol.source.WMTS({
+
+							url: 'http://t0.tianditu.com/cva_w/wmts',
+							layer: 'cva',
+							matrixSet: 'w',
+							format: 'tiles',
+							projection: projection,
+							tileGrid: new ol.tilegrid.WMTS({
+								origin: ol.extent.getTopLeft(projectionExtent),
+								resolutions: resolutions,
+								matrixIds: matrixIds
+							}),
+							style: 'default'
+						})
+					})
+				]
+			}),
+			
 		],
 
 		target: 'mapr',
diff --git a/application/default/views/scripts/data/landuse.phtml b/application/default/views/scripts/data/landuse.phtml
index f6b5d706..e2c1061d 100644
--- a/application/default/views/scripts/data/landuse.phtml
+++ b/application/default/views/scripts/data/landuse.phtml
@@ -158,31 +158,6 @@ $this->nav[] = array(
 				]
 			}),
 
-			new ol.layer.Group({
-				title: '城市',
-				layers: [
-					new ol.layer.Tile({
-						title: '城市名称',
-						visible: false,
-						extent: projectionExtent,
-						source: new ol.source.WMTS({
-							attributions: [attribution],
-							url: 'http://t0.tianditu.com/cva_w/wmts',
-							layer: 'cva',
-							matrixSet: 'w',
-							format: 'tiles',
-							projection: projection,
-							tileGrid: new ol.tilegrid.WMTS({
-								origin: ol.extent.getTopLeft(projectionExtent),
-								resolutions: resolutions,
-								matrixIds: matrixIds
-							}),
-							style: 'default'
-						})
-					})
-				]
-			}),
-
 			new ol.layer.Group({
 				title: '年份',
 				layers: [
@@ -291,6 +266,30 @@ $this->nav[] = array(
 					vectorLayer
 				]
 			}),
+			new ol.layer.Group({
+				title: '城市',
+				layers: [
+					new ol.layer.Tile({
+						title: '城市名称',
+						visible: false,
+						extent: projectionExtent,
+						source: new ol.source.WMTS({
+							attributions: [attribution],
+							url: 'http://t0.tianditu.com/cva_w/wmts',
+							layer: 'cva',
+							matrixSet: 'w',
+							format: 'tiles',
+							projection: projection,
+							tileGrid: new ol.tilegrid.WMTS({
+								origin: ol.extent.getTopLeft(projectionExtent),
+								resolutions: resolutions,
+								matrixIds: matrixIds
+							}),
+							style: 'default'
+						})
+					})
+				]
+			}),			
 		],
 
 		target: 'map',