X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fbc431f4646ae7086956e0b05074a603e7861176..7e6a31510401d15d20935a92c6086ad40101397d:/app/views/site/index.rhtml?ds=sidebyside

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6a0fe8a3..1b1a85d5b 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,117 +1,110 @@
-
-
-<div id="geocoder">
-  <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
-  <%= text_field 'query', 'postcode' %>
-  <%= text_field 'query', 'place_name'%>
-  <%= submit_tag 'Search' %>
-  <%= end_form_tag %>
-
-  <div id="geocoder-attribution">
-    Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,
-    <a href="http://geocoder.us/">geocoder.us</a>, <a href="http://geocoder.ca/">geocoder.ca</a> and <a href="http://www.geonames.org/">geonames.org</a>
-  </div>
-  <div id="postcode-helper">
-    Enter a postcode or zip code, eg: SW15 6JH, 95472 
-  </div>
-  <div id="placename-helper">
-    Enter a place-name, eg:Essen
-  </div>
-</div>
+<%= render :partial => 'search' %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
 <% mlon = params['mlon'] %> 
 <% mlat = params['mlat'] %>
-<% lon =  params['mlon'] %>
-<% lat =  params['mlat']  %>
+<% end %>
+
+<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
+<% bbox = true %>
+<% minlon = params['minlon'] %>
+<% minlat = params['minlat'] %>
+<% maxlon = params['maxlon'] %>
+<% maxlat = params['maxlat'] %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon =  params['lon'] %>
+<% lat =  params['lat'] %>
+<% zoom =  params['zoom'] || '5' %>
+<% layers = params['layers'] %>
+<% elsif params['mlon'] and params['mlat'] %>
+<% lon = params['mlon'] %> 
+<% lat = params['mlat'] %>
 <% zoom =  params['zoom'] || '12' %>
-<script type="text/javascript">
-  var mlat = <%= lat %>;
-  var mlon = <%= lon %>;
-</script>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% layers = params['layers'] %>
+<% elsif cookies.key?("location") %>
+<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
-<%else%>
-<% lon =  params['lon'] || '-0.1' %>
-<% lat =  params['lat'] || '51.5' %>
-<% zoom =  params['zoom'] || '4' %>
+<% else %>
+<% lon =  '-0.1' %>
+<% lat =  '51.5' %>
+<% zoom =  params['zoom'] || '5' %>
+<% layers = params['layers'] %>
 <% end %>
 
+<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 lat = <%= lat %>;
-  var lon = <%= lon %>;
-  var zoom = <%= zoom %>;
-  var PI = 3.14159265358979323846;
-
-
-
-  <% if params['scale'] and params['scale'].length > 0 then %>
-  zoom = Math.log(360.0/(( <% print params['scale'].to_f() %> ) * 512.0)) / Math.log(2.0);
-  <% end %>
-  zoom = zoom;
-  lon = lon * 20037508.34 / 180;
-  lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
-  lat = lat * 20037508.34 / 180;
-  <% if marker %>
-  mlon = mlon * 20037508.34 / 180;
-  mlat = Math.log(Math.tan( (90 + mlat) * PI / 360)) / (PI / 180);
-  mlat = mlat * 20037508.34 / 180;
-  <%end%>
-
-</script>
-<script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
 
 <script type="text/javascript">
   <!--
-  var map, layer, markers;
-  var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
+  var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
+  var map;
 
   function init(){
+    var map = createMap("map");
 
-    OpenLayers.Util.onImageLoadError = function() {
-      this.src = "http://www.openstreetmap.org/javascripts/img/404.png";
-    }
-    map = new OpenLayers.Map( "map", 
-        {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxZoomLevel:18, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
-    layer = new OpenLayers.Layer.LikeGoogle( "Mapnik", "http://tile.openstreetmap.org/", {type:'png'} );
-    map.addLayer(layer);
-    layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png'} );
-    map.addLayer(layer);
+    <% if bbox %>
+    var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
+    var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
+    var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
 
-    //Marker stuff
+    map.zoomToExtent(bbox);
+    <% else %>
+    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var zoom = <%= zoom %>;
+
+    <% if params['scale'] and params['scale'].length > 0 then %>
+    zoom = scaleToZoom(<%= params['scale'].to_f() %>);
+    <% end %>
+
+    map.setCentre(centre, zoom);
+    <% end %>
 
     <% if marker %>
-    markers = new OpenLayers.Layer.Markers("markers");
-    map.addLayer(markers); 
-
-    marker = new OpenLayers.Marker(new OpenLayers.LonLat(mlon,mlat));
-    markers.addMarker(marker);
-    <%end%>
-
-      map.addControl(new OpenLayers.Control.LayerSwitcher());
-    map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
-
-    map.events.register("moveend", map, function() { 
-        var lonlat = map.getCenter();
-
-        var lon_deg = (lonlat.lon / 20037508.34) * 180;
-        var lat_deg = (lonlat.lat / 20037508.34) * 180;
-        var PI = 3.14159265358979323846;
-        lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
-        var zoom = map.getZoom();
-        updatelinks(lon_deg,lat_deg,zoom);
-        });
-    document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
-    if( ie6 ) {
+    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    <% end %>
+
+    <% if layers %>
+    setMapLayers("<%= layers %>");
+    <% end %>
+
+    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 %>
+
+    document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
+    if ( ie ) {
       handleResize();
     }
   }        
 
+  function updateLocation() {
+    var lonlat = mercatorToLonLat(map.getCenter());
+    var zoom = map.getZoom();
+    var layers = getMapLayers();
+
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
+
+    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+  }
+
   function getStyle( el, property ) {
     var style;
     if( el.currentStyle ) {
@@ -131,6 +124,7 @@
     var bottom = getStyle( el, 'bottom' );
     var right = getStyle( el, 'right' );
     var width = el.old_width;
+    var height;
     if( ! width ) {
         width = getStyle( el, 'width' );
     }
@@ -142,7 +136,7 @@
     if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
       if( typeof( window.innerWidth ) == 'number' ) {
           pwidth = window.innerWidth;
-          height = window.innerHeight;
+          pheight = window.innerHeight;
       } else if( document.documentElement &&
           ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
           pwidth = document.documentElement.clientWidth;
@@ -166,11 +160,14 @@
       el.style.height = new_height + 'px';
     }
     map.updateSize();
+    el.style.display = 'none';
+    setTimeout( function() { el.style.display = ''; }, 200 );
+  }
+
+  if ( ie ) {
+    window.onresize = handleResize;
   }
 
-if( ie6 ) {
-  window.onresize = handleResize;
-}
-window.onload = init;
+  window.onload = init;
 // -->
 </script>