Tidy up some recent commits:
- 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
parent
d63f13c18d
commit
e46c82fe3d
4 changed files with 144 additions and 155 deletions
|
|
@ -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 %>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,22 +41,15 @@
|
|||
|
||||
<%
|
||||
if params['mlon'] and params['mlat']
|
||||
marker = true
|
||||
mlon = h(params['mlon'])
|
||||
mlat = h(params['mlat'])
|
||||
end
|
||||
|
||||
if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
|
||||
bbox = true
|
||||
minlon = h(params['minlon'])
|
||||
minlat = h(params['minlat'])
|
||||
maxlon = h(params['maxlon'])
|
||||
maxlat = h(params['maxlat'])
|
||||
box = true if params['box']=="yes"
|
||||
marker = true
|
||||
mlon = h(params['mlon'])
|
||||
mlat = h(params['mlat'])
|
||||
end
|
||||
|
||||
if params['node'] or params['way'] or params['relation']
|
||||
object = true
|
||||
object_zoom = true
|
||||
|
||||
if params['node']
|
||||
object_type = 'node'
|
||||
object_id = h(params['node'])
|
||||
|
|
@ -69,45 +62,51 @@ if params['node'] or params['way'] or params['relation']
|
|||
end
|
||||
end
|
||||
|
||||
if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
|
||||
bbox = true
|
||||
minlon = h(params['minlon'])
|
||||
minlat = h(params['minlat'])
|
||||
maxlon = h(params['maxlon'])
|
||||
maxlat = h(params['maxlat'])
|
||||
box = true if params['box']=="yes"
|
||||
object_zoom = false
|
||||
end
|
||||
|
||||
# Decide on a lat lon to initialise the map with. Various ways of doing this
|
||||
if params['lon'] and params['lat']
|
||||
# We only want to override the default 'object = true' zoom above
|
||||
# if we get actual GET params, as opposed to say a cookie
|
||||
lat_lon_zoom_via_params = true
|
||||
|
||||
lon = h(params['lon'])
|
||||
lat = h(params['lat'])
|
||||
zoom = h(params['zoom'] || '5')
|
||||
layers = h(params['layers'])
|
||||
|
||||
lon = h(params['lon'])
|
||||
lat = h(params['lat'])
|
||||
zoom = h(params['zoom'] || '5')
|
||||
layers = h(params['layers'])
|
||||
object_zoom = false
|
||||
elsif params['mlon'] and params['mlat']
|
||||
lon = h(params['mlon'])
|
||||
lat = h(params['mlat'])
|
||||
zoom = h(params['zoom'] || '12')
|
||||
layers = h(params['layers'])
|
||||
|
||||
lon = h(params['mlon'])
|
||||
lat = h(params['mlat'])
|
||||
zoom = h(params['zoom'] || '12')
|
||||
layers = h(params['layers'])
|
||||
object_zoom = false
|
||||
elsif cookies.key?("_osm_location")
|
||||
lon,lat,zoom,layers = cookies["_osm_location"].split("|")
|
||||
|
||||
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
|
||||
zoom = '10'
|
||||
lon = @user.home_lon
|
||||
lat = @user.home_lat
|
||||
zoom = '10'
|
||||
else
|
||||
session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
|
||||
session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
|
||||
|
||||
if session[:location]
|
||||
bbox = true
|
||||
minlon = session[:location][:minlon]
|
||||
minlat = session[:location][:minlat]
|
||||
maxlon = session[:location][:maxlon]
|
||||
maxlat = session[:location][:maxlat]
|
||||
else
|
||||
lon = '-0.1'
|
||||
lat = '51.5'
|
||||
zoom = h(params['zoom'] || '5')
|
||||
end
|
||||
layers = h(params['layers'])
|
||||
if session[:location]
|
||||
bbox = true
|
||||
minlon = session[:location][:minlon]
|
||||
minlat = session[:location][:minlat]
|
||||
maxlon = session[:location][:maxlon]
|
||||
maxlat = session[:location][:maxlat]
|
||||
else
|
||||
lon = '-0.1'
|
||||
lat = '51.5'
|
||||
zoom = h(params['zoom'] || '5')
|
||||
end
|
||||
|
||||
layers = h(params['layers'])
|
||||
end
|
||||
%>
|
||||
|
||||
|
|
@ -115,14 +114,11 @@ end
|
|||
<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
|
||||
<%= javascript_include_tag 'map.js' %>
|
||||
|
||||
|
||||
<script type="text/javascript" defer="defer">
|
||||
<!--
|
||||
var brokenContentSize = $("content").offsetWidth == 0;
|
||||
var marker;
|
||||
var map;
|
||||
var obj_type = false;
|
||||
var obj_id = false;
|
||||
|
||||
OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
|
||||
|
||||
|
|
@ -130,82 +126,55 @@ end
|
|||
map = createMap("map");
|
||||
|
||||
<% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
|
||||
map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
|
||||
map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
|
||||
map.addLayer(map.dataLayer);
|
||||
map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
|
||||
map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
|
||||
map.addLayer(map.dataLayer);
|
||||
<% end %>
|
||||
|
||||
<% if bbox %>
|
||||
var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
|
||||
<% unless object_zoom %>
|
||||
<% if bbox %>
|
||||
var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
|
||||
|
||||
setMapExtent(bbox);
|
||||
<% if box %>
|
||||
// IE requires Vector layers be initialised on page load, and not under deferred script conditions
|
||||
Event.observe(window, 'load', function() {addBoxToMap(bbox)});
|
||||
<% end %>
|
||||
<% elsif object %>
|
||||
// Display node/way/relation on the map
|
||||
obj_type = "<%= object_type %>";
|
||||
obj_id = <%= object_id %>;
|
||||
var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
|
||||
setMapExtent(bbox);
|
||||
|
||||
if (obj_type != "node") {
|
||||
url += "/full";
|
||||
}
|
||||
<% if box %>
|
||||
// IE requires Vector layers be initialised on page load, and not under deferred script conditions
|
||||
Event.observe(window, 'load', function() { addBoxToMap(bbox) });
|
||||
<% end %>
|
||||
<% else %>
|
||||
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
|
||||
var zoom = <%= zoom %>;
|
||||
|
||||
var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
|
||||
format: OpenLayers.Format.OSM,
|
||||
projection: new OpenLayers.Projection("EPSG:4326")
|
||||
});
|
||||
<% if params['scale'] and params['scale'].length > 0 then %>
|
||||
zoom = scaleToZoom(<%= params['scale'].to_f() %>);
|
||||
<% end %>
|
||||
|
||||
osm_layer.events.register("loadend", osm_layer, function() {
|
||||
if (this.features.length) {
|
||||
var extent = this.features[0].geometry.getBounds();
|
||||
for (var i = 1; i < this.features.length; i++) {
|
||||
extent.extend(this.features[i].geometry.getBounds());
|
||||
}
|
||||
setMapCenter(centre, zoom);
|
||||
<% end %>
|
||||
|
||||
<% unless lat_lon_zoom_via_params %>
|
||||
if (extent) {
|
||||
this.map.zoomToExtent(extent);
|
||||
} else {
|
||||
this.map.zoomToMaxExtent();
|
||||
}
|
||||
<% else %>
|
||||
var center = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
|
||||
var zoom = <%= zoom %>;
|
||||
<% end %>
|
||||
|
||||
var center = getMapCenter();
|
||||
}
|
||||
});
|
||||
|
||||
map.addLayer(osm_layer);
|
||||
osm_layer.loadGML();
|
||||
osm_layer.loaded = true;
|
||||
|
||||
<% else %>
|
||||
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 %>
|
||||
|
||||
setMapCenter(centre, zoom);
|
||||
updateLocation();
|
||||
<% end %>
|
||||
|
||||
<% if !layers.nil? and !layers.empty? %>
|
||||
setMapLayers("<%= layers %>");
|
||||
setMapLayers("<%= layers %>");
|
||||
<% end %>
|
||||
|
||||
<% if marker %>
|
||||
marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
|
||||
marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
|
||||
<% end %>
|
||||
|
||||
<% if object %>
|
||||
var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
|
||||
|
||||
<% if object_type != "node" %>
|
||||
url += "/full";
|
||||
<% end %>
|
||||
|
||||
addObjectToMap(url, <%= object_zoom %>);
|
||||
<% end %>
|
||||
|
||||
map.events.register("moveend", map, updateLocation);
|
||||
map.events.register("changelayer", map, updateLocation);
|
||||
updateLocation();
|
||||
|
||||
handleResize();
|
||||
}
|
||||
|
|
@ -239,8 +208,15 @@ end
|
|||
var layers = getMapLayers();
|
||||
var extents = getMapExtent();
|
||||
var expiry = new Date();
|
||||
var objtype;
|
||||
var objid;
|
||||
|
||||
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, obj_type, obj_id);
|
||||
<% if object %>
|
||||
objtype = "<%= object_type %>";
|
||||
objid = <%= object_id %>;
|
||||
<% end %>
|
||||
|
||||
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
|
||||
|
||||
expiry.setYear(expiry.getFullYear() + 10);
|
||||
document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue