New seg id is now returned complete

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6b18346a261a70cf32c5837326b8c8954a5b73f..e83261a2b87bc84691838a522a4a9c8c178c811a 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -9,7 +9,7 @@
 
 <% lon =  params['lon'] || '-0.1' %>
 <% lat =  params['lat'] || '51.5' %>
 
 <% lon =  params['lon'] || '-0.1' %>
 <% lat =  params['lat'] || '51.5' %>

-<% zoom =  params['zoom'] || '11' %>
+<% zoom =  params['zoom'] || '5' %>

 
 <script type="text/javascript">
   var lon = <%= lon %>;
 
 <script type="text/javascript">
   var lon = <%= lon %>;


@@ -20,7 +20,7 @@
   <% 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 %>
   <% 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 -3;
+  zoom = zoom;

   lon = lon * 20037508.34 / 180;
   lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
   lat = lat * 20037508.34 / 180;
   lon = lon * 20037508.34 / 180;
   lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
   lat = lat * 20037508.34 / 180;


@@ -36,12 +36,15 @@
         function init(){
 
                        OpenLayers.Util.onImageLoadError = function() {
         function init(){
 
                        OpenLayers.Util.onImageLoadError = function() {

-                               this.src = "http://www.openstreetmap.org/javascript/img/404.png";
+                               this.src = "http://<%= SERVER_URL %>/javascript/img/404.png";

                        }
             map = new OpenLayers.Map( "map", 
                        }
             map = new OpenLayers.Map( "map", 

-                               {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
-            layer = new OpenLayers.Layer.LikeGoogle( "OSM", "http://artem.dev.openstreetmap.org/osm_tiles/", {type:'png'} );
+                               {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);
             map.addLayer(layer);

+            layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png'} );
+            map.addLayer(layer);
+

             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 


@@ -52,7 +55,7 @@
            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 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() + 3;
+           var zoom = map.getZoom();

            updatelinks(lon_deg,lat_deg,zoom);
           });
         }        
            updatelinks(lon_deg,lat_deg,zoom);
           });
         }        


@@ -66,6 +69,7 @@
 
   <% unless @user %>
   <div id="gads">
 
   <% unless @user %>
   <div id="gads">

+    <br>We're trialing the adverts below to support the project. Login and they go away.

   <script type="text/javascript"><!--
     google_ad_client = "pub-7727744269903103";
     google_ad_width = 728;
   <script type="text/javascript"><!--
     google_ad_client = "pub-7727744269903103";
     google_ad_width = 728;


@@ -80,17 +84,6 @@
     google_color_text = "000000";
     //--></script><script type="text/javascript"
     src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
     google_color_text = "000000";
     //--></script><script type="text/javascript"
     src="http://pagead2.googlesyndication.com/pagead/show_ads.js">

-    </script>We're trialing adverts to support the project. Login and they go away.
-  </div>
+    </script>  </div>

   <% end %>
 
   <% end %>
 

-  <!--
-  <script type="text/javascript">
-    lat = 0;
-    lon = 0;
-    zoom = 0;
-
-    init();
-    </script>
-
-    -->