X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e4ceec192572936f5618d6e834bd5cea4f26b80..69d91bf24aa38c22640749c2e3b371f34a70ef6d:/app/views/changeset/_map.html.erb?ds=sidebyside diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb index 39906af08..d20813d62 100644 --- a/app/views/changeset/_map.html.erb +++ b/app/views/changeset/_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' %>
@@ -29,20 +28,20 @@ vectors.addFeatures(highlight); - $("tr-changeset-" + id).addClassName("selected"); + $("#tr-changeset-" + id).addClass("selected"); } function unHighlightChangeset(id) { vectors.removeFeatures(highlight); - $("tr-changeset-" + id).removeClassName("selected"); + $("#tr-changeset-" + id).removeClass("selected"); } - function init() { + $(document).ready(function () { var map = createMap("changeset_list_map", { controls: [ new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom(), + new OpenLayers.Control.Zoom(), new OpenLayers.Control.PanZoomBar() ] }); @@ -50,16 +49,19 @@ var bounds = new OpenLayers.Bounds(); <% @edits.each do |edit| %> - var minlon = <%= edit.min_lon / GeoRecord::SCALE.to_f %>; - var minlat = <%= edit.min_lat / GeoRecord::SCALE.to_f %>; - var maxlon = <%= edit.max_lon / GeoRecord::SCALE.to_f %>; - var maxlat = <%= edit.max_lat / GeoRecord::SCALE.to_f %>; + <% if edit.has_valid_bbox? %> + <% bbox = edit.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); bounds.extend(bbox); addBoxToMap(bbox, "<%= edit.id %>", true); <% end %> + <% end %> vectors.events.on({ "featureselected": function(feature) { @@ -78,11 +80,9 @@ selectControl.activate(); <% if ! @bbox.nil? %> - setMapExtent(new OpenLayers.Bounds(<%= @bbox %>)); + map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>))); <% else %> - setMapExtent(bounds); + map.zoomToExtent(proj(bounds)); <% end %> - } - - Event.observe(window, "load", init); + });