Declare XML namespace.

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index fa012287aa48bbc59736a3f39dc7de137b3e31b9..0c6488129740669ba92bf97700e8a1f622b979af 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -8,22 +8,28 @@
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 

+<noscript>
+  <div id="noscript">
+    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
+    <p>OpenStreetMap uses javascript for its slippy map.</p>
+    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+  </div>
+</noscript>
+

 <div id="map">
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
 </div> 
 
 <div id="attribution">
 <div id="map">
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
 </div> 
 
 <div id="attribution">

-<table width="100%">
-<tr>
-<td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
-<td align="right">http://openstreetmap.org/</td>
-</tr>
-<tr>
-<td colspan="2" align="center">
-Licensed under the Creative Commons Attribution-Share Alike 2.0 license
-by the OpenStreetMap project and it's contributors.
-</td>
-</table>
+  <table width="100%">
+    <tr>
+      <td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
+      <td align="right">http://openstreetmap.org/</td>
+    </tr>
+    <tr>
+      <td colspan="2" align="center">Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors.</td>
+    </tr>
+  </table>

 </div>
 
 <% if params['mlon'] and params['mlat'] %>
 </div>
 
 <% if params['mlon'] and params['mlat'] %>


@@ -50,8 +56,8 @@ by the OpenStreetMap project and it's contributors.
 <% lat = h(params['mlat']) %>
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
 <% lat = h(params['mlat']) %>
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>

-<% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% elsif cookies.key?("_osm_location") %>
+<% lon,lat,zoom,layers = cookies["_osm_location"].split("|") %>

 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>


@@ -68,64 +74,78 @@ by the OpenStreetMap project and it's contributors.
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  h(params['zoom'] || '5') %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  h(params['zoom'] || '5') %>

-<% layers = h(params['layers']) %>

 <% end %>
 <% end %>

+<% layers = h(params['layers']) %>

 <% end %>
 
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 
 <%= javascript_include_tag 'map.js' %>
 
 

-<script type="text/javascript">
+<script type="text/javascript" defer="defer">

   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 

-  function init(){
+  function mapInit(){

     map = createMap("map");
 
     map = createMap("map");
 

+    <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
+    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+    map.addLayer(map.dataLayer);
+    <% end %>
+

     <% if bbox %>
     <% 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);
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);

 
 

-    map.zoomToExtent(bbox);
+    setMapExtent(bbox);

     <% else %>
     <% else %>

-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);

     var zoom = <%= zoom %>;
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
     var zoom = <%= zoom %>;
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

     <% end %>
 
     <% end %>
 

-    <% if layers %>
+    <% if !layers.nil? and !layers.empty? %>

     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if marker %>
     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if marker %>

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

     <% end %>
 
     map.events.register("zoomend", map, updateKey);
 
     map.events.register("moveend", map, updateLocation);
     <% end %>
 
     map.events.register("zoomend", map, updateKey);
 
     map.events.register("moveend", map, updateLocation);

+    map.events.register("changelayer", map, updateLocation);

     updateLocation();
 
     handleResize();
   }
 
     updateLocation();
 
     handleResize();
   }
 

+  function toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
+    }
+  }
+

   function getPosition() {
   function getPosition() {

-    return mercatorToLonLat(map.getCenter());
+    return getMapCenter();

   }
 
   function setPosition(lat, lon, zoom) {
   }
 
   function setPosition(lat, lon, zoom) {

-    var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+    var centre = new OpenLayers.LonLat(lon, lat);

 
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

 
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);


@@ -134,13 +154,13 @@ by the OpenStreetMap project and it's contributors.
   }
 
   function updateLocation() {
   }
 
   function updateLocation() {

-    var lonlat = mercatorToLonLat(map.getCenter());
+    var lonlat = getMapCenter();

     var zoom = map.getZoom();
     var layers = getMapLayers();
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 
     var zoom = map.getZoom();
     var layers = getMapLayers();
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 

-    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;

   }
 
   function resizeContent() {
   }
 
   function resizeContent() {


@@ -175,8 +195,14 @@ by the OpenStreetMap project and it's contributors.
 
     resizeMap();
   }
 
     resizeMap();
   }

+  
+  mapInit();

 
 

+  window.onload = handleResize;

   window.onresize = handleResize;
   window.onresize = handleResize;

-  window.onload = init;
+
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>

 // -->
 </script>
 // -->
 </script>