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

Use proj/unproj consistently

Browse source
This commit is contained in:
John Firebaugh 2012-10-07 22:29:58 -07:00 • committed by Tom Hughes
parent b95f9115d7
commit 24c0bb1c88
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/browse.js
View file

@ -56,7 +56,7 @@ $(document).ready(function () {
$("#browse_map .geolink").show(); $("#browse_map .geolink").show();
if (extent) { if (extent) {
extent.transform(map.getProjectionObject(), map.displayProjection); extent = unproj(extent);
var centre = extent.getCenterLonLat(); var centre = extent.getCenterLonLat();

6
app/assets/javascripts/index/browse.js
View file

@ -100,7 +100,7 @@ $(document).ready(function () {
function useMap(reload) { function useMap(reload) {
var bounds = map.getExtent(); var bounds = map.getExtent();
var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326); var projected = unproj(bounds);
if (!browseBounds || !browseBounds.containsBounds(projected)) { if (!browseBounds || !browseBounds.containsBounds(projected)) {
var center = bounds.getCenterLonLat(); var center = bounds.getCenterLonLat();
@ -144,7 +144,7 @@ $(document).ready(function () {
function endDrag(bbox) { function endDrag(bbox) {
var bounds = bbox.getBounds(); var bounds = bbox.getBounds();
var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326); var projected = unproj(bounds);
browseBoxControl.deactivate(); browseBoxControl.deactivate();
browseBounds = projected; browseBounds = projected;
@ -197,7 +197,7 @@ $(document).ready(function () {
} }
function getData(bounds, reload) { function getData(bounds, reload) {
var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); var projected = unproj(bounds);
var size = projected.getWidth() * projected.getHeight(); var size = projected.getWidth() * projected.getHeight();
if (size > OSM.MAX_REQUEST_AREA) { if (size > OSM.MAX_REQUEST_AREA) {

13
app/assets/javascripts/index/export.js
View file

@ -15,9 +15,7 @@ $(document).ready(function () {
box, box,
transform, transform,
markerLayer, markerLayer,
markerControl, markerControl;
epsg4326 = new OpenLayers.Projection("EPSG:4326"),
epsg900913 = new OpenLayers.Projection("EPSG:900913");
vectors = new OpenLayers.Layer.Vector("Vector Layer", { vectors = new OpenLayers.Layer.Vector("Vector Layer", {
displayInLayerSwitcher: false displayInLayerSwitcher: false
@ -83,7 +81,7 @@ $(document).ready(function () {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
$("#maxlon").val(), $("#maxlat").val()); $("#maxlon").val(), $("#maxlat").val());
return bounds.transform(epsg4326, epsg900913); return proj(bounds);
} }
function boundsChanged() { function boundsChanged() {
@ -157,7 +155,7 @@ $(document).ready(function () {
$("#add_marker").html(I18n.t('export.start_rjs.change_marker')); $("#add_marker").html(I18n.t('export.start_rjs.change_marker'));
$("#marker_inputs").show(); $("#marker_inputs").show();
var geom = event.feature.geometry.clone().transform(epsg900913, epsg4326); var geom = unproj(event.feature.geometry);
$("#marker_lon").val(geom.x.toFixed(5)); $("#marker_lon").val(geom.x.toFixed(5));
$("#marker_lat").val(geom.y.toFixed(5)); $("#marker_lat").val(geom.y.toFixed(5));
@ -186,7 +184,7 @@ $(document).ready(function () {
function setBounds(bounds) { function setBounds(bounds) {
var toPrecision = zoomPrecision(map.getZoom()); var toPrecision = zoomPrecision(map.getZoom());
bounds = bounds.clone().transform(map.getProjectionObject(), epsg4326); bounds = unproj(bounds);
$("#minlon").val(toPrecision(bounds.left)); $("#minlon").val(toPrecision(bounds.left));
$("#minlat").val(toPrecision(bounds.bottom)); $("#minlat").val(toPrecision(bounds.bottom));
@ -247,8 +245,7 @@ $(document).ready(function () {
// Create "larger map" link // Create "larger map" link
var center = bounds.getCenterLonLat(); var center = bounds.getCenterLonLat();
bounds.transform(epsg4326, epsg900913); var zoom = map.getZoomForExtent(proj(bounds));
var zoom = map.getZoomForExtent(bounds);
var layers = getMapLayers(); var layers = getMapLayers();

2
app/assets/javascripts/map.js.erb
View file

@ -219,7 +219,7 @@ function setMapCenter(center, zoom) {
} }
function getEventPosition(event) { function getEventPosition(event) {
return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326); return unproj(map.getLonLatFromViewPortPx(event.xy));
} }
function getMapLayers() { function getMapLayers() {