From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 8 Oct 2012 05:29:58 +0000 (-0700)
Subject: Use proj/unproj consistently
X-Git-Tag: live~5261
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/24c0bb1c88e1fca8ac1624bc909596926c2b53fa

Use proj/unproj consistently
---

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 9858db091..1c0b1b479 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -56,7 +56,7 @@ $(document).ready(function () {
       $("#browse_map .geolink").show();
 
       if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
+        extent = unproj(extent);
 
         var centre = extent.getCenterLonLat();
 
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 891e1c9bc..4f3351a76 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -100,7 +100,7 @@ $(document).ready(function () {
 
     function useMap(reload) {
       var bounds = map.getExtent();
-      var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
+      var projected = unproj(bounds);
 
       if (!browseBounds || !browseBounds.containsBounds(projected)) {
         var center = bounds.getCenterLonLat();
@@ -144,7 +144,7 @@ $(document).ready(function () {
 
     function endDrag(bbox) {
       var bounds = bbox.getBounds();
-      var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
+      var projected = unproj(bounds);
 
       browseBoxControl.deactivate();
       browseBounds = projected;
@@ -197,7 +197,7 @@ $(document).ready(function () {
     }
 
     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();
 
       if (size > OSM.MAX_REQUEST_AREA) {
diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index c5813dc1c..8696338ab 100644
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -15,9 +15,7 @@ $(document).ready(function () {
         box,
         transform,
         markerLayer,
-        markerControl,
-        epsg4326 = new OpenLayers.Projection("EPSG:4326"),
-        epsg900913 = new OpenLayers.Projection("EPSG:900913");
+        markerControl;
 
     vectors = new OpenLayers.Layer.Vector("Vector Layer", {
       displayInLayerSwitcher: false
@@ -83,7 +81,7 @@ $(document).ready(function () {
       var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
                                          $("#maxlon").val(), $("#maxlat").val());
 
-      return bounds.transform(epsg4326, epsg900913);
+      return proj(bounds);
     }
 
     function boundsChanged() {
@@ -157,7 +155,7 @@ $(document).ready(function () {
       $("#add_marker").html(I18n.t('export.start_rjs.change_marker'));
       $("#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_lat").val(geom.y.toFixed(5));
@@ -186,7 +184,7 @@ $(document).ready(function () {
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 
-      bounds = bounds.clone().transform(map.getProjectionObject(), epsg4326);
+      bounds = unproj(bounds);
 
       $("#minlon").val(toPrecision(bounds.left));
       $("#minlat").val(toPrecision(bounds.bottom));
@@ -247,8 +245,7 @@ $(document).ready(function () {
       // Create "larger map" link
       var center = bounds.getCenterLonLat();
 
-      bounds.transform(epsg4326, epsg900913);
-      var zoom = map.getZoomForExtent(bounds);
+      var zoom = map.getZoomForExtent(proj(bounds));
 
       var layers = getMapLayers();
 
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 529934048..c06c9c8ea 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -219,7 +219,7 @@ function setMapCenter(center, zoom) {
 }
 
 function getEventPosition(event) {
-   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+   return unproj(map.getLonLatFromViewPortPx(event.xy));
 }
 
 function getMapLayers() {