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

Tidy up some recent commits:

Browse source 
- Simplify shortlinkPrefix by removing redundant code.
- Factor out duplicate code for displaying objects on maps.
- Reindent some stuff to make it more readable.
This commit is contained in:
Tom Hughes 2009-06-27 17:11:54 +00:00
parent d63f13c18d
commit e46c82fe3d
4 changed files with 144 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/views/browse/_map.html.erb
View file

@ -8,8 +8,8 @@
<span id="loading"><%= t 'browse.map.loading' %></span>
<a id="area_larger_map" href=""></a>
<% unless map.instance_of? Changeset %>
<br />
<a id="object_larger_map" href=""></a>
<br />
<a id="object_larger_map" href=""></a>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
@ -47,43 +47,23 @@
url += "/full";
}
var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
format: OpenLayers.Format.OSM,
projection: new OpenLayers.Projection("EPSG:4326")
});
osm_layer.events.register("loadend", osm_layer, function() {
addObjectToMap(url, true, function(extent) {
$("loading").innerHTML = "";
if (this.features.length) {
var extent = this.features[0].geometry.getBounds();
if (extent) {
extent.transform(map.getProjectionObject(), map.displayProjection);
for (var i = 1; i < this.features.length; i++) {
extent.extend(this.features[i].geometry.getBounds());
}
if (extent) {
this.map.zoomToExtent(extent);
} else {
this.map.zoomToMaxExtent();
}
var center = getMapCenter();
$("area_larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
$("area_larger_map").href = '/?minlon='+extent.left+'&minlat='+extent.bottom+'&maxlon='+extent.right+'&maxlat='+extent.top;
$("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
<% unless map.instance_of? Changeset %>
$("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
$("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
$("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
$("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
<% end %>
} else {
$("small_map").style.display = "none";
}
});
map.addLayer(osm_layer);
osm_layer.loadGML();
osm_layer.loaded = true;
<% end %>
}