Correct projection problems on database #87 - Filter categories for moderator by area #88

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@72 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

5 files changed, 13 insertions, 7 deletions

diff --git a/chimere/static/base.js b/chimere/static/base.js
index 449cc0f..70b8742 100644
--- a/chimere/static/base.js
+++ b/chimere/static/base.js
@@ -64,8 +64,9 @@ function zoomToCurrentExtent(map){
                                        current_extent[2], current_extent[3]);
     }
     else if (OpenLayers && default_area && default_area.length == 4){
-        extent = new OpenLayers.Bounds(default_area[1], default_area[0],
-                                       default_area[3], default_area[2]);
+        extent = new OpenLayers.Bounds(default_area[0], default_area[1],
+                                       default_area[2], default_area[3]);
+        extent.transform(epsg_display_projection, epsg_projection);
     }
     else{
         return;
diff --git a/chimere/static/edit_area.js b/chimere/static/edit_area.js
index 4daccf3..7695e6b 100644
--- a/chimere/static/edit_area.js
+++ b/chimere/static/edit_area.js
@@ -22,7 +22,8 @@ var map;
 
 /* update form fields on zoom action */
 function updateForm(){
-    var bounds = map.getExtent();
+    var bounds = map.getExtent().transform(epsg_projection,
+                                           epsg_display_projection);
     document.getElementById('upper_left_lat').value = bounds.top;
     document.getElementById('upper_left_lon').value = bounds.left;
     document.getElementById('lower_right_lat').value = bounds.bottom;
diff --git a/chimere/static/edit_map.js b/chimere/static/edit_map.js
index 8f37f6b..88237a4 100644
--- a/chimere/static/edit_map.js
+++ b/chimere/static/edit_map.js
@@ -47,8 +47,8 @@ var putMarker = function (lonlat, zoom){
                                       epsg_display_projection);
     document.getElementById('id_point').value = 'POINT(' + lonlat.lon +
                                                 ' ' + lonlat.lat + ')';
-    document.getElementById('live_latitude').value = lonlat.lon;
-    document.getElementById('live_longitude').value = lonlat.lat;
+    document.getElementById('live_latitude').value = lonlat.lat;
+    document.getElementById('live_longitude').value = lonlat.lon;
     /*zoom to the point*/
     if (zoom){
         var bounds = layerMarkers.getDataExtent();
diff --git a/chimere/static/edit_route_map.js b/chimere/static/edit_route_map.js
index dcf7c84..28a0498 100644
--- a/chimere/static/edit_route_map.js
+++ b/chimere/static/edit_route_map.js
@@ -39,7 +39,6 @@ function featureCreated(event) {
         help_route_create.style.display = 'None';
     }
     document.getElementById('help-route-modify').style.display = 'block';
-    
     pathModify.activate();
     updateForm(event);
     pathModify.selectControl.select(event.feature);
@@ -56,6 +55,7 @@ function initFeature(json_geometry){
         point_array.push(point);
     }
     var linestring = new OpenLayers.Geometry.LineString(point_array);
+    linestring.transform(epsg_display_projection, map.getProjectionObject());
     currentFeature = new OpenLayers.Feature.Vector();
     currentFeature.geometry = linestring;
     vectors.addFeatures([currentFeature]);
@@ -68,7 +68,10 @@ function initFeature(json_geometry){
 function updateForm(event) {
     /* update the form */
     currentFeature = event.feature;
-    document.getElementById('id_route').value = currentFeature.geometry;
+    var current_geo = currentFeature.geometry.clone();
+    current_geo.transform(map.getProjectionObject(),
+                          epsg_display_projection);
+    document.getElementById('id_route').value = current_geo;
 }
 
 
diff --git a/chimere/static/main_map.js b/chimere/static/main_map.js
index 8137b03..5c698c1 100644
--- a/chimere/static/main_map.js
+++ b/chimere/static/main_map.js
@@ -287,6 +287,7 @@ function putRoute(layer, route) {
         point_array.push(point);
     }
     var linestring = new OpenLayers.Geometry.LineString(point_array);
+    linestring.transform(epsg_display_projection, map.getProjectionObject());
     currentFeature = new OpenLayers.Feature.Vector();
 
     var style = OpenLayers.Util.extend({},