Merged 8899:9136 and 9145 from trunk.

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 47cf9ce6bf21feddbcec4cc630233677fd30205c..923613c1853cf9609d6b1d6942977a9c8d5a3b4f 100644 (file)
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -276,6 +276,7 @@ page << <<EOJ
     if ($("format_osmarender").checked) {
       var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
 
+      $("osmarender_format").disabled = true;
       $("osmarender_zoom").options.selectedIndex = zoom - 4;
       $("export_osmarender").style.display = "inline";
     } else {

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 52e7b6b242847869e54c8feb7f2f1ab9530c74bb..4b41e5e9e84106cc438a180cd7a9e87ae2869d37 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -95,12 +95,6 @@
         <%= yield :left_menu %>
       </div>
 
-      <div id="sotm" class="left_menu">
-        <div id="sotminfo">
-        Come to the second OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 12th-13th July 2008, Limerick, Ireland.
-        </div>
-      </div>
-
       <%= yield :optionals %>
       <div id="cclogo">
         <center>

diff --git a/public/openlayers/OpenStreetMap.js b/public/openlayers/OpenStreetMap.js
index 69e8840b2a33e5152da97bbc1a0d824cc225f416..1e65f5c76e7b779361aba4d7be148d23d08b59e5 100644 (file)
--- a/public/openlayers/OpenStreetMap.js
+++ b/public/openlayers/OpenStreetMap.js
@@ -143,9 +143,9 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://a.tah.openstreetmap.org/Tiles/tile.php/",
-            "http://b.tah.openstreetmap.org/Tiles/tile.php/",
-            "http://c.tah.openstreetmap.org/Tiles/tile.php/"
+            "http://a.tah.openstreetmap.org/Tiles/tile/",
+            "http://b.tah.openstreetmap.org/Tiles/tile/",
+            "http://c.tah.openstreetmap.org/Tiles/tile/"
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18 }, options);
         var newArguments = [name, url, options];
@@ -199,9 +199,9 @@ OpenLayers.Layer.OSM.Maplint = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://d.tah.openstreetmap.org/Tiles/maplint.php/",
-            "http://e.tah.openstreetmap.org/Tiles/maplint.php/",
-            "http://f.tah.openstreetmap.org/Tiles/maplint.php/"
+            "http://d.tah.openstreetmap.org/Tiles/maplint/",
+            "http://e.tah.openstreetmap.org/Tiles/maplint/",
+            "http://f.tah.openstreetmap.org/Tiles/maplint/"
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18, isBaseLayer: false, visibility: false }, options);
         var newArguments = [name, url, options];

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 63a04bf51c6f3451bdb6b88bad6110028a887549..17d7106cb08becf53cf919b23d74e36562e6eec5 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ