Prefer using _html locale keys to the raw function

[rails.git] / app / views / site / index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index a1ce52267e71e60d278ea83e7932726956c5014d..0c7b53203c88dd7817bb9b8114c5aeae19638da7 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,7 +1,7 @@
-<% content_for :greeting do %>

 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

-  <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
-<% end %>
+  <% content_for :greeting do %>
+    <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
+  <% end %>

 <% end %>
 
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <% end %>
 
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>


@@ -12,25 +12,27 @@
   <div id="noscript">
     <p><%= t 'site.index.js_1' %></p>
     <p><%= t 'site.index.js_2' %></p>
   <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>
 
 <div id="map">
   <div id="permalink">
   </div>
 </noscript>
 
 <div id="map">
   <div id="permalink">

-    <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
+    <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a>

     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
   </div>
     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
   </div>

-</div> 
+</div>
+
+<iframe id="linkloader" style="display: none">
+</iframe>

 
 <div id="attribution">
   <table width="100%">
     <tr>
 
 <div id="attribution">
   <table width="100%">
     <tr>

-      <td align="left"><%= t'site.index.license.license_url' %></td>
-      <td align="right"><%= t'site.index.license.project_url' %></td>
+      <td class="attribution_license"><%= t'site.index.license.license_url' %></td>
+      <td class="attribution_project"><%= t'site.index.license.project_url' %></td>

     </tr>
     <tr>
     </tr>
     <tr>

-      <td colspan="2" align="center"><%=
+      <td colspan="2" class="attribution_notice"><%=

         t'site.index.license.notice',
           :license_name => t('site.index.license.license_name'),
           :project_name => t('site.index.license.project_name')
         t'site.index.license.notice',
           :license_name => t('site.index.license.license_name'),
           :project_name => t('site.index.license.project_name')


@@ -40,252 +42,245 @@
 </div>
 
 <%
 </div>
 
 <%

-if params['mlon'] and params['mlat'] 
-       marker = true
-       mlon = h(params['mlon'])
-       mlat = h(params['mlat'])
+if params[:mlon] and params[:mlat]
+    marker = true
+    mlon = params[:mlon].to_f
+    mlat = params[:mlat].to_f

 end
 
 end
 

-if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
-       bbox = true
-       minlon = h(params['minlon'])
-       minlat = h(params['minlat'])
-       maxlon = h(params['maxlon'])
-       maxlat = h(params['maxlat'])
-       box = true if params['box']=="yes" 
-end
-
-if params['node'] or params['way'] or params['relation']
+if params[:node] or params[:way] or params[:relation]

     object = true
     object = true

-    if params['node']
+    object_zoom = true
+
+    if params[:node]

         object_type = 'node'
         object_type = 'node'

-        object_id = h(params['node'])
-    elsif params['way']
+        object_id = params[:node].to_i
+    elsif params[:way]

         object_type = 'way'
         object_type = 'way'

-        object_id = h(params['way'])
-    elsif params['relation']
+        object_id = params[:way].to_i
+    elsif params[:relation]

         object_type = 'relation'
         object_type = 'relation'

-        object_id = h(params['relation'])
+        object_id = params[:relation].to_i

     end
 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this
     end
 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this

-if params['lon'] and params['lat']
-       # We only want to override the default 'object = true' zoom above
-       # if we get actual GET params, as opposed to say a cookie
-       lat_lon_zoom_via_params = true
-
-       lon =  h(params['lon'])
-       lat =  h(params['lat'])
-       zoom =  h(params['zoom'] || '5')
-       layers = h(params['layers'])
-       
-elsif params['mlon'] and params['mlat']
-       lon = h(params['mlon']) 
-       lat = h(params['mlat'])
-       zoom =  h(params['zoom'] || '12')
-       layers = h(params['layers'])
-       
+if params[:bbox]
+    bbox = true
+    minlon, minlat, maxlon, maxlat = params[:bbox].split(",").collect { |c| c.to_f }
+    layers = params[:layers]
+    box = true if params[:box] == "yes"
+    object_zoom = false
+elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat]
+    bbox = true
+    minlon = params[:minlon].to_f
+    minlat = params[:minlat].to_f
+    maxlon = params[:maxlon].to_f
+    maxlat = params[:maxlat].to_f
+    layers = params[:layers]
+    box = true if params[:box]=="yes"
+    object_zoom = false
+elsif params[:lon] and params[:lat]
+    lon =  params[:lon].to_f
+    lat =  params[:lat].to_f
+    zoom =  params.fetch(:zoom, 5).to_i
+    layers = params[:layers]
+    object_zoom = false
+elsif params[:mlon] and params[:mlat]
+    lon = params[:mlon].to_f
+    lat = params[:mlat].to_f
+    zoom =  params.fetch(:zoom, 12).to_i
+    layers = params[:layers]
+    object_zoom = false

 elsif cookies.key?("_osm_location")
 elsif cookies.key?("_osm_location")

-       lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-       
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
-       lon =  @user.home_lon
-       lat =  @user.home_lat
-       zoom = '10'
+    lon,lat,zoom,layers = cookies["_osm_location"].split("|")
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+    lon =  @user.home_lon
+    lat =  @user.home_lat
+    zoom = 10

 else
 else

-       session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
-
-       if session[:location]
-               bbox = true
-               minlon = session[:location][:minlon]
-               minlat = session[:location][:minlat]
-               maxlon = session[:location][:maxlon]
-               maxlat = session[:location][:maxlat]
-       else
-               lon =  '-0.1' 
-               lat =  '51.5' 
-               zoom =  h(params['zoom'] || '5') 
-       end
-       layers = h(params['layers']) 
+    unless STATUS == :database_readonly or STATUS == :database_offline
+      session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+    end
+
+    if session[:location]
+        bbox = true
+        minlon = session[:location][:minlon]
+        minlat = session[:location][:minlat]
+        maxlon = session[:location][:maxlon]
+        maxlat = session[:location][:maxlat]
+    else
+        lon =  -0.1
+        lat =  51.5
+        zoom =  params.fetch(:zoom, 5).to_i
+    end
+
+    layers = params[:layers]

 end
 %>
 
 end
 %>
 

-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <%= javascript_include_tag 'map.js' %>
 

+<%= render :partial => 'resize' %>

 
 

-<script type="text/javascript" defer="defer">
-  <!--
-  var brokenContentSize = $("content").offsetWidth == 0;
+<script type="text/javascript">

   var marker;
   var map;
   var marker;
   var map;

-  var obj_type = false;
-  var obj_id = false;

 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
   function mapInit(){
     map = createMap("map");
 
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
   function mapInit(){
     map = createMap("map");
 

-    <% unless OSM_STATUS == :api_offline or OSM_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.addLayer(map.dataLayer);
+    <% unless STATUS == :api_offline or STATUS == :database_offline %>
+      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
+          visibility: false,
+          displayInLayerSwitcher: false
+      });
+      map.addLayer(map.dataLayer);

     <% end %>
 
     <% end %>
 

-    <% if bbox %>
-    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
-
-    setMapExtent(bbox);
-    <%    if box %>
-    // IE requires Vector layers be initialised on page load, and not under deferred script conditions
-    Event.observe(window, 'load', function() {addBoxToMap(bbox)});
-    <%    end %>
-    <% elsif object %>
-    // Display node/way/relation on the map
-    obj_type = "<%= object_type %>";
-    obj_id = <%= object_id %>;
-    var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
-
-    if (obj_type != "node") {
-        url += "/full";
-    }
-
-    var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
-        format: OpenLayers.Format.OSM,
-        projection: new OpenLayers.Projection("EPSG:4326")
-    });
-
-    osm_layer.events.register("loadend", osm_layer, function() {
-      if (this.features.length) {
-        var extent =  this.features[0].geometry.getBounds();
-          for (var i = 1; i < this.features.length; i++) {
-            extent.extend(this.features[i].geometry.getBounds());
-           }
-
-           <% unless lat_lon_zoom_via_params %>
-           if (extent) {
-             this.map.zoomToExtent(extent);
-           } else {
-             this.map.zoomToMaxExtent();
-           }
-           <% else %>
-           var center = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-           var zoom = <%= zoom %>;
-           <% end %>
-  
-           var center = getMapCenter();
-      }
-    });
-   
-    map.addLayer(osm_layer);
-    osm_layer.loadGML();
-    osm_layer.loaded = true;
-
-    <% else %>
-    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-    var zoom = <%= zoom %>;
-
-    <%    if params['scale'] and params['scale'].length > 0 then %>
-    zoom = scaleToZoom(<%= params['scale'].to_f() %>);
-    <%    end %>
-
-    setMapCenter(centre, zoom);
+    <% unless object_zoom %>
+      <% if bbox %>
+        var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+
+        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 %>;
+        <% end -%>
+
+        setMapCenter(centre, zoom);
+      <% end %>

     <% end %>
 
     <% if !layers.nil? and !layers.empty? %>
     <% end %>
 
     <% if !layers.nil? and !layers.empty? %>

-    setMapLayers("<%= layers %>");
+      setMapLayers("<%= layers %>");

     <% end %>
 
     <% if marker %>
     <% end %>
 
     <% if marker %>

-    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
+      marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
+    <% end %>
+
+    <% if object %>
+      var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
+
+      <% if object_type != "node" %>
+        url += "/full";
+      <% end %>
+
+      $(window).load(function() { addObjectToMap(url, <%= object_zoom %>) });

     <% end %>
 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
     <% end %>
 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);

-    updateLocation();

 
 

+    updateLocation();

     handleResize();
   }
 
     handleResize();
   }
 

-  function toggleData() {
-    if (map.dataLayer.visibility) {
-      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
-    } else {
-      closeSidebar();
-    }
-  }
-
-  function getPosition() {
-    return getMapCenter();
+  function showData() {
+    $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });

   }
 
   }
 

-  function setPosition(lat, lon, zoom) {
+  function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {

     var centre = new OpenLayers.LonLat(lon, lat);
 
     var centre = new OpenLayers.LonLat(lon, lat);
 

-    setMapCenter(centre, zoom);
+    if (min_lon && min_lat && max_lon && max_lat) {
+      var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);

 
 

-    if (marker)
+      map.zoomToExtent(proj(bbox));
+    } else {
+      setMapCenter(centre, zoom);
+    }
+
+    if (marker) {

       removeMarkerFromMap(marker);
       removeMarkerFromMap(marker);

+    }

 
     marker = addMarkerToMap(centre, getArrowIcon());
   }
 
   function updateLocation() {
 
     marker = addMarkerToMap(centre, getArrowIcon());
   }
 
   function updateLocation() {

-    var lonlat = getMapCenter();
+    var lonlat = unproj(map.getCenter());

     var zoom = map.getZoom();
     var layers = getMapLayers();
     var zoom = map.getZoom();
     var layers = getMapLayers();

-    var extents = getMapExtent();
+    var extents = unproj(map.getExtent());

     var expiry = new Date();
     var expiry = new Date();

+    var objtype;
+    var objid;

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, obj_type, obj_id);
+    <% if object %>
+      objtype = "<%= object_type %>";
+      objid = <%= object_id %>;
+    <% end %>
+
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);

 
 

-    expiry.setYear(expiry.getFullYear() + 10); 
+    expiry.setYear(expiry.getFullYear() + 10);

     document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
   }
 
     document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
   }
 

-  function resizeContent() {
-    var content = $("content");
-    var rightMargin = parseInt(getStyle(content, "right"));
-    var bottomMargin = parseInt(getStyle(content, "bottom"));
+  function remoteEditHandler(event) {
+    var extent = unproj(map.getExtent());
+    var loaded = false;
+
+    $("#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("<%=j t('site.index.remote_failed') %>");
+    }, 1000);

 
 

-    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
-    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
+    return false;

   }
   }

-  
-  function resizeMap() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-    var sidebar_width = $("sidebar").offsetWidth;

 
 

-    if (sidebar_width > 0) {
-      sidebar_width = sidebar_width + 5
-    }
+  function installEditHandler() {
+    $("#remoteanchor").click(remoteEditHandler);

 
 

-    $("map").style.left = (sidebar_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
-    $("map").style.height = ($("content").offsetHeight - 2) + "px";
+    <% if preferred_editor == "remote" %>
+      $("#editanchor").click(remoteEditHandler);

 
 

-    map.setCenter(centre, zoom);
+      <% if params[:action] == "edit" %>
+        remoteEditHandler();
+      <% end %>
+    <% end %>

   }
 
   }
 

-  function handleResize() {
-    if (brokenContentSize) {
-      resizeContent();
-    }
+  $(document).ready(mapInit);
+  $(document).ready(installEditHandler);
+  $(document).ready(handleResize);

 
 

-    resizeMap();
-  }
-  
-  mapInit();
+  $(window).resize(function() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+
+    handleResize();

 
 

-  window.onload = handleResize;
-  window.onresize = handleResize;
+    map.setCenter(centre, zoom);
+  });

 
 

-  <% if params['action'] == 'export' %>
-  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
-  <% end %>
+  $(document).ready(function () {
+    $("#exportanchor").click(function (e) {
+      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+      Event.stop(e);
+    });
+
+    <% if params[:action] == 'export' -%>
+    $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+    <% end -%>
+
+    <% if params[:query] -%>
+    doSearch("<%= params[:query] %>");
+    <% end %>
+  });

 // -->
 </script>
 // -->
 </script>