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

Add zoom to note

Browse source
This commit is contained in:
Aaron Lidman 2013-11-12 15:12:32 -08:00
parent 3e305fb162
commit 1673851b50
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index.js
View file

@ -204,7 +204,7 @@ $(document).ready(function () {
page.load = function(path, type, id) {
if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
map.addObject({type: type, id: parseInt(id)}, {zoom: true});
map.addObject({type: type, id: parseInt(id)}, {zoom: window.location.hash == ""});
};
page.unload = function() {

12
app/assets/javascripts/index/note.js.erb
View file

@ -1,7 +1,8 @@
OSM.Note = function(map) {
var noteLayer = map.noteLayer,
content = $('#sidebar_content'),
page = {};
page = {},
marker;
var noteIcons = {
"new": L.icon({
@ -67,7 +68,7 @@ OSM.Note = function(map) {
page.load();
};
page.load = function() {
page.load = function(path, id) {
var loadTimer = setTimeout(setLoading, 250);
$('#sidebar_content').load(window.location.pathname + "?xhr=1", function(a, b, xhr) {
if (xhr.getResponseHeader('X-Page-Title')) {
@ -76,9 +77,16 @@ OSM.Note = function(map) {
bind();
clearTimeout(loadTimer);
clearLoading();
if (!map.hasLayer(noteLayer)) map.addLayer(noteLayer);
if (window.location.hash == "") map.panTo($('.details').data().coordinates.split(','));
});
};
page.unload = function() {
if (marker) map.removeLayer(marker);
};
function setLoading() {
if($('#browse_status').is(':empty')) {
$('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));