', {'class':'detail'}).addIcon('fa-distance fa-fw', true).append(Math.round(iDistance/1000)+'km'))
+ .append($('
', {'class':'detail'}).addIcon('fa-time fa-fw', true).append(sDuration))
+ .append($('
', {'class':'detail'}).addIcon('fa-elev-gain fa-fw', true).append(iElevGain+'m'))
+ .append($('
', {'class':'detail'}).addIcon('fa-elev-drop fa-fw', true).append(iElevDrop+'m'))
+ );
+
//Trail Start/End
self.tmp(['trail-markers', asProperties.name], {
'start' : L.marker(new L.latLng(aiCoords[0][1], aiCoords[0][0]), {icon: getDivIcon('track-start')}),
@@ -558,22 +555,43 @@ function initSpotMessages(aoMessages, aoTracks) {
}
}).addTo(oMap));
+ //Last message
+ var oLastMsg = (aoMessages.length > 0)?aoMessages[aoMessages.length-1]:{};
+
//Centering map
var iPanelWidth = isMobile()?0:parseInt(self.tmp('$Feed').outerWidth(true));
if(
self.vars(['project', 'mode']) == self.consts.modes.blog &&
- aoMessages.length > 0 &&
+ !$.isEmptyObject(oLastMsg) &&
self.getHash()[2] != 'message'
) {
//Zoom on last message
- var oLastMsg = aoMessages[aoMessages.length-1];
oMap.setView(L.latLng(oLastMsg.latitude, oLastMsg.longitude), 15);
oMap.panBy([iPanelWidth/2, 0]);
}
else oMap.fitBounds(self.tmp('track').getBounds(), {paddingTopLeft: L.point(5, self.tmp('marker_size').height + 5), paddingBottomRight: L.point(5 + iPanelWidth, 5)});
+ //Add Spot messages
+ addSpotMessages(aoMessages);
+
+ //Open tooltip on latest message in mobile mode
+ if(
+ !$.isEmptyObject(oLastMsg) &&
+ self.vars(['project', 'mode']) == self.consts.modes.blog &&
+ (!oLastMsg.medias || oLastMsg.medias.length < 3) &&
+ isMobile()
+ ) oSpot.tmp(['markers', oLastMsg.id_message]).openPopup();
+
+ /*
+ oSpot.tmp('tracks', aoTracks);
+ next(24, 0, 0, 5);
+ */
+}
+
+function addSpotMessages(aoMessages) {
+
//Spot Messages
- var iWorkSpaceMinWidth = self.tmp('$Projects').width() - self.tmp('$Feed').outerWidth(true) - self.tmp('$Settings').outerWidth(true);
+ var iWorkSpaceMinWidth = isMobile()?self.tmp('$Projects').width():(self.tmp('$Projects').width() - self.tmp('$Feed').outerWidth(true) - self.tmp('$Settings').outerWidth(true));
$.each(aoMessages, function(iKey, oMsg){
//Marker
@@ -581,7 +599,7 @@ function initSpotMessages(aoMessages, aoTracks) {
id: oMsg.id_message,
riseOnHover: true,
icon: getDivIcon('message-in fa-rotate-270')
- }).addTo(oMap);
+ }).addTo(self.tmp('map'));
//Tooltip
$Tooltip = $('
', {'class':'info-window'})
@@ -621,21 +639,8 @@ function initSpotMessages(aoMessages, aoTracks) {
offset: new L.Point(0, -30)
});
- //Open tooltip on latest message in mobile mode
- if(
- iKey === (aoMessages.length - 1) &&
- self.vars(['project', 'mode']) == self.consts.modes.blog &&
- (!oMsg.medias || oMsg.medias.length < 3) &&
- isMobile()
- ) oMarker.openPopup();
-
oSpot.tmp(['markers', oMsg.id_message], oMarker);
});
-
- /*
- oSpot.tmp('tracks', aoTracks);
- next(24, 0, 0, 5);
- */
}
function toggleSoftPopup(e, sMode) {
@@ -662,44 +667,6 @@ function toggleSoftPopup(e, sMode) {
}
}
-/*
-function next(iCurrTrack, iCurrIndex, iCurrOffset, iCurrZoom) {
- var aoTracks = oSpot.tmp('tracks');
- var aoOffset = {0:[0,0], 1:[-1,0], 2:[-1,1], 3:[0,1], 4:[1,1], 5:[1,0], 6:[1,-1], 7:[0,-1], 8:[-1,-1]};
-
- console.log('Getting Track '+iCurrTrack+'/'+(aoTracks.features.length - 1)+', '+
- 'Point '+iCurrIndex+'/'+(aoTracks.features[iCurrTrack].geometry.coordinates.length - 1)+', '+
- 'Zoom '+iCurrZoom+'/14, '+
- 'Offset ['+aoOffset[iCurrOffset][0]+','+aoOffset[iCurrOffset][1]+']');
-
- //Position map
- var iLat = aoTracks.features[iCurrTrack].geometry.coordinates[iCurrIndex][1] + aoOffset[iCurrOffset][1] * 0.0347910214271;
- var iLng = aoTracks.features[iCurrTrack].geometry.coordinates[iCurrIndex][0] + aoOffset[iCurrOffset][0] * 0.1016235351560;
- oSpot.tmp('map').setView(L.latLng(iLat, iLng), iCurrZoom);
-
- //Go to next
- iCurrOffset++;
- if(iCurrZoom < 13 || iCurrOffset > 8) {
- iCurrOffset = 0;
- iCurrZoom++;
- if(iCurrZoom > 14) {
- iCurrZoom = 5;
- iCurrIndex += 100;
- if(!(iCurrIndex in aoTracks.features[iCurrTrack].geometry.coordinates)) {
- iCurrIndex = 0;
- iCurrTrack++;
- if(!(iCurrTrack in aoTracks.features)) return true;
- }
- }
- }
-
- timer = setTimeout(function(){next(iCurrTrack, iCurrIndex, iCurrOffset, iCurrZoom);}, 1000);
-}
-function stop() {
- clearTimeout(timer);
-}
-*/
-
function getDivIcon(sIcon) {
return L.divIcon({
className: '',
@@ -715,12 +682,50 @@ function onFeedScroll() {
if(($Box.scrollTop() + $(window).height()) / $BoxContent.height() >= 0.8) updateFeed();
}
+function onAutoUpdate(bStart) {
+ bStart = bStart || false;
+ if(!bStart) checkNewFeed();
+ setFeedUpdateTimer(60, onAutoUpdate);
+}
+
+function checkNewFeed() {
+ self.get(
+ 'new_feed',
+ function(asData) {
+ var iItemCount = Object.keys(asData.feed).length;
+ if(iItemCount > 0) self.tmp('ref_id_first', asData.ref_id_first);
+
+ //Feed
+ var $Posts = $('
');
+ $.each(asData.feed, function(iKey, asPost) {
+ $Posts.append(getPost(asPost));
+ });
+ self.tmp('$PostList').prepend($Posts.children());
+
+ //Markers
+ addSpotMessages(asData.messages);
+
+ //Message Last Update
+ updateSettingsPanel(asData.last_update);
+ }, {
+ id_project: self.vars(['project', 'id']),
+ id: self.tmp('ref_id_first')
+ }
+ );
+}
+
+function setFeedUpdateTimer(iSeconds, fCallback) {
+ if(typeof self.tmp('update_timer') != 'undefined') clearTimeout(self.tmp('update_timer'));
+ if(iSeconds >= 0) self.tmp('update_timer', setTimeout(fCallback, iSeconds * 1000));
+}
+
function updateFeed(bFirstChunk, bDiscrete, fCallback) {
bFirstChunk = bFirstChunk || false;
bDiscrete = bDiscrete || false;
fCallback = fCallback || function(){};
- if(bFirstChunk) self.tmp('ref_id', 0);
+ //First/Last Item displayed on the feed
+ if(bFirstChunk) self.tmp('ref_id_last', 0);
if(self.tmp('updatable')) {
if(!self.tmp('out-of-data') || bFirstChunk) {
@@ -729,39 +734,36 @@ function updateFeed(bFirstChunk, bDiscrete, fCallback) {
var $Posts = $('
');
- if(bFirstChunk===true) {
- self.tmp('news_chunk', 0);
- }
-
self.get(
- 'feed',
+ 'next_feed',
function(asData) {
$('#loading').hide();
+ var iItemCount = Object.keys(asData.feed).length;
+
+ //Update pointers
+ self.tmp('out-of-data', iItemCount < self.vars('chunk_size'));
+ if(iItemCount > 0) {
+ self.tmp('ref_id_last', asData.ref_id_last);
+ if(bFirstChunk === true) self.tmp('ref_id_first', asData.ref_id_first);
+ }
- self.tmp('ref_id', asData.ref_id);
-
+ //Add posts
+ if(bFirstChunk === true) self.tmp('$PostList').empty();
$.each(asData.feed, function(iKey, asPost){
$Posts.append(getPost(asPost));
});
-
- self.tmp('news_chunk', self.tmp('news_chunk') + 1);
- self.tmp('out-of-data', Object.keys(asData.feed).length != self.vars('chunk_size'));
-
- if(bFirstChunk===true) self.tmp('$PostList').empty();
self.tmp('$PostList').append($Posts.children());
-
self.tmp('$PostList').find('img').waitForImages(true).done(fCallback);
self.tmp('updatable', true);
}, {
id_project: self.vars(['project', 'id']),
- chunk: self.tmp('news_chunk'),
- id: self.tmp('ref_id')
+ id: self.tmp('ref_id_last')
}
);
}
}
- else if(bFirstChunk) setFeedUpdateTimer(0.2);
+ else if(bFirstChunk) setFeedUpdateTimer(0.2, function(){updateFeed(bFirstChunk, bDiscrete, fCallback);});
}
function focusOnPost(oFocusPost) {
@@ -780,16 +782,10 @@ function focusOnPost(oFocusPost) {
else console.log('Missing element ID '+sElemId);
//Reset Hash
- flushHash(['post', 'message']);
+ oSpot.flushHash(['post', 'message']);
}
}
-function setFeedUpdateTimer(iSeconds, fCallback) {
- fCallback = fCallback || function(){updateFeed(true);};
- if(typeof self.tmp('update_timer') != 'undefined') clearTimeout(self.tmp('update_timer'));
- if(iSeconds > 0) self.tmp('update_timer', setTimeout(fCallback, iSeconds * 1000));
-}
-
function getPost(asPost) {
asPost.headerless = asPost.headerless || false;
var bLink = false;
@@ -946,17 +942,41 @@ function getGoogleMapsLink(asInfo) {
}).text(asInfo.lat_dms+' '+asInfo.lon_dms);
}
-function updateHash(sType, iId) {
- sType = sType || '';
- iId = iId || 0;
+/*
+function next(iCurrTrack, iCurrIndex, iCurrOffset, iCurrZoom) {
+ var aoTracks = oSpot.tmp('tracks');
+ var aoOffset = {0:[0,0], 1:[-1,0], 2:[-1,1], 3:[0,1], 4:[1,1], 5:[1,0], 6:[1,-1], 7:[0,-1], 8:[-1,-1]};
- var asHash = self.getHash();
- if(iId) self.setHash(asHash.page, [asHash.items[0], sType, iId]);
-}
+ console.log('Getting Track '+iCurrTrack+'/'+(aoTracks.features.length - 1)+', '+
+ 'Point '+iCurrIndex+'/'+(aoTracks.features[iCurrTrack].geometry.coordinates.length - 1)+', '+
+ 'Zoom '+iCurrZoom+'/14, '+
+ 'Offset ['+aoOffset[iCurrOffset][0]+','+aoOffset[iCurrOffset][1]+']');
-function flushHash(asTypes) {
- asTypes = asTypes || [];
- var asHash = self.getHash();
- if(asHash.items.length > 1 && (asTypes.length == 0 || asTypes.indexOf(asHash.items[1]) != -1)) self.setHash(asHash.page, [asHash.items[0]]);
+ //Position map
+ var iLat = aoTracks.features[iCurrTrack].geometry.coordinates[iCurrIndex][1] + aoOffset[iCurrOffset][1] * 0.0347910214271;
+ var iLng = aoTracks.features[iCurrTrack].geometry.coordinates[iCurrIndex][0] + aoOffset[iCurrOffset][0] * 0.1016235351560;
+ oSpot.tmp('map').setView(L.latLng(iLat, iLng), iCurrZoom);
+
+ //Go to next
+ iCurrOffset++;
+ if(iCurrZoom < 13 || iCurrOffset > 8) {
+ iCurrOffset = 0;
+ iCurrZoom++;
+ if(iCurrZoom > 14) {
+ iCurrZoom = 5;
+ iCurrIndex += 100;
+ if(!(iCurrIndex in aoTracks.features[iCurrTrack].geometry.coordinates)) {
+ iCurrIndex = 0;
+ iCurrTrack++;
+ if(!(iCurrTrack in aoTracks.features)) return true;
+ }
+ }
+ }
+
+ timer = setTimeout(function(){next(iCurrTrack, iCurrIndex, iCurrOffset, iCurrZoom);}, 1000);
}
-
+function stop() {
+ clearTimeout(timer);
+}
+*/
+
\ No newline at end of file