Merge branch 'master' into openstreetbugs

[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 71567b2c51da53adfa16c8b4ab7a9a7d45f1aebc..88489610994ac6c5934a60264729d0554105119c 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}, 15)", { :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();" } %>


@@ -17,24 +17,24 @@
 </noscript>
 
 <div id="map">
 </noscript>
 
 <div id="map">

+  <div id="permalink">
+    <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a>
+    <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+    <a href="#" id="createnoteanchor">Report a problem</a>     
+  </div>

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

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

 <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')


@@ -44,56 +44,62 @@
 </div>
 
 <%
 </div>
 
 <%

-if params['mlon'] and params['mlat']
+if params[:mlon] and params[:mlat]

     marker = true
     marker = true

-    mlon = h(params['mlon'])
-    mlat = h(params['mlat'])
+    mlon = params[:mlon].to_f
+    mlat = params[:mlat].to_f

 end
 
 end
 

-if params['node'] or params['way'] or params['relation']
+if params[:node] or params[:way] or params[:relation]

     object = true
     object_zoom = true
 
     object = true
     object_zoom = true
 

-    if params['node']
+    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['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+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
     bbox = true

-    minlon = h(params['minlon'])
-    minlat = h(params['minlat'])
-    maxlon = h(params['maxlon'])
-    maxlat = h(params['maxlat'])
-    layers = h(params['layers'])
-    box = true if params['box']=="yes"
+    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
     object_zoom = false

-elsif params['lon'] and params['lat']
-    lon =  h(params['lon'])
-    lat =  h(params['lat'])
-    zoom =  h(params['zoom'] || '5')
-    layers = h(params['layers'])
+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
     object_zoom = false

-elsif params['mlon'] and params['mlat']
-    lon = h(params['mlon'])
-    lat = h(params['mlat'])
-    zoom =  h(params['zoom'] || '12')
-    layers = h(params['layers'])
+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")
     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
     object_zoom = false
 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'
+    zoom = 10

 else
     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
 else
     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]


@@ -106,27 +112,30 @@ else
         maxlon = session[:location][:maxlon]
         maxlat = session[:location][:maxlat]
     else
         maxlon = session[:location][:maxlon]
         maxlat = session[:location][:maxlat]
     else

-        lon =  '-0.1'
-        lat =  '51.5'
-        zoom =  h(params['zoom'] || '5')
+        lon =  -0.1
+        lat =  51.5
+        zoom =  params.fetch(:zoom, 5).to_i

     end
 
     end
 

-    layers = h(params['layers'])
+    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' %>
 

-<script type="text/javascript" defer="defer">
-  <!--
-  var brokenContentSize = $("content").offsetWidth == 0;
+<%= render :partial => 'resize' %>
+
+<script type="text/javascript">

   var marker;
   var map;
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
   var marker;
   var map;
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 

+  <% if @user %>
+    var loginName = "<%= @user.display_name %>"
+  <% end %>
+

   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 


@@ -134,6 +143,65 @@ end
       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);
       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);

+
+      map.noteLayer = new OpenLayers.Layer.Vector("Notes", {
+          visibility: false,
+          projection: new OpenLayers.Projection("EPSG:4326"),
+          styleMap: new OpenLayers.StyleMap(new OpenLayers.Style({
+              graphicWidth: 22,
+              graphicHeight: 22,
+              graphicOpacity: 0.7,
+              graphicXOffset: -11,
+              graphicYOffset: -11
+          }, {
+              rules: [
+                  new OpenLayers.Rule({
+                      filter: new OpenLayers.Filter.Comparison({
+                          type: OpenLayers.Filter.Comparison.EQUAL_TO,
+                          property: "status",
+                          value: "open"
+                      }),
+                      symbolizer: {
+                          externalGraphic: "<%= image_path 'open_note_marker.png' %>"
+                      }
+                  }),
+                  new OpenLayers.Rule({
+                      filter: new OpenLayers.Filter.Comparison({
+                          type: OpenLayers.Filter.Comparison.EQUAL_TO,
+                          property: "status",
+                          value: "closed"
+                      }),
+                      symbolizer: {
+                          externalGraphic: "<%= image_path 'closed_note_marker.png' %>"
+                      }
+                 })
+              ]
+          })),
+          strategies: [
+              new OpenLayers.Strategy.BBOX()
+          ],
+          protocol: new OpenLayers.Protocol.HTTP({
+              url: "<%= url_for :controller => :note, :action => :list, :format => :json %>",
+              format: new OpenLayers.Format.GeoJSON(),
+              callback: noteCallback
+          })
+      });
+      map.noteLayer.events.register("featureselected", map, noteSelected);
+      map.noteLayer.events.register("featureunselected", map, noteUnselected);
+      map.addLayer(map.noteLayer);
+
+      map.noteControl = new OpenLayers.Control.SelectFeature(map.noteLayer, {
+          autoActivate: true
+      });
+      map.addControl(map.noteControl);
+
+      <% if params[:notes] == "yes" -%>
+      map.noteLayer.setVisibility(true);
+      <% end -%>
+
+      $("#createnoteanchor").click(addNote);
+
+      map.events.register("zoomend", map, allowNoteReports);

     <% end %>
 
     <% unless object_zoom %>
     <% end %>
 
     <% unless object_zoom %>


@@ -143,21 +211,18 @@ end
         setMapExtent(bbox);
 
         <% if box %>
         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) });
+          $(window).load(function() { addBoxToMap(bbox) });

         <% end %>
       <% else %>
         var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
         var zoom = <%= zoom %>;
 
         <% end %>
       <% 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() %>);
+        <% if params[:scale] and params[:scale].length > 0 then %>
+          zoom = scaleToZoom(<%= params[:scale].to_f %>);

         <% end %>
 
         setMapCenter(centre, zoom);
       <% end %>
         <% end %>
 
         setMapCenter(centre, zoom);
       <% end %>

-
-      updateLocation();

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


@@ -175,19 +240,19 @@ end
         url += "/full";
       <% end %>
 
         url += "/full";
       <% end %>
 

-      // IE requires Vector layers be initialised on page load, and not under deferred script conditions
-      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);
 
     <% end %>
 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
 

+    updateLocation();

     handleResize();
   }
 
   function toggleData() {
     if (map.dataLayer.visibility) {
     handleResize();
   }
 
   function toggleData() {
     if (map.dataLayer.visibility) {

-      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+      $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });

     } else if (map.dataLayer.active) {
       closeSidebar();
     }
     } else if (map.dataLayer.active) {
       closeSidebar();
     }


@@ -238,58 +303,25 @@ end
     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"));
-
-    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
-    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
-  }
-
-  function resizeMap() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-    var sidebar_width = $("sidebar").offsetWidth;
-
-    if (sidebar_width > 0) {
-      sidebar_width = sidebar_width + 5
-    }
-
-    $("map").style.left = (sidebar_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
-    $("map").style.height = ($("content").offsetHeight - 2) + "px";
-
-    map.setCenter(centre, zoom);
-  }
-
-  function handleResize() {
-    if (brokenContentSize) {
-      resizeContent();
-    }
-
-    resizeMap();
-  }
-

   function remoteEditHandler(event) {
     var extent = getMapExtent();
     var loaded = false;
 
   function remoteEditHandler(event) {
     var extent = getMapExtent();
     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 () {
 
     setTimeout(function () {

-      if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+      if (!loaded) alert("<%=j t('site.index.remote_failed') %>");

     }, 1000);
 
     }, 1000);
 

-    event.stop();
+    return false;

   }
 
   function installEditHandler() {
   }
 
   function installEditHandler() {

-    $("remoteanchor").observe("click", remoteEditHandler);
+    $("#remoteanchor").click(remoteEditHandler);

 
     <% if preferred_editor == "remote" %>
 
     <% if preferred_editor == "remote" %>

-      $("editanchor").observe("click", remoteEditHandler);
+      $("#editanchor").click(remoteEditHandler);

 
       <% if params[:action] == "edit" %>
         remoteEditHandler();
 
       <% if params[:action] == "edit" %>
         remoteEditHandler();


@@ -297,14 +329,72 @@ end
     <% end %>
   }
 
     <% end %>
   }
 

-  mapInit();
+  function noteCallback(scope, response) {
+    for (var f = 0; f < response.features.length; f++) {
+      var feature = response.features[f];
+    }
+  }

 
 

-  Event.observe(window, "load", installEditHandler);
-  Event.observe(window, "load", handleResize);
-  Event.observe(window, "resize", handleResize);
+  function noteSelected(o) {
+    var feature = o.feature;
+    var location = feature.geometry.getBounds().getCenterLonLat();

 
 

-  <% if params['action'] == 'export' %>
-  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
-  <% end %>
+    feature.popup = new OpenLayers.Popup.FramedCloud(
+      feature.attributes.id, location, null,
+      "<p>" + feature.attributes.id + "</p>",
+      null, true, function (e) { map.noteControl.unselect(feature) }
+    );
+
+    map.addPopup(feature.popup);
+//    feature.popup.show();
+  }
+
+  function noteUnselected(o) {
+    var feature = o.feature;
+
+    map.removePopup(feature.popup);
+    delete feature.popup;
+  }
+
+  function addNote() {
+    map.noteLayer.setVisibility(true);
+    map.noteLayer.addNote(map.getCenter());
+  }
+
+  function allowNoteReports() { 
+    if (map.getZoom() > 11) {
+      $("#createnoteanchor").show();
+    } else {
+      $("#createnoteanchor").hide();
+    }
+  }
+
+  $(document).ready(mapInit);
+  $(document).ready(installEditHandler);
+  $(document).ready(handleResize);
+
+  $(window).resize(function() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+
+    handleResize();
+
+    map.setCenter(centre, zoom);
+  });
+
+  $(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>