Only show "Report a problem" link at zoom level 12 and higher

[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 9d883daf90c6b0f84757c6a5150ed646c16d337c..5d78b23407a477e84977a0f722723e85d4b83bbd 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 %>
 


@@ -24,7 +24,8 @@
 
 <div id="permalink">
   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
 
 <div id="permalink">
   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>

-  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
+  <a href="javascript:void();" id="ReportBug" class="reportProblem">Report a problem</a>       

 </div>
 
 <div id="attribution">
 </div>
 
 <div id="attribution">


@@ -66,18 +67,17 @@ if params['node'] or params['way'] or params['relation']
     end
 end
 
     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']
     bbox = true
     minlon = h(params['minlon'])
     minlat = h(params['minlat'])
     maxlon = h(params['maxlon'])
     maxlat = h(params['maxlat'])
 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'])

+    layers = h(params['layers'])

     box = true if params['box']=="yes"
     object_zoom = false
     box = true if params['box']=="yes"
     object_zoom = false

-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['lon'] and params['lat']
+elsif params['lon'] and params['lat']

     lon =  h(params['lon'])
     lat =  h(params['lat'])
     zoom =  h(params['zoom'] || '5')
     lon =  h(params['lon'])
     lat =  h(params['lat'])
     zoom =  h(params['zoom'] || '5')


@@ -114,8 +114,11 @@ else
 end
 %>
 
 end
 %>
 

-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<!--Use stock OpenLayers for now, as the OSM one is missing some needed classes-->
+<script src="http://www.openlayers.org/api/OpenLayers.js"></script>
+<!-- < %= javascript_include_tag '/openlayers/OpenLayers.js' % > -->

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

+<%= javascript_include_tag 'openstreetbugs.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript" defer="defer">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript" defer="defer">


@@ -126,6 +129,10 @@ end
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
 
   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");
 


@@ -133,6 +140,33 @@ 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.osbLayer = new OpenLayers.Layer.OpenStreetBugs("OpenStreetBugs", {
+          serverURL : "/api/0.6/",
+          iconOpen : new OpenLayers.Icon("/images/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
+          iconClosed : new OpenLayers.Icon("/images/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
+          readonly : false,
+          setCookie : false,
+          cookieLifetime : 1000, 
+          cookiePath : "/my/map/", 
+          permalinkURL : "http://www.openstreetmap.org/", 
+          theme : "/stylesheets/openstreetbugs.css" 
+      });
+
+      map.addLayer(map.osbLayer);
+
+      map.osbControl = new OpenLayers.Control.OpenStreetBugs(map.osbLayer); 
+         
+      map.addControl(map.osbControl);
+               
+         var lBug = document.getElementById('ReportBug');
+      lBug.addEventListener('click',function (e) {
+               map.osbControl.activate(); document.getElementById("OpenLayers.Map_18_OpenLayers_Container").style.cursor = "crosshair" },false);
+
+     map.events.register("zoomend",map,function () { var zoom = map.getZoom(); var lBug = document.getElementById('ReportBug')
+        if (zoom > 11) { lBug.style.visibility = 'visible';} else {lBug.style.visibility = "hidden";}});
+
+

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


@@ -270,7 +304,7 @@ end
     resizeMap();
   }
 
     resizeMap();
   }
 

-  function josmEditHandler(event) {
+  function remoteEditHandler(event) {

     var extent = getMapExtent();
     var loaded = false;
 
     var extent = getMapExtent();
     var loaded = false;
 


@@ -278,20 +312,20 @@ end
     $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
 
     setTimeout(function () {
     $("linkloader").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("<%= t('site.index.josm_failed') %>");
+      if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");

     }, 1000);
 
     event.stop();
   }
 
   function installEditHandler() {
     }, 1000);
 
     event.stop();
   }
 
   function installEditHandler() {

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

 
 

-    <% if preferred_editor == "josm" %>
-      $("editanchor").observe("click", josmEditHandler);
+    <% if preferred_editor == "remote" %>
+      $("editanchor").observe("click", remoteEditHandler);

 
       <% if params[:action] == "edit" %>
 
       <% if params[:action] == "edit" %>

-        josmEditHandler();
+        remoteEditHandler();

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