From f210c0ea4f7b377efda4172bfebd69355f79a18b Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Tue, 13 Dec 2011 06:10:57 +0000
Subject: [PATCH] Some cleanup in the Maps.

svn: r18591
---
 src/plugins/webreport/NarrativeWeb.py       | 26 ++++++++++++---------
 src/plugins/webstuff/css/Web_Basic-Blue.css |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 1d3e8df42..1cf56c60b 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -221,6 +221,18 @@ markers = """
     }
   }"""
 
+canada_map = """
+    var dm_wms = new OpenLayers.Layer.WMS(
+      "Canadian Data",
+      "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
+      {layers: "bathymetry,land_fn,park,drain_fn,drainage," +
+         "prov_bound,fedlimit,rail,road,popplace",
+         transparent: "true",
+         format: "image/png"},
+       {isBaseLayer: false});
+     map.addLayers([wms, dm_wms]);
+"""
+
 # javascript for OpenStreetMap's markers...
 osm_markers = """
   OpenLayers.Lang.setCode("%s");
@@ -235,15 +247,7 @@ osm_markers = """
       "OpenLayers WMS",
       "http://vmap0.tiles.osgeo.org/wms/vmap0",
       {'layers':'basic'});
-    var dm_wms = new OpenLayers.Layer.WMS(
-      "Canadian Data",
-      "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
-      {layers: "bathymetry,land_fn,park,drain_fn,drainage," +
-         "prov_bound,fedlimit,rail,road,popplace",
-         transparent: "true",
-         format: "image/png"},
-       {isBaseLayer: false});
-     map.addLayers([wms, dm_wms]);
+    map.addLayer(wms);
 
     map.setCenter(new OpenLayers.LonLat(%s, %s), %d);
 
@@ -260,7 +264,6 @@ osm_markers = """
       marker = new OpenLayers.Marker(new OpenLayers.LonLat(location[0], location[1]));
       markers.addMarker(marker); 
       map.addControl(new OpenLayers.Control.LayerSwitcher());
-      map.zoomToMaxExtent();
     }
   }"""
 # there is no need to add an ending "</script>",
@@ -5105,7 +5108,8 @@ class IndividualPage(BasePage):
                 mapdetail += canvas
 
                 # begin javascript inline code...
-                with Html("script", deter ="deter", type ="text/javascript", indent =False) as jsc:
+                with Html("script", deter ="deter", style = 'width =100%; height =100%;',
+                                                    type ="text/javascript", indent =False) as jsc:
                     head += jsc
 
                     # if there is only one marker?
diff --git a/src/plugins/webstuff/css/Web_Basic-Blue.css b/src/plugins/webstuff/css/Web_Basic-Blue.css
index d66a921ba..904fd8872 100644
--- a/src/plugins/webstuff/css/Web_Basic-Blue.css
+++ b/src/plugins/webstuff/css/Web_Basic-Blue.css
@@ -280,7 +280,7 @@ div#footer {
     clear: both;
     overflow: hidden;
     width: 100%;
-    height: 60px;
+    height: 70px;
     font-size: 12px;
     line-height: 130%;
     color: #FFF;