From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Nov 2007 19:24:58 +0000 (+0000)
Subject: Use the new OSM OpenLayers stuff.
X-Git-Tag: live~8054
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f5c9a41e8729ab9bfc54fff6be9c1a9b6e0f4d56

Use the new OSM OpenLayers stuff.
---

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index e6da08ae2..4e9482f3c 100644
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -33,6 +33,7 @@
 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index fa012287a..e88643588 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -73,6 +73,7 @@ by the OpenStreetMap project and it's contributors.
 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
 
diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 0f938df26..851815506 100644
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -47,6 +47,7 @@
 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 2bcfa6959..217e6e758 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -3,10 +3,6 @@ var markers;
 var popup;
 
 function createMap(divName) {
-   OpenLayers.Util.onImageLoadError = function() {
-      this.src = OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-
    map = new OpenLayers.Map(divName,
                             { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
                               numZoomLevels: 19,
@@ -14,14 +10,10 @@ function createMap(divName) {
                               units: 'm',
                               projection: "EPSG:41001" });
 
-   var mapnik = new OpenLayers.Layer.TMS("Mapnik",
-                                         ["http://a.tile.openstreetmap.org/","http://b.tile.openstreetmap.org/","http://c.tile.openstreetmap.org/"],
-                                         { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.TMS("Osmarender",
-                                             ["http://a.tah.openstreetmap.org/Tiles/tile.php/","http://b.tah.openstreetmap.org/Tiles/tile.php/","http://c.tah.openstreetmap.org/Tiles/tile.php/"],
-                                             { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
    markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
@@ -33,33 +25,6 @@ function createMap(divName) {
    return map;
 }
 
-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();
-   var limit = Math.pow(2, z);
-
-   if (y < 0 || y >= limit)
-   {
-     return OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-   else
-   {
-     x = ((x % limit) + limit) % limit;
-
-     var url = this.url;
-     var path = z + "/" + x + "/" + y + "." + this.type;
-
-     if (url instanceof Array)
-     {
-        url = this.selectUrl(path, url);
-     }
-
-     return url + path;
-   }
-}
-
 function getArrowIcon() {
    var size = new OpenLayers.Size(25, 22);
    var offset = new OpenLayers.Pixel(-30, -27);
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index c09c7885e..f2306e7b4 100644
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -471,6 +471,10 @@ hides rule from IE5-Mac \*/
   margin-bottom: 0px;
 }
 
+.olControlAttribution {
+  display: none !important;
+}
+
 /* inbox and messaging stuff */
 .inbox-row-unread .inbox-subject {
 	font-weight: bold;