First pass at banishing the words "bug" and "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 a69a6b4ee15ec931417cbbba9cdd763f4cc85329..fa790dbb1bcf999f468ec6fc340ec97b2d6b5eb2 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
 <% content_for :greeting do %>
 <% 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') } %> |
+  <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |

 <% end %>
 <% end %>
 
 <% end %>
 <% end %>
 


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

-<div id="permalink"><a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a></div>
-</div> 
+  <div id="permalink">
+    <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a><br/>
+    <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 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')


@@ -37,113 +44,166 @@
 </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 = h(params['mlon'])
+    mlat = h(params['mlat'])

 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" 
+if params['node'] or params['way'] or params['relation']
+    object = true
+    object_zoom = true
+
+    if params['node']
+        object_type = 'node'
+        object_id = h(params['node'])
+    elsif params['way']
+        object_type = 'way'
+        object_id = h(params['way'])
+    elsif params['relation']
+        object_type = 'relation'
+        object_id = h(params['relation'])
+    end

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

-if params['lon'] and params['lat'] 
-       lon =  h(params['lon'])
-       lat =  h(params['lat'])
-       zoom =  h(params['zoom'] || '5')
-       layers = h(params['layers'])
-       
+if params['bbox']
+    bbox = true
+    minlon, minlat, maxlon, maxlat = h(params['bbox']).split(",")
+    layers = h(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 = 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"
+    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'])
+    object_zoom = false

 elsif params['mlon'] and params['mlat']
 elsif params['mlon'] and params['mlat']

-       lon = h(params['mlon']) 
-       lat = h(params['mlat'])
-       zoom =  h(params['zoom'] || '12')
-       layers = h(params['layers'])
-       
+    lon = h(params['mlon'])
+    lat = h(params['mlat'])
+    zoom =  h(params['zoom'] || '12')
+    layers = h(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 =  h(params['zoom'] || '5')
+    end
+
+    layers = h(params['layers'])

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

+<%= javascript_include_tag 'notes.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;
 
   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");
 

-    <% 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 });
+      map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+      map.addLayer(map.dataLayer);
+
+      map.noteLayer = new OpenLayers.Layer.Notes("Notes", {
+          setCookie: false,
+          permalinkURL: "http://www.openstreetmap.org/",
+          visibility: <%= params[:notes] == "yes" %>
+      });
+      map.addLayer(map.noteLayer);
+
+      map.noteControl = new OpenLayers.Control.Notes(map.noteLayer); 
+      map.addControl(map.noteControl);
+
+      $("createnoteanchor").observe("click", addNote);
+
+      map.events.register("zoomend", map, allowNoteReports);

     <% end %>
 
     <% end %>
 

-    <% if bbox %>
-    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+    <% unless object_zoom %>
+      <% if bbox %>
+        var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+
+        setMapExtent(bbox);

 
 

-    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 %>
-    <% else %>
-    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-    var zoom = <%= zoom %>;
+        <% if box %>
+          Event.observe(window, "load", function() { addBoxToMap(bbox) });
+        <% 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() %>);
-    <%    end %>
+        <% if params['scale'] and params['scale'].length > 0 then %>
+          zoom = scaleToZoom(<%= params['scale'].to_f() %>);
+        <% end %>

 
 

-    setMapCenter(centre, zoom);
+        setMapCenter(centre, zoom);
+      <% end %>
+
+      updateLocation();

     <% 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 %>
 
     <% end %>
 

-    map.events.register("zoomend", map, updateKey);
+    <% if object %>
+      var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
+
+      <% if object_type != "node" %>
+        url += "/full";
+      <% end %>
+
+      Event.observe(window, "load", function() { addObjectToMap(url, <%= object_zoom %>) });
+    <% end %>

 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);

-    updateLocation();

 
     handleResize();
   }
 
     handleResize();
   }


@@ -151,7 +211,7 @@ end
   function toggleData() {
     if (map.dataLayer.visibility) {
       <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
   function toggleData() {
     if (map.dataLayer.visibility) {
       <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>

-    } else {
+    } else if (map.dataLayer.active) {

       closeSidebar();
     }
   }
       closeSidebar();
     }
   }


@@ -160,10 +220,20 @@ end
     return getMapCenter();
   }
 
     return getMapCenter();
   }
 

-  function setPosition(lat, lon, zoom) {
+  function getZoom() {
+    return getMapZoom();
+  }
+
+  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);
+
+      setMapExtent(bbox);
+    } else {
+      setMapCenter(centre, zoom);
+    }

 
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);


@@ -177,53 +247,73 @@ end
     var layers = getMapLayers();
     var extents = getMapExtent();
     var expiry = new Date();
     var layers = getMapLayers();
     var extents = getMapExtent();
     var expiry = new Date();

+    var objtype;
+    var objid;

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top);
+    <% 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 = 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;

 
 

-    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
-    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
+    setTimeout(function () {
+      if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+    }, 1000);
+
+    event.stop();

   }
   }

-  
-  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").observe("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").observe("click", remoteEditHandler);

 
 

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

   }
 
   }
 

-  function handleResize() {
-    if (brokenContentSize) {
-      resizeContent();
-    }
+  function addNote() {
+    map.noteControl.activate();
+    map.noteControl.addTemporaryMarker(map.getCenter());
+  }

 
 

-    resizeMap();
+  function allowNoteReports() { 
+    if (map.getZoom() > 11) {
+      $("createnoteanchor").style.visibility = "visible";
+    } else {
+      $("createnoteanchor").style.visibility = "hidden";
+    }

   }
   }

-  
-  mapInit();

 
 

-  window.onload = handleResize;
-  window.onresize = handleResize;
+  document.observe("dom:loaded", mapInit);
+  document.observe("dom:loaded", installEditHandler);
+  document.observe("dom:loaded", handleResize);
+
+  Event.observe(window, "resize", function() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+
+    handleResize();
+
+    map.setCenter(centre, zoom);
+  });

 
   <% if params['action'] == 'export' %>
   <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
   <% end %>
 
   <% if params['action'] == 'export' %>
   <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
   <% end %>

-// -->

 </script>
 </script>