cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the new OSM OpenLayers stuff.

Browse source
This commit is contained in:
Tom Hughes 2007-11-28 19:24:58 +00:00
parent 29645d2d29
commit f5c9a41e87
5 changed files with 9 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/diary_entry/new.rhtml
View file

@ -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">

1
app/views/site/index.rhtml
View file

@ -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' %>

1
app/views/user/account.rhtml
View file

@ -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">

39
public/javascripts/map.js
View file

@ -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);

4
public/stylesheets/site.css
View file

@ -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;