cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor out javascript code to support OpenLayers maps into a common file

Browse source 
that is shared by both the (current) pages that display maps.
This commit is contained in:
Tom Hughes 2007-06-23 18:29:01 +00:00
parent 9ec1b1bea5
commit 9619dfdb4b
4 changed files with 172 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

94
app/views/site/index.rhtml
View file

@ -7,10 +7,6 @@
<% lon = params['mlon'] %> <% lon = params['mlon'] %>
<% lat = params['mlat'] %> <% lat = params['mlat'] %>
<% zoom = params['zoom'] || '12' %> <% zoom = params['zoom'] || '12' %>
<script type="text/javascript">
var mlat = <%= lat %>;
var mlon = <%= lon %>;
</script>
<% elsif @user and params['lon'].nil? and params['lat'].nil? %> <% elsif @user and params['lon'].nil? and params['lat'].nil? %>
<% lon = @user.home_lon %> <% lon = @user.home_lon %>
<% lat = @user.home_lat %> <% lat = @user.home_lat %>
@ -21,89 +17,42 @@
<% zoom = params['zoom'] || '4' %> <% zoom = params['zoom'] || '4' %>
<% end %> <% end %>
<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag 'map.js' %>
<script type="text/javascript">
var lat = <%= lat %>;
var lon = <%= lon %>;
var zoom = <%= zoom %>;
var PI = 3.14159265358979323846;
<% if params['scale'] and params['scale'].length > 0 then %>
zoom = Math.log(360.0/(( <% print params['scale'].to_f() %> ) * 512.0)) / Math.log(2.0);
<% end %>
zoom = zoom;
lon = lon * 20037508.34 / 180;
lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
lat = lat * 20037508.34 / 180;
<% if marker %>
mlon = mlon * 20037508.34 / 180;
mlat = Math.log(Math.tan( (90 + mlat) * PI / 360)) / (PI / 180);
mlat = mlat * 20037508.34 / 180;
<%end%>
</script>
<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
var map, layer, markers;
var ie6 = ! ( window.addEventListener || window.XMLHttpRequest ); var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
var map;
function init(){ function init(){
var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
var zoom = <%= zoom %>;
OpenLayers.Util.onImageLoadError = function() { <% if params['scale'] and params['scale'].length > 0 then %>
this.src = OpenLayers.Util.getImagesLocation() + "404.png"; zoom = scaleToZoom(<%= params['scale'].to_f() %>);
} <% end %>
map = new OpenLayers.Map( "map",
{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), numZoomLevels:19, maxResolution:156543, units:'m', projection: "EPSG:41001"} );
layer = new OpenLayers.Layer.TMS( "Mapnik", "http://tile.openstreetmap.org/", {type:'png', getURL:getTileURL} );
map.addLayer(layer);
layer = new OpenLayers.Layer.TMS( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png', getURL:getTileURL} );
map.addLayer(layer);
//Marker stuff var map = createMap("map", centre, zoom);
<% if marker %> <% if marker %>
markers = new OpenLayers.Layer.Markers("markers"); addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
map.addLayer(markers); <% end %>
marker = new OpenLayers.Marker(new OpenLayers.LonLat(mlon,mlat));
markers.addMarker(marker);
<%end%>
map.setOptions({theme:''});
map.addControl(new OpenLayers.Control.LayerSwitcher());
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
map.events.register("moveend", map, updateLocation); map.events.register("moveend", map, updateLocation);
document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute'; updateLocation();
if( ie6 ) {
document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
if ( ie6 ) {
handleResize(); handleResize();
} }
updateLocation();
} }
function getTileURL( bounds ) {
var res = this.map.getResolution();
var x = Math.round ((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
var y = Math.round ((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
var z = this.map.getZoom();
return this.url + z + "/" + x + "/" + y + "." + this.type;
}
function updateLocation() { function updateLocation() {
var lonlat = map.getCenter(); var lonlat = mercatorToLonLat(map.getCenter());
var lon_deg = (lonlat.lon / 20037508.34) * 180;
var lat_deg = (lonlat.lat / 20037508.34) * 180;
var PI = 3.14159265358979323846;
lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
var zoom = map.getZoom(); var zoom = map.getZoom();
updatelinks(lon_deg,lat_deg,zoom); updatelinks(lonlat.lon, lonlat.lat, zoom);
} }
function getStyle( el, property ) { function getStyle( el, property ) {
@ -166,9 +115,10 @@
}, 200 ); }, 200 );
} }
if( ie6 ) { if ( ie6 ) {
window.onresize = handleResize; window.onresize = handleResize;
} }
window.onload = init;
window.onload = init;
// --> // -->
</script> </script>

175
app/views/user/account.rhtml
View file

@ -37,165 +37,70 @@
</script> </script>
<% if @user.home_lat and @user.home_lon %> <% if @user.home_lat and @user.home_lon %>
<% marker = true %> <% marker = true %>
<% mlon = @user.home_lon %> <% mlon = @user.home_lon %>
<% mlat = @user.home_lat %> <% mlat = @user.home_lat %>
<% lon = @user.home_lon %> <% lon = @user.home_lon %>
<% lat = @user.home_lat %> <% lat = @user.home_lat %>
<% zoom = '12' %> <% zoom = '12' %>
<script type="text/javascript">
var mlat = <%= mlat %>;
var mlon = <%= mlon %>;
</script>
<% else %> <% else %>
<% lon = params['lon'] || '-0.1' %> <% lon = params['lon'] || '-0.1' %>
<% lat = params['lat'] || '51.5' %> <% lat = params['lat'] || '51.5' %>
<% zoom = params['zoom'] || '4' %> <% zoom = params['zoom'] || '4' %>
<% end %> <% end %>
<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag 'map.js' %>
<script type="text/javascript">
var lat = <%= lat %>;
var lon = <%= lon %>;
var zoom = <%= zoom %>;
var PI = 3.14159265358979323846;
<% if params['scale'] and params['scale'].length > 0 then %>
zoom = Math.log(360.0/(( <% print params['scale'].to_f() %> ) * 512.0)) / Math.log(2.0);
<% end %>
zoom = zoom;
lon = lon * 20037508.34 / 180;
lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
lat = lat * 20037508.34 / 180;
<% if marker %>
mlon = mlon * 20037508.34 / 180;
mlat = Math.log(Math.tan( (90 + mlat) * PI / 360)) / (PI / 180);
mlat = mlat * 20037508.34 / 180;
<%end%>
</script>
<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
var map, layer, markers, marker, popup; var marker;
function mercator2lonlat( merc ) {
var lon_deg = (merc.lon / 20037508.34) * 180;
var lat_deg = (merc.lat / 20037508.34) * 180;
var PI = 3.14159265358979323846;
lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
return new OpenLayers.LonLat(lon_deg,lat_deg);
}
function lonlat2mercator( ll ) {
var lon = ll.lon * 20037508.34 / 180;
var lat = Math.log(Math.tan( (90 + ll.lat) * PI / 360)) / (PI / 180);
lat = lat * 20037508.34 / 180;
return new OpenLayers.LonLat(lon,lat);
}
function init(){ function init(){
var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
var zoom = <%= zoom %>;
OpenLayers.Util.onImageLoadError = function() { <% if params['scale'] and params['scale'].length > 0 then %>
this.src = OpenLayers.Util.getImagesLocation() + "404.png"; zoom = scaleToZoom(<%= params['scale'].to_f() %>);
} <% end %>
map = new OpenLayers.Map( "map",
{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxZoomLevel:18, maxResolution:156543, units:'m', projection: "EPSG:41001"} );
layer = new OpenLayers.Layer.TMS( "Mapnik", "http://tile.openstreetmap.org/", {type:'png', getURL:getTileURL} );
map.addLayer(layer);
layer = new OpenLayers.Layer.TMS( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png', getURL:getTileURL} );
map.addLayer(layer);
//Marker stuff var map = createMap("map", centre, zoom);
markers = new OpenLayers.Layer.Markers("markers");
map.addLayer(markers);
<% if marker %> <% if marker %>
marker = new OpenLayers.Marker(new OpenLayers.LonLat(mlon,mlat)); marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");
marker.events.register("click", "marker", markerOnClick ); <% end %>
markers.addMarker(marker);
<%end%>
var near_icon = OpenLayers.Marker.defaultIcon(); var near_icon = OpenLayers.Marker.defaultIcon();
near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";; near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
var i = nearest.length; var i = nearest.length;
while( i-- ) { while( i-- ) {
var nearmarker = new OpenLayers.Marker( lonlat2mercator( new OpenLayers.LonLat( nearest[i].home_lon, nearest[i].home_lat ) ), near_icon.clone() ); var description = 'Nearby mapper: <a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>'
markers.addMarker( nearmarker ); var nearmarker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat)), near_icon.clone(), description);
nearmarker.events.register("click", "nearmarker", makeMarkerFunction( i ) );
} }
map.addControl(new OpenLayers.Control.LayerSwitcher());
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
map.events.register("click", map, setHome); map.events.register("click", map, setHome);
} }
function getTileURL( bounds ) { function setHome( e ) {
var res = this.map.getResolution(); closeMapPopup();
var x = Math.round ((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
var y = Math.round ((this.maxExtent.top - bounds.top) / (res * this.tileSize.h)); if (document.getElementById('updatehome').checked) {
var z = this.map.getZoom(); var merc = map.getLonLatFromViewPortPx(e.xy);
return this.url + z + "/" + x + "/" + y + "." + this.type; var lonlat = mercatorToLonLat(merc);
document.getElementById('homerow').className = '';
document.getElementById('home_lat').value = lonlat.lat;
document.getElementById('home_lon').value = lonlat.lon;
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(merc, null, "Your location");
}
} }
function makeMarkerFunction( i ) { window.onload = init;
return function() { markerOnClick( i ); };
}
function markerOnClick( i ) {
var html, position;
if( typeof( i ) == 'number' ) {
html = '<p>Nearby mapper: <a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a></p>';
html += '<p style="text-align:right">(<a href="#" onclick="return closePopup();">close</a>)</p>';
position = lonlat2mercator( new OpenLayers.LonLat( nearest[i].home_lon, nearest[i].home_lat ) );
} else {
html = '<p>Your location (<a href="#" onclick="return closePopup()">close</a>)</p>';
position = new OpenLayers.LonLat(mlon,mlat);
}
var box = document.getElementById( 'highlightinfo' );
box.innerHTML = html;
closePopup();
popup = new OpenLayers.Popup.AnchoredBubble( 'popup', position, new OpenLayers.Size( box.offsetWidth, box.offsetHeight ), html, OpenLayers.Marker.defaultIcon(), true );
map.addPopup( popup );
}
function closePopup() {
if( popup ) {
map.removePopup( popup );
delete popup;
}
return false;
}
function setHome( e ) {
closePopup();
if( ! document.getElementById( 'updatehome' ).checked )
return;
var lonlat = map.getLonLatFromViewPortPx(e.xy)
var lon_deg = (lonlat.lon / 20037508.34) * 180;
var lat_deg = (lonlat.lat / 20037508.34) * 180;
var PI = 3.14159265358979323846;
lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
var homerow = document.getElementById( 'homerow' );
var home_lat = document.getElementById( 'home_lat' );
var home_lon = document.getElementById( 'home_lon' );
homerow.className = '';
home_lat.value = lat_deg;
home_lon.value = lon_deg;
if( marker ) {
markers.removeMarker(marker);
}
marker = new OpenLayers.Marker(lonlat);
markers.addMarker(marker);
}
window.onload = init;
// --> // -->
</script> </script>

110
public/javascripts/map.js Normal file
View file

@ -0,0 +1,110 @@
var map;
var markers;
var popup;
function createMap(divName, centre, zoom) {
OpenLayers.Util.onImageLoadError = function() {
this.src = OpenLayers.Util.getImagesLocation() + "404.png";
}
map = new OpenLayers.Map(divName,
{ maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
numZoomLevels: 19,
maxResolution: 156543,
units: 'm',
projection: "EPSG:41001" });
var mapnik = new OpenLayers.Layer.TMS("Mapnik",
"http://tile.openstreetmap.org/",
{ type: 'png', getURL: getTileURL });
map.addLayer(mapnik);
var osmarender = new OpenLayers.Layer.TMS("Osmarender",
"http://dev.openstreetmap.org/~ojw/Tiles/tile.php/",
{ type: 'png', getURL: getTileURL });
map.addLayer(osmarender);
map.addControl(new OpenLayers.Control.LayerSwitcher());
map.setCenter(centre, zoom);
return map;
}
function getTileURL(bounds) {
var res = this.map.getResolution();
var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
var z = this.map.getZoom();
return this.url + z + "/" + x + "/" + y + "." + this.type;
}
function addMarkerToMap(position, icon, description) {
if (markers == null) {
markers = new OpenLayers.Layer.Markers("markers");
map.addLayer(markers);
}
var marker = new OpenLayers.Marker(position, icon);
markers.addMarker(marker);
if (description) {
marker.events.register("click", marker, function() { openMapPopup(marker, description) });
}
return marker;
}
function openMapPopup(marker, description) {
// var box = document.createElement("div");
// box.innerHTML = description;
// box.style.display = 'none';
// box.style.width = "200px";
// document.body.appendChild(box);
closeMapPopup();
popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
new OpenLayers.Size(200, 50),
"<p>" + description + "</p>",
marker.icon, true);
popup.setBackgroundColor("#E3FFC5");
map.addPopup(popup);
return popup;
}
function closeMapPopup() {
if (popup) {
map.removePopup(popup);
delete popup;
}
}
function removeMarkerFromMap(marker){
markers.removeMarker(marker);
}
function mercatorToLonLat(merc) {
var lon = (merc.lon / 20037508.34) * 180;
var lat = (merc.lat / 20037508.34) * 180;
var PI = 3.14159265358979323846;
lat = 180/PI * (2 * Math.atan(Math.exp(lat * PI / 180)) - PI / 2);
return new OpenLayers.LonLat(lon, lat);
}
function lonLatToMercator(ll) {
var lon = ll.lon * 20037508.34 / 180;
var lat = Math.log(Math.tan((90 + ll.lat) * PI / 360)) / (PI / 180);
lat = lat * 20037508.34 / 180;
return new OpenLayers.LonLat(lon, lat);
}
function scaleToZoom(scale) {
return Math.log(360.0/(scale * 512.0)) / Math.log(2.0);
}

4
public/stylesheets/site.css
View file

@ -470,10 +470,6 @@ input {
padding : 2px; padding : 2px;
} }
#popup p, #popup span {
background-color : #E3FFC5 !important;
}
#map p#highlightinfo p, #popup p { #map p#highlightinfo p, #popup p {
margin : 0; margin : 0;
padding : 2px; padding : 2px;