X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/35e60d4d7b30aa99a9c515554d00c6d6f5fc2099..c5152d1860a2c5164355eeeb78f4a092ceb55cc8:/app/views/site/index.html.erb
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 71cafacbc..0c7b53203 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -12,13 +12,12 @@
<%= t 'site.index.js_1' %>
<%= t 'site.index.js_2' %>
-
<%= t 'site.index.js_3' %>
@@ -120,8 +119,7 @@ else
end
%>
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
<%= javascript_include_tag 'map.js' %>
<%= render :partial => 'resize' %>
@@ -136,8 +134,10 @@ end
map = createMap("map");
<% unless STATUS == :api_offline or STATUS == :database_offline %>
- map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
- map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+ map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
+ visibility: false,
+ displayInLayerSwitcher: false
+ });
map.addLayer(map.dataLayer);
<% end %>
@@ -145,23 +145,21 @@ end
<% if bbox %>
var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
- setMapExtent(bbox);
+ map.zoomToExtent(proj(bbox));
<% if box %>
- Event.observe(window, "load", function() { addBoxToMap(bbox) });
+ $(window).load(function() { addBoxToMap(bbox) });
<% end %>
<% else %>
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
+ <% if params[:scale].to_f > 0 then -%>
+ var zoom = <%= scale_to_zoom params[:scale] %>;
+ <% else -%>
var zoom = <%= zoom %>;
-
- <% if params[:scale] and params[:scale].length > 0 then %>
- zoom = scaleToZoom(<%= params[:scale].to_f %>);
- <% end %>
+ <% end -%>
setMapCenter(centre, zoom);
<% end %>
-
- updateLocation();
<% end %>
<% if !layers.nil? and !layers.empty? %>
@@ -179,29 +177,18 @@ end
url += "/full";
<% end %>
- Event.observe(window, "load", function() { addObjectToMap(url, <%= object_zoom %>) });
+ $(window).load(function() { addObjectToMap(url, <%= object_zoom %>) });
<% end %>
map.events.register("moveend", map, updateLocation);
map.events.register("changelayer", map, updateLocation);
+ updateLocation();
handleResize();
}
- function toggleData() {
- if (map.dataLayer.visibility) {
- <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
- } else if (map.dataLayer.active) {
- closeSidebar();
- }
- }
-
- function getPosition() {
- return getMapCenter();
- }
-
- function getZoom() {
- return getMapZoom();
+ function showData() {
+ $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
}
function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
@@ -210,22 +197,23 @@ end
if (min_lon && min_lat && max_lon && max_lat) {
var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
- setMapExtent(bbox);
+ map.zoomToExtent(proj(bbox));
} else {
setMapCenter(centre, zoom);
}
- if (marker)
+ if (marker) {
removeMarkerFromMap(marker);
+ }
marker = addMarkerToMap(centre, getArrowIcon());
}
function updateLocation() {
- var lonlat = getMapCenter();
+ var lonlat = unproj(map.getCenter());
var zoom = map.getZoom();
var layers = getMapLayers();
- var extents = getMapExtent();
+ var extents = unproj(map.getExtent());
var expiry = new Date();
var objtype;
var objid;
@@ -242,24 +230,24 @@ end
}
function remoteEditHandler(event) {
- var extent = getMapExtent();
+ var extent = unproj(map.getExtent());
var loaded = false;
- $("linkloader").observe("load", function () { loaded = true; });
- $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
+ $("#linkloader").load(function () { loaded = true; });
+ $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
setTimeout(function () {
- if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+ if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
}, 1000);
- event.stop();
+ return false;
}
function installEditHandler() {
- $("remoteanchor").observe("click", remoteEditHandler);
+ $("#remoteanchor").click(remoteEditHandler);
<% if preferred_editor == "remote" %>
- $("editanchor").observe("click", remoteEditHandler);
+ $("#editanchor").click(remoteEditHandler);
<% if params[:action] == "edit" %>
remoteEditHandler();
@@ -267,11 +255,11 @@ end
<% end %>
}
- document.observe("dom:loaded", mapInit);
- document.observe("dom:loaded", installEditHandler);
- document.observe("dom:loaded", handleResize);
+ $(document).ready(mapInit);
+ $(document).ready(installEditHandler);
+ $(document).ready(handleResize);
- Event.observe(window, "resize", function() {
+ $(window).resize(function() {
var centre = map.getCenter();
var zoom = map.getZoom();
@@ -280,14 +268,18 @@ end
map.setCenter(centre, zoom);
});
- document.observe("dom:loaded", function () {
- $("exportanchor").observe("click", function (e) {
- <%= remote_function :url => { :controller => 'export', :action => 'start' } %>;
+ $(document).ready(function () {
+ $("#exportanchor").click(function (e) {
+ $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
Event.stop(e);
});
- <% if params[:action] == 'export' %>
- <%= remote_function :url => { :controller => 'export', :action => 'start' } %>;
+ <% if params[:action] == 'export' -%>
+ $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+ <% end -%>
+
+ <% if params[:query] -%>
+ doSearch("<%= params[:query] %>");
<% end %>
});
// -->