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

Refactor browsed object loading

Browse source
This commit is contained in:
John Firebaugh 2013-10-04 14:37:22 -07:00
parent a4e38ea695
commit 6157280d19
4 changed files with 39 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,16 +173,14 @@ $(document).ready(function () {
});
}
var marker = L.marker([0, 0], {icon: getUserIcon()});
if (!params.object_zoom) {
if (params.bounds) {
map.fitBounds(params.bounds);
} else {
map.setView([params.lat, params.lon], params.zoom);
}
if (params.bounds) {
map.fitBounds(params.bounds);
} else {
map.setView([params.lat, params.lon], params.zoom);
}
var marker = L.marker([0, 0], {icon: getUserIcon()});
if (params.marker) {
marker.setLatLng([params.mlat, params.mlon]).addTo(map);
}
@ -220,8 +218,8 @@ $(document).ready(function () {
});
}
initializeBrowse(map, params);
initializeNotes(map, params);
initializeBrowse(map);
initializeNotes(map);
OSM.Index = function(map) {
var page = {};
@ -241,12 +239,20 @@ $(document).ready(function () {
OSM.Browse = function(map) {
var page = {};
page.pushstate = page.popstate = function(path) {
$('#sidebar_content').load(path, page.load);
page.pushstate = page.popstate = function(path, type, id) {
$('#sidebar_content').load(path, function() {
page.load(path, type, id);
});
};
page.load = function() {
map.addObject(OSM.mapParams().object, {zoom: true});
page.load = function(path, type, id) {
if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
if (type === 'note') {
map.noteLayer.showNote(parseInt(id));
} else {
map.addObject({type: type, id: parseInt(id)}, {zoom: true});
}
};
page.unload = function() {