Drop with_format and user the new :formats render option instead

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 2d04efe04fe6d068698bfb196d78bbb4442db485..d3af9bc156e0f448c490fcd8750dd91cf1d341c7 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,5 +1,4 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <iframe id="linkloader" style="display: none">
 <%= javascript_include_tag 'map.js' %>
 
 <iframe id="linkloader" style="display: none">


@@ -55,19 +54,19 @@
       var bottom = bbox.bottom - 0.0001;
       var loaded = false;
 
       var bottom = bbox.bottom - 0.0001;
       var loaded = false;
 

-      $("linkloader").observe("load", function () { loaded = true; });
+      $("#linkloader").load(function () { loaded = true; });

 
       if (select) {
 
       if (select) {

-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select;
+        $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);

       } else {
       } else {

-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom;
+        $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);

       }
 
       setTimeout(function () {
       }
 
       setTimeout(function () {

-        if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+        if (!loaded) alert("<%=j t('site.index.remote_failed') %>");

       }, 1000);
 
       }, 1000);
 

-      event.stop();
+      return false;

     }
 
     function init() {
     }
 
     function init() {


@@ -75,32 +74,30 @@
         controls: [ new OpenLayers.Control.Navigation() ]
       });
 
         controls: [ new OpenLayers.Control.Navigation() ]
       });
 

-      <% if map.instance_of? Changeset %>
-        var minlon = <%= map.min_lon / GeoRecord::SCALE.to_f %>;
-        var minlat = <%= map.min_lat / GeoRecord::SCALE.to_f %>;
-        var maxlon = <%= map.max_lon / GeoRecord::SCALE.to_f %>;
-        var maxlat = <%= map.max_lat / GeoRecord::SCALE.to_f %>;
+      <% if map.instance_of? Changeset -%>
+        <% bbox = map.bbox.to_unscaled %>
+        var minlon = <%= bbox.min_lon %>;
+        var minlat = <%= bbox.min_lat %>;
+        var maxlon = <%= bbox.max_lon %>;
+        var maxlat = <%= bbox.max_lat %>;

         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
         var centre = bbox.getCenterLonLat();
 
         setMapExtent(bbox);
         addBoxToMap(bbox);
 
         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
         var centre = bbox.getCenterLonLat();
 
         setMapExtent(bbox);
         addBoxToMap(bbox);
 

-        $("loading").style.display = "none";
+        $("#loading").hide();
+        $("#browse_map .geolink").show();

 
 

-        $$("#browse_map .geolink").each(function (link) {
-          link.style.display = "inline";
+        $("#remote_area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);

         });
 
         });
 

-        $("remote_area_edit").observe("click", function (event) {
-          remoteEditHandler(event, bbox);
+        <% if preferred_editor == "remote" -%>
+        $("#area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);

         });
         });

-
-        <% if preferred_editor == "remote" %>
-          $("area_edit").observe("click", function (event) {
-            remoteEditHandler(event, bbox);
-          });
-        <% end %>
+        <% end -%>

 
         updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
       <% elsif map.instance_of? Note %>
 
         updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
       <% elsif map.instance_of? Note %>


@@ -111,21 +108,18 @@
 
         var bbox = getMapExtent();
 
 
         var bbox = getMapExtent();
 

-        $("loading").style.display = "none";
+        $("#loading").hide();
+        $("#browse_map .geolink").show();

 
 

-        $$("#browse_map .geolink").each(function (link) {
-          link.style.display = "inline";
+        $("#remote_area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);

         });
 
         });
 

-        $("remote_area_edit").observe("click", function (event) {
-          remoteEditHandler(event, bbox);
+        <% if preferred_editor == "remote" -%>
+        $("#area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);

         });
         });

-
-        <% if preferred_editor == "remote" %>
-          $("area_edit").observe("click", function (event) {
-            remoteEditHandler(event, bbox);
-          });
-        <% end %>
+        <% end -%>

 
         updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
       <% else %>
 
         updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
       <% else %>


@@ -133,7 +127,7 @@
         var obj_id = <%= map.id %>;
         var obj_version = <%= map.version %>;
         var obj_visible = <%= map.visible %>;
         var obj_id = <%= map.id %>;
         var obj_version = <%= map.version %>;
         var obj_visible = <%= map.visible %>;

-        var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
+        var url = "/api/<%= API_VERSION %>/<%= map.class.name.downcase %>/<%= map.id %>";

 
         if (obj_type != "node") {
           url += "/full";
 
         if (obj_type != "node") {
           url += "/full";


@@ -143,42 +137,45 @@
         }
 
         addObjectToMap(url, true, function(extent) {
         }
 
         addObjectToMap(url, true, function(extent) {

-          $("loading").style.display = "none";
-
-          $$("#browse_map .geolink").each(function (link) {
-            link.style.display = "inline";
-          });
+          $("#loading").hide();
+          $("#browse_map .geolink").show();

 
           if (extent) {
             extent.transform(map.getProjectionObject(), map.displayProjection);
 
             var centre = extent.getCenterLonLat();
 
 
           if (extent) {
             extent.transform(map.getProjectionObject(), map.displayProjection);
 
             var centre = extent.getCenterLonLat();
 

-            $("remote_area_edit").observe("click", function (event) {
-              remoteEditHandler(event, extent);
+            $("#remote_area_edit").click(function (event) {
+              return remoteEditHandler(event, extent);

             });
 
             });
 

-            <% if preferred_editor == "remote" %>
-              $("area_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent);
-              });
-            <% end %>
+            <% if preferred_editor == "remote" -%>
+            $("#area_edit").click(function (event) {
+              return remoteEditHandler(event, extent);
+            });
+            <% end -%>

 
 

-            <% unless map.instance_of? Changeset %>
-              $("remote_object_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
-              });
+            <% unless map.instance_of? Changeset -%>
+            $("#remote_object_edit").click(function (event) {
+              return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+            });
+
+            <% if preferred_editor == "remote" -%>
+            $("#object_edit").click(function (event) {
+              return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+            });
+            <% end -%>

 
 

-              $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
-              $("object_edit").innerHTML = "<%= t('browse.map.edit.' + map.class.to_s.downcase) %>";
-            <% end %>
+            $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>");
+            $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>");
+            <% end -%>

 
 

-            updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>)
+            updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);

           } else {
           } else {

-            $("small_map").style.display = "none";
+            $("#small_map").hide();

           }
         });
           }
         });

-      <% end %>
+      <% end -%>

 
       createMenu("area_edit", "area_edit_menu", 1000, "right");
       createMenu("object_edit", "object_edit_menu", 1000, "right");
 
       createMenu("area_edit", "area_edit_menu", 1000, "right");
       createMenu("object_edit", "object_edit_menu", 1000, "right");