From 8acf29a8c37d2de025eb2ada060fd76b6464110b Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 29 Jun 2010 08:55:46 +0000
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E7=A9=BA=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=EF=BC=8C=E5=9C=A8IE7/FF3=E4=B8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8CIE6=E4=B8=8B=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/WaterController.php   |  2 +-
 .../default/views/scripts/water/timemap.phtml | 41 +++++++++++--------
 .../default/views/scripts/water/view.phtml    | 13 +++---
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/application/default/controllers/WaterController.php b/application/default/controllers/WaterController.php
index df1bfa41..fcb7c017 100644
--- a/application/default/controllers/WaterController.php
+++ b/application/default/controllers/WaterController.php
@@ -190,7 +190,7 @@ class WaterController extends DataController
 
 	function timemapAction()
 	{
-    	$sql="select id,uuid,west,south,north,east,title,timebegin,timeend from metadata where source='0595169a-279e-4b95-819f-129d0ba4280d' and timebegin is not null";
+    	$sql="select id,uuid,west,south,north,east,title,timebegin,timeend from metadata where source='0595169a-279e-4b95-819f-129d0ba4280d' and timebegin is not null and timebegin::date>date('2007-01-01')";
     	$this->view->rows=$this->db->fetchAll($sql);
 	}
     
diff --git a/application/default/views/scripts/water/timemap.phtml b/application/default/views/scripts/water/timemap.phtml
index 0b3b5da5..a0018bf0 100644
--- a/application/default/views/scripts/water/timemap.phtml
+++ b/application/default/views/scripts/water/timemap.phtml
@@ -10,6 +10,7 @@ $this->breadcrumb('<a href="/water/">黑河综合遥感联合试验</a>');
 $this->breadcrumb('时空联合导航');
 $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg');
+//$this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=3&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhThiRESR0xRCe9JKd36EL3glTk0OxTsRzifkUWmTTrYWaE7dY1lYUlGxA');
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/timemap/timemap.js');
@@ -18,22 +19,22 @@ $this->headScript()->captureStart();
 var tm;
 window.onload=function() {
 	tm = TimeMap.init({
-		mapId: "map",               // Id of map div element (required)
+		mapId: "watermap",               // Id of map div element (required)
 		timelineId: "timeline",     // Id of timeline div element (required)
+		scrollTo: "earliest",
 		options: {
-            eventIconPath: "../images/"
+            eventIconPath: "../images/",
+            mapType:G_SATELLITE_MAP,
+            mapCenter: new GLatLng(39,100), 
         },
 		datasets: [
             {
-                id: "artists",
-                title: "Artists",
+            	data:{
                 theme: "orange",
                 // note that the lines below are now the preferred syntax
                 type: "basic",
-                options: {
-                    items: [
-                <?php
-                foreach($this->rows as $row) : ?>
+                value: [
+                <?php foreach($this->rows as $row) : ?>
                         {
                           "start" : "<?php echo $row['timebegin']; ?>",
                           <?php if ($row['timeend']!='') : ?>
@@ -44,27 +45,31 @@ window.onload=function() {
                               "lat" : <?php echo ($row['south']+$row['north'])/2; ?>,
                               "lon" : <?php echo ($row['west']+$row['east'])/2; ?>
                            },
-                          "title" : "<?php echo $row['title']; ?>",
+                          "title" : "<?php echo htmlspecialchars(mb_substr($row['title'],11,mb_strlen($row['title'],'UTF-8')-10,'UTF-8')); ?>",
                           "options" : {
                             // set the full HTML for the info window
-                            "infoHtml": "<a href=/water/<?php echo $row['uuid']; ?>><?php echo $row['title']; ?></a><hr /><img src=/data/thumb/id/<?php echo $row['id']; ?> />"
-                          }
+                            "infoHtml": "<a href=/water/<?php echo $row['uuid']; ?>><?php echo htmlspecialchars(mb_substr($row['title'],11,mb_strlen($row['title'],'UTF-8')-10,'UTF-8')); ?></a><hr /><img width='50' src=/data/thumb/id/<?php echo $row['id']; ?> />",
+                            "theme":"orange"
+                        }
                         },
-<?php endforeach; ?>                        
-                    ]
+						<?php endforeach; ?>                        
+						]
                 }
             }
         ],
         bandIntervals: [
-            Timeline.DateTime.WEEK, 
-            Timeline.DateTime.YEAR
+            Timeline.DateTime.DAY, 
+            Timeline.DateTime.MONTH
         ]
     });
     // manipulate the timemap further here if you like
+    var map=tm.map;
+    map.setCenter(new GLatLng(39,100),7);
 }
 window.onunload=GUnload();
 <?php $this->headScript()->captureEnd(); ?>
     <div id="timemap" style="clear:both;">
-          <div id="timeline" style="height:300px;width:100%;"></div>
-          <div id="map" style="height:300px;"></div>
-    </div>
+         <div id="watermap" style="height:500px;width:40%;float:right;"></div>
+          <div id="timeline" style="height:500px;border-right:1px solid #abc;"></div> 
+
+</div>
\ No newline at end of file
diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml
index 76bd7123..e127cdab 100755
--- a/application/default/views/scripts/water/view.phtml
+++ b/application/default/views/scripts/water/view.phtml
@@ -9,6 +9,10 @@
 	$this->breadcrumb('<a href="/water/">黑河综合遥感联合试验</a>');
 	$this->breadcrumb('查看试验元数据');
 	$this->breadcrumb()->setSeparator(' > ');
+	//http://westdc.westgis.ac.cn
+	//$this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg');
+	$this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhThiRESR0xRCe9JKd36EL3glTk0OxTsRzifkUWmTTrYWaE7dY1lYUlGxA');
+	
 	$this->headScript()->appendFile('/js/prototype.js');
 	$this->headScript()->appendFile('/js/OpenLayers.js');
    $this->headScript()->appendFile('/js/window.js');
@@ -102,7 +106,7 @@ else
 </div>
 <hr />
 <h2>位置图</h2>
-<div id='map'></div>
+<div id='watermap'></div>
 <hr />
 	<h2>联系信息</h2>
 <div id="authors">
@@ -236,13 +240,8 @@ function reportError(request)
 </div>
 
 
-<!--westdc.westgis.ac.cn-->
-<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg" charset="utf-8"></script>
-<!--test.westgis.ac.cn
-<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhThiRESR0xRCe9JKd36EL3glTk0OxTsRzifkUWmTTrYWaE7dY1lYUlGxA'></script>
--->
 <script type="text/javascript" charset="utf-8">
-        var map = new GMap2(document.getElementById("map"));
+        var map = new GMap2(document.getElementById("watermap"));
         var plotbounds=new GLatLngBounds(new GLatLng(<?= $md->south; ?>,<?= $md->west; ?>),new GLatLng(<?= $md->north; ?>,<?= $md->east; ?>));
         var zoomlevel=map.getBoundsZoomLevel(plotbounds);
         zoomlevel--;