Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanup in the Maps.

Browse Source 
svn: r18591
This commit is contained in:
Rob G. Healey 2011-12-13 06:10:57 +00:00
parent 9a4b839830
commit f210c0ea4f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/webreport/NarrativeWeb.py
View File

@ -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... # javascript for OpenStreetMap's markers...
osm_markers = """ osm_markers = """
OpenLayers.Lang.setCode("%s"); OpenLayers.Lang.setCode("%s");
@ -235,15 +247,7 @@ osm_markers = """
"OpenLayers WMS", "OpenLayers WMS",
"http://vmap0.tiles.osgeo.org/wms/vmap0", "http://vmap0.tiles.osgeo.org/wms/vmap0",
{'layers':'basic'}); {'layers':'basic'});
var dm_wms = new OpenLayers.Layer.WMS( map.addLayer(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.setCenter(new OpenLayers.LonLat(%s, %s), %d); 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])); marker = new OpenLayers.Marker(new OpenLayers.LonLat(location[0], location[1]));
markers.addMarker(marker); markers.addMarker(marker);
map.addControl(new OpenLayers.Control.LayerSwitcher()); map.addControl(new OpenLayers.Control.LayerSwitcher());
map.zoomToMaxExtent();
} }
}""" }"""
# there is no need to add an ending "</script>", # there is no need to add an ending "</script>",
@ -5105,7 +5108,8 @@ class IndividualPage(BasePage):
mapdetail += canvas mapdetail += canvas
# begin javascript inline code... # 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 head += jsc
# if there is only one marker? # if there is only one marker?

2
src/plugins/webstuff/css/Web_Basic-Blue.css
View File

@ -280,7 +280,7 @@ div#footer {
clear: both; clear: both;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
height: 60px; height: 70px;
font-size: 12px; font-size: 12px;
line-height: 130%; line-height: 130%;
color: #FFF; color: #FFF;