Fix isMobile trigger and add more details on media
This commit is contained in:
11
lib/Spot.php
11
lib/Spot.php
@@ -283,7 +283,8 @@ class Spot extends Main
|
||||
$asMessage['subtype'] = 'message';
|
||||
}
|
||||
|
||||
//Get Geo-positioned Medias
|
||||
//Get Geo-positioned Medias
|
||||
//FIXME Make more efficient than requesting images twice from DB
|
||||
$asMedias = $this->getMedias('taken_on', $asMediaIds);
|
||||
$asGeoMedias = $this->getMedias('posted_on', $asMediaIds, true);
|
||||
foreach($asGeoMedias as &$asGeoMedia) {
|
||||
@@ -292,8 +293,6 @@ class Spot extends Main
|
||||
|
||||
$asGeoMedia['id'] = $iId;
|
||||
$asGeoMedia['type'] = 'media';
|
||||
$asGeoMedia['lat_dms'] = self::decToDms($asGeoMedia['latitude'], 'lat');
|
||||
$asGeoMedia['lon_dms'] = self::decToDms($asGeoMedia['longitude'], 'lon');
|
||||
$asGeoMedia['medias'] = array_values(array_filter($asMedias, function($asMedia) use ($iId) {
|
||||
return $asMedia['id_media'] == $iId;
|
||||
}));
|
||||
@@ -428,6 +427,12 @@ class Spot extends Main
|
||||
$this->addTimeStamp($asMedia, strtotime($asMedia[$sTimeRefField]), $asMedia['timezone']);
|
||||
$this->addTimeStamp($asMedia, strtotime($asMedia['taken_on']), $asMedia['timezone'], 'taken_on');
|
||||
$this->addTimeStamp($asMedia, strtotime($asMedia['posted_on']), $asMedia['timezone'], 'posted_on');
|
||||
|
||||
if($asMedia['latitude'] != '' && $asMedia['longitude'] != '') {
|
||||
$asMedia['lat_dms'] = self::decToDms($asMedia['latitude'], 'lat');
|
||||
$asMedia['lon_dms'] = self::decToDms($asMedia['longitude'], 'lon');
|
||||
}
|
||||
|
||||
unset($asMedia['taken_on']);
|
||||
unset($asMedia['posted_on']);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user