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

Get rid of our reprojection code and use OpenLayers reprojection instead.

Browse source
This commit is contained in:
Tom Hughes 2008-04-16 17:18:45 +00:00
parent 430fa39118
commit b8c500cdbc
4 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,20 +87,18 @@ by the OpenStreetMap project and it's contributors.
map = createMap("map");
<% if bbox %>
var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
map.zoomToExtent(bbox);
setMapExtent(bbox);
<% else %>
var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
var zoom = <%= zoom %>;
<% if params['scale'] and params['scale'].length > 0 then %>
zoom = scaleToZoom(<%= params['scale'].to_f() %>);
<% end %>
map.setCenter(centre, zoom);
setMapCenter(centre, zoom);
<% end %>
<% if layers %>
@ -108,7 +106,7 @@ by the OpenStreetMap project and it's contributors.
<% end %>
<% if marker %>
marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
<% end %>
map.events.register("zoomend", map, updateKey);
@ -121,11 +119,11 @@ by the OpenStreetMap project and it's contributors.
}
function getPosition() {
return mercatorToLonLat(map.getCenter());
return getMapCenter();
}
function setPosition(lat, lon, zoom) {
var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
var centre = new OpenLayers.LonLat(lon, lat);
map.setCenter(centre, zoom);
@ -136,7 +134,7 @@ by the OpenStreetMap project and it's contributors.
}
function updateLocation() {
var lonlat = mercatorToLonLat(map.getCenter());
var lonlat = getMapCenter();
var zoom = map.getZoom();
var layers = getMapLayers();