Move browse JS to page-specific script file
This commit is contained in:
John Firebaugh
Tom Hughes
parent
4d6533db32
commit
7c5d0fff3d
3 changed files with 94 additions and 94 deletions
88
app/assets/javascripts/browse.js
Normal file
88
app/assets/javascripts/browse.js
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
function remoteEditHandler(event, bbox, select) {
|
||||
var left = bbox.left - 0.0001;
|
||||
var top = bbox.top + 0.0001;
|
||||
var right = bbox.right + 0.0001;
|
||||
var bottom = bbox.bottom - 0.0001;
|
||||
var loaded = false;
|
||||
|
||||
$("#linkloader").load(function () { loaded = true; });
|
||||
|
||||
if (select) {
|
||||
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
|
||||
} else {
|
||||
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
|
||||
}
|
||||
|
||||
setTimeout(function () {
|
||||
if (!loaded) alert(I18n.t('site.index.remote_failed'));
|
||||
}, 1000);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function init() {
|
||||
var map = createMap("small_map", {
|
||||
controls: [ new OpenLayers.Control.Navigation() ]
|
||||
});
|
||||
|
||||
var params = $("#small_map").data();
|
||||
if (params.type == "changeset") {
|
||||
var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
|
||||
var centre = bbox.getCenterLonLat();
|
||||
|
||||
map.zoomToExtent(proj(bbox));
|
||||
addBoxToMap(bbox);
|
||||
|
||||
$("#loading").hide();
|
||||
$("#browse_map .geolink").show();
|
||||
|
||||
$("a[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, bbox);
|
||||
});
|
||||
|
||||
updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
|
||||
} else {
|
||||
var url = "/api/" + OSM.API_VERSION + "/" + params.type + "/" + params.id;
|
||||
|
||||
if (params.type != "node") {
|
||||
url += "/full";
|
||||
} else if (!params.visible) {
|
||||
var previous_version = params.version - 1;
|
||||
url += "/" + previous_version;
|
||||
}
|
||||
|
||||
$("#object_larger_map").hide();
|
||||
$("#object_edit").hide();
|
||||
|
||||
addObjectToMap(url, true, function(extent) {
|
||||
$("#loading").hide();
|
||||
$("#browse_map .geolink").show();
|
||||
|
||||
if (extent) {
|
||||
extent.transform(map.getProjectionObject(), map.displayProjection);
|
||||
|
||||
var centre = extent.getCenterLonLat();
|
||||
|
||||
$("a.bbox[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, extent);
|
||||
});
|
||||
|
||||
$("a.object[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, extent, params.type + params.id);
|
||||
});
|
||||
|
||||
$("#object_larger_map").show();
|
||||
$("#object_edit").show();
|
||||
|
||||
updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, params.type, params.id);
|
||||
} else {
|
||||
$("#small_map").hide();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
createMenu("area_edit", "area_edit_menu", "right");
|
||||
createMenu("object_edit", "object_edit_menu", "right");
|
||||
}
|
||||
|
||||
window.onload = init;
|
||||
|
|
@ -3,6 +3,11 @@
|
|||
|
||||
<div id="browse_map">
|
||||
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
|
||||
|
||||
<% content_for :head do %>
|
||||
<%= javascript_include_tag "browse" %>
|
||||
<% end %>
|
||||
|
||||
<%
|
||||
if map.instance_of? Changeset
|
||||
bbox = map.bbox.to_unscaled
|
||||
|
|
@ -77,96 +82,3 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
|
||||
<script type="text/javascript">
|
||||
function remoteEditHandler(event, bbox, select) {
|
||||
var left = bbox.left - 0.0001;
|
||||
var top = bbox.top + 0.0001;
|
||||
var right = bbox.right + 0.0001;
|
||||
var bottom = bbox.bottom - 0.0001;
|
||||
var loaded = false;
|
||||
|
||||
$("#linkloader").load(function () { loaded = true; });
|
||||
|
||||
if (select) {
|
||||
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
|
||||
} else {
|
||||
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
|
||||
}
|
||||
|
||||
setTimeout(function () {
|
||||
if (!loaded) alert(I18n.t('site.index.remote_failed'));
|
||||
}, 1000);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function init() {
|
||||
var map = createMap("small_map", {
|
||||
controls: [ new OpenLayers.Control.Navigation() ]
|
||||
});
|
||||
|
||||
var params = $("#small_map").data();
|
||||
if (params.type == "changeset") {
|
||||
var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
|
||||
var centre = bbox.getCenterLonLat();
|
||||
|
||||
map.zoomToExtent(proj(bbox));
|
||||
addBoxToMap(bbox);
|
||||
|
||||
$("#loading").hide();
|
||||
$("#browse_map .geolink").show();
|
||||
|
||||
$("a[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, bbox);
|
||||
});
|
||||
|
||||
updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
|
||||
} else {
|
||||
var url = "/api/" + OSM.API_VERSION + "/" + params.type + "/" + params.id;
|
||||
|
||||
if (params.type != "node") {
|
||||
url += "/full";
|
||||
} else if (!params.visible) {
|
||||
var previous_version = params.version - 1;
|
||||
url += "/" + previous_version;
|
||||
}
|
||||
|
||||
$("#object_larger_map").hide();
|
||||
$("#object_edit").hide();
|
||||
|
||||
addObjectToMap(url, true, function(extent) {
|
||||
$("#loading").hide();
|
||||
$("#browse_map .geolink").show();
|
||||
|
||||
if (extent) {
|
||||
extent.transform(map.getProjectionObject(), map.displayProjection);
|
||||
|
||||
var centre = extent.getCenterLonLat();
|
||||
|
||||
$("a.bbox[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, extent);
|
||||
});
|
||||
|
||||
$("a.object[data-editor=remote]").click(function (event) {
|
||||
return remoteEditHandler(event, extent, params.type + params.id);
|
||||
});
|
||||
|
||||
$("#object_larger_map").show();
|
||||
$("#object_edit").show();
|
||||
|
||||
updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, params.type, params.id);
|
||||
} else {
|
||||
$("#small_map").hide();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
createMenu("area_edit", "area_edit_menu", "right");
|
||||
createMenu("object_edit", "object_edit_menu", "right");
|
||||
}
|
||||
|
||||
window.onload = init;
|
||||
</script>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ OpenStreetMap::Application.configure do
|
|||
# config.action_controller.asset_host = "http://assets.example.com"
|
||||
|
||||
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
||||
config.assets.precompile += %w( index.js edit.js pngfix.js swfobject.js )
|
||||
config.assets.precompile += %w( index.js edit.js browse.js pngfix.js swfobject.js )
|
||||
config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
|
||||
config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
|
||||
config.assets.precompile += %w( browse.css theme/openstreetmap/style.css )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue