X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c241c3c312c998c06a47417231abf5636159bb22..c2333c603e1ad3352109a05150f2c47ad468f7ef:/app/views/site/index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 0c47227f8..f604267d8 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,9 +1,15 @@
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
   <% content_for :greeting do %>
-    <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
+    <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
   <% end %>
 <% end %>
 
+<% unless STATUS == :api_offline or STATUS == :database_offline -%>
+  <% content_for :editmenu do -%>
+    <li><%= link_to t("browse.start_rjs.data_layer_name"), "#", :id => "show_data" %></li>
+  <% end -%>
+<% end -%>
+
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
@@ -12,7 +18,6 @@
   <div id="noscript">
     <p><%= t 'site.index.js_1' %></p>
     <p><%= t 'site.index.js_2' %></p>
-    <p><%= t 'site.index.js_3' %></p>
   </div>
 </noscript>
 
@@ -129,14 +134,14 @@ end
   var marker;
   var map;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   function mapInit(){
     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,18 +149,18 @@ end
       <% if bbox %>
         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
-        setMapExtent(bbox);
+        map.zoomToExtent(proj(bbox));
 
         <% if box %>
           $(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 %>
@@ -186,44 +191,44 @@ end
     handleResize();
   }
 
-  function toggleData() {
-    if (map.dataLayer.visibility) {
+  $(document).ready(function () {
+    $("#show_data").click(function () {
       $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
-    } else if (map.dataLayer.active) {
-      closeSidebar();
-    }
-  }
-
-  function getPosition() {
-    return getMapCenter();
-  }
-
-  function getZoom() {
-    return getMapZoom();
-  }
-
-  function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
-    var centre = new OpenLayers.LonLat(lon, lat);
+    });
 
-    if (min_lon && min_lat && max_lon && max_lat) {
-      var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+    $("body").on("click", "a.set_position", function () {
+      var lat = parseFloat($(this).attr("data-lat"));
+      var lon = parseFloat($(this).attr("data-lon"));
+      var zoom = parseInt($(this).attr("data-zoom"));
+      var min_lon = parseFloat($(this).attr("data-min-lon"));
+      var min_lat = parseFloat($(this).attr("data-min-lat"));
+      var max_lon = parseFloat($(this).attr("data-max-lon"));
+      var max_lat = parseFloat($(this).attr("data-max-lat"));
+      var centre = new OpenLayers.LonLat(lon, lat);
+
+      if (min_lon && min_lat && max_lon && max_lat) {
+        var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+
+        map.zoomToExtent(proj(bbox));
+      } else {
+        setMapCenter(centre, zoom);
+      }
 
-      setMapExtent(bbox);
-    } else {
-      setMapCenter(centre, zoom);
-    }
+      if (marker) {
+        removeMarkerFromMap(marker);
+      }
 
-    if (marker)
-      removeMarkerFromMap(marker);
+      marker = addMarkerToMap(centre, getArrowIcon());
 
-    marker = addMarkerToMap(centre, getArrowIcon());
-  }
+      return false;
+    });
+  });
 
   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;
@@ -240,7 +245,7 @@ end
   }
 
   function remoteEditHandler(event) {
-    var extent = getMapExtent();
+    var extent = unproj(map.getExtent());
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
@@ -281,7 +286,7 @@ end
   $(document).ready(function () {
     $("#exportanchor").click(function (e) {
       $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
-      Event.stop(e);
+      e.preventDefault();
     });
 
     <% if params[:action] == 'export' -%>