Don't try and apply pngfix to OpenLayers tile images.

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 31b8fcd70f5a85fd6b5e45041903b598b062bbe7..d5c7b9e0349aff4725017f003c88d426724f6441 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,23 +1,4 @@
-
-
-<div id="geocoder">
-  <% form_tag :controller => 'geocoder', :action => 'search' do %>
-  <%= text_field 'query', 'postcode' %>
-  <%= text_field 'query', 'place_name'%>
-  <%= submit_tag 'Search' %>
-  <% end %>
-
-  <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 %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>


@@ -78,9 +59,9 @@
     }
     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"} );
     }
     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'} );
+    layer = new OpenLayers.Layer.TMS( "Mapnik", "http://tile.openstreetmap.org/", {type:'png', getURL:getTileURL} );

     map.addLayer(layer);
     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
     map.addLayer(layer);
 
     //Marker stuff


@@ -93,25 +74,37 @@
     markers.addMarker(marker);
     <%end%>
 
     markers.addMarker(marker);
     <%end%>
 

-      map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.addControl(new OpenLayers.Control.LayerSwitcher());

     map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 
     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();
     }
     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 ) {
   function getStyle( el, property ) {
     var style;
     if( el.currentStyle ) {