X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c397321c9309eb9cd4dfed21375fc821a8d2d37..ec1667fc093976cb9a69e5aba675ee4281d7ff64:/app/views/site/index.html.erb?ds=sidebyside diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 6cff7f133..0c7b53203 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -12,7 +12,6 @@

<%= t 'site.index.js_1' %>

<%= t 'site.index.js_2' %>

-

<%= t 'site.index.js_3' %>

@@ -135,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 %> @@ -144,7 +145,7 @@ end <% if bbox %> var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>); - map.setExtent(proj(bbox)); + map.zoomToExtent(proj(bbox)); <% if box %> $(window).load(function() { addBoxToMap(bbox) }); @@ -186,12 +187,8 @@ end handleResize(); } - function toggleData() { - if (map.dataLayer.visibility) { - $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" }); - } else if (map.dataLayer.active) { - closeSidebar(); - } + function showData() { + $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" }); } function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) { @@ -200,7 +197,7 @@ end if (min_lon && min_lat && max_lon && max_lat) { var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat); - map.setExtent(proj(bbox)); + map.zoomToExtent(proj(bbox)); } else { setMapCenter(centre, zoom); }