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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 1fe1dccd7..f8c0f02f4 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,23 +1,4 @@
-
-
-<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 %>
@@ -64,7 +45,7 @@
   <%end%>
 
 </script>
-<script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
+<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 
 <script type="text/javascript">
   <!--
@@ -74,13 +55,13 @@
   function init(){
 
     OpenLayers.Util.onImageLoadError = function() {
-      this.src = "http://www.openstreetmap.org/javascripts/img/404.png";
+      this.src = OpenLayers.Util.getImagesLocation() + "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'} );
+        {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), numZoomLevels:19, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
+    layer = new OpenLayers.Layer.TMS( "Mapnik", "http://tile.openstreetmap.org/", {type:'png', getURL:getTileURL} );
     map.addLayer(layer);
-    layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png'} );
+    layer = new OpenLayers.Layer.TMS( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png', getURL:getTileURL} );
     map.addLayer(layer);
 
     //Marker stuff
@@ -93,25 +74,38 @@
     markers.addMarker(marker);
     <%end%>
 
-      map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.setOptions({theme:''});
+    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);
-        });
+    map.events.register("moveend", map, updateLocation);
     document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
     if( ie6 ) {
       handleResize();
     }
+    updateLocation();
   }        
 
+  function getTileURL( bounds ) {
+    var res = this.map.getResolution();
+    var x = Math.round ((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+    var y = Math.round ((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+    var z = this.map.getZoom();
+    return this.url + z + "/" + x + "/" + y + "." + this.type; 
+  }
+
+  function updateLocation() {
+    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);
+  }
+
   function getStyle( el, property ) {
     var style;
     if( el.currentStyle ) {
@@ -128,14 +122,8 @@
     var el = document.getElementById( 'map' );
     var left = getStyle( el, 'left' );
     var top = getStyle( el, 'top' );
-    var bottom = el.old_bottom;
-    if( ! bottom ) {
-      bottom = getStyle( el, 'bottom' );
-    }
-    var right = el.old_right;
-    if( ! right ) {
-        right = getStyle( el, 'right' );
-    }
+    var bottom = getStyle( el, 'bottom' );
+    var right = getStyle( el, 'right' );
     var width = el.old_width;
     if( ! width ) {
         width = getStyle( el, 'width' );
@@ -168,9 +156,14 @@
     }
     if( top != 'auto' && bottom != 'auto' && height == 'auto' ) {
       el.old_height = height;
-      var new_height = (pheight - el.offsetHeight - parseInt( bottom ) );
+      var new_height = (pheight - el.offsetTop - parseInt( bottom ) );
       el.style.height = new_height + 'px';
     }
+    map.updateSize();
+    el.style.display = 'none';
+    setTimeout( function() {
+        el.style.display = '';
+        }, 200 );
   }
 
 if( ie6 ) {