Merge branch 'master' into notes

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 8c28644b11f06df0540a12af7d8f2f7a5ec1bbb5..f694d04644ebfcdd0228d39d701b98ada8409481 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -2,7 +2,7 @@
 </iframe>
 
 <div id="browse_map">
 </iframe>
 
 <div id="browse_map">

-  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>

 
   <% content_for :head do %>
     <%= javascript_include_tag "browse" %>
 
   <% content_for :head do %>
     <%= javascript_include_tag "browse" %>


@@ -23,7 +23,7 @@
        data = {
          :type => "note",
          :lon  => map.lon,
        data = {
          :type => "note",
          :lon  => map.lon,

-         :lon  => map.lat
+         :lat  => map.lat

        }
      else
        data = {
        }
      else
        data = {


@@ -39,7 +39,7 @@
 
   <% if map.instance_of? Note -%>
     <%= link_to t("browse.map.larger.area"),
 
   <% if map.instance_of? Note -%>
     <%= link_to t("browse.map.larger.area"),

-                root_path(:note => "yes"),
+                root_path(:notes => "yes"),

                 :id => "area_larger_map",
                 :class => "geolink bbox" %>
   <% else -%>
                 :id => "area_larger_map",
                 :class => "geolink bbox" %>
   <% else -%>