More search improvements - a "Where am I?" link that does a reverse

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 8e52166c875c9ab6b8c7a941ee6616be7b42f1de..9f5088038393d6c5f0e705db94df12625e40d9e0 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,4 +1,16 @@
-<%= render :partial => 'search' %>
+<% content_for :greeting do %>
+<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>
+
+<% content_for :left_menu do %>
+<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
+<% end %>
+
+<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+
+<div id="map"></div> 

 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>


@@ -31,27 +43,33 @@
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% 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 =  params['zoom'] || '5' %>
 <% layers = params['layers'] %>
 <% end %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  params['zoom'] || '5' %>
 <% layers = params['layers'] %>
 <% end %>

+<% end %>

 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
 
 <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">
   <!--
 
 <script type="text/javascript">
   <!--

-  var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var marker;

   var map;
 
   function init(){
   var map;
 
   function init(){

-    var map = createMap("map");
+    map = createMap("map");

 
     <% if bbox %>
     var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
 
     <% if bbox %>
     var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));


@@ -67,11 +85,11 @@
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

-    map.setCentre(center, zoom);
+    map.setCenter(centre, zoom);

     <% end %>
 
     <% if marker %>
     <% end %>
 
     <% if marker %>

-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));

     <% end %>
 
     <% if layers %>
     <% end %>
 
     <% if layers %>


@@ -81,19 +99,23 @@
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     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();
+  }

 
 

-    document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
-    if ( ie ) {
-      handleResize();
-    }
-  }        
+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+
+  function setPosition(lat, lon, zoom) {
+    var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+
+    map.setCenter(centre, zoom);
+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre, getArrowIcon());
+  }

 
   function updateLocation() {
     var lonlat = mercatorToLonLat(map.getCenter());
 
   function updateLocation() {
     var lonlat = mercatorToLonLat(map.getCenter());


@@ -105,69 +127,40 @@
     document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
   }
 
     document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
   }
 

-  function getStyle( el, property ) {
-    var style;
-    if( el.currentStyle ) {
-        style = el.currentStyle[property];
-    } else if( window.getComputedStyle ) {
-        style = document.defaultView.getComputedStyle(el,null).getPropertyValue(property);
-    } else {
-        style = el.style[property];
-    }
-    return style;
+  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 handleResize() {
-    var el = document.getElementById( 'map' );
-    var left = getStyle( el, 'left' );
-    var top = getStyle( el, 'top' );
-    var bottom = getStyle( el, 'bottom' );
-    var right = getStyle( el, 'right' );
-    var width = el.old_width;
-    var height;
-    if( ! width ) {
-        width = getStyle( el, 'width' );
-    }
-    var height = el.old_height;
-    if( ! height ) {
-        height = getStyle( el, 'height' );
-    }
-    var pwidth, pheight;
-    if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
-      if( typeof( window.innerWidth ) == 'number' ) {
-          pwidth = window.innerWidth;
-          pheight = window.innerHeight;
-      } else if( document.documentElement &&
-          ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-          pwidth = document.documentElement.clientWidth;
-          pheight = document.documentElement.clientHeight;
-      } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-          pwidth = document.body.clientWidth;
-          pheight = document.body.clientHeight;
-      }
-    } else {
-      pwidth = el.offsetParent.offsetWidth;
-      pheight = el.offsetParent.offsetHeight;
-    }
-    if( left != 'auto' && right != 'auto' && width == 'auto' ) {
-      el.old_width = width;
-      var new_width = (pwidth - el.offsetLeft - parseInt( right ) );
-      el.style.width = new_width + 'px';
-    }
-    if( top != 'auto' && bottom != 'auto' && height == 'auto' ) {
-      el.old_height = height;
-      var new_height = (pheight - el.offsetTop - parseInt( bottom ) );
-      el.style.height = new_height + 'px';
+  function resizeMap() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+    var search_results_width = $("search_results").offsetWidth;
+
+    if (search_results_width > 0) {
+      search_results_width = search_results_width + 5

     }
     }

-    map.updateSize();
-    el.style.display = 'none';
-    setTimeout( function() { el.style.display = ''; }, 200 );
+
+    $("map").style.left = (search_results_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
+    $("map").style.height = ($("content").offsetHeight - 2) + "px";
+
+    map.setCenter(centre, zoom);

   }
 
   }
 

-  if ( ie ) {
-    window.onresize = handleResize;
+  function handleResize() {
+    if (brokenContentSize) {
+      resizeContent();
+    }
+
+    resizeMap();

   }
 
   }
 

+  window.onresize = handleResize;

   window.onload = init;
 // -->
 </script>
   window.onload = init;
 // -->
 </script>