Add some help to the search box.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 000df6c1a9eeba13b33b3e88f531832debd76c9c..dc488089dc1c7d6b5390ba27a5d261b37389dfcc 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -42,13 +42,11 @@
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
-<% unless @user %>
-<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-<% end %>
 
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
+  var marker;
   var map;
 
   function init(){
@@ -72,7 +70,7 @@
     <% end %>
 
     <% if marker %>
-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
     <% if layers %>
@@ -82,14 +80,6 @@
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
-    <% unless @user %>
-    if ( window.location.hostname == "www.openstreetmap.org" ) { 
-      mappam.register( map, '10011756636067178496', '1');
-    } else if( window.location.hostname == "openstreetmap.org" ) {
-      mappam.register( map, '6738410720121976832', '1');
-    }
-    <% end %>
-
     handleResize();
   }
 
@@ -97,6 +87,11 @@
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);
+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre);
   }
 
   function updateLocation() {