franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move geojson build to dedicated call

Browse Source
This commit is contained in:
Franzz
2024-02-27 23:03:32 +01:00
parent 205855acd8
commit 3169b8e83e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Project.php
View File

@@ -142,8 +142,6 @@ class Project extends PhpObject {
} }
$asProject['editable'] = $this->isModeEditable($asProject['mode']); $asProject['editable'] = $this->isModeEditable($asProject['mode']);
if($sCodeName != '' && !Converter::isGeoJsonValid($sCodeName)) Converter::convertToGeoJson($sCodeName);
//$asProject['geofilepath'] = Spot::addTimestampToFilePath(GeoJson::getDistFilePath($sCodeName)); //$asProject['geofilepath'] = Spot::addTimestampToFilePath(GeoJson::getDistFilePath($sCodeName));
$asProject['gpxfilepath'] = Spot::addTimestampToFilePath(Gpx::getDistFilePath($sCodeName)); $asProject['gpxfilepath'] = Spot::addTimestampToFilePath(Gpx::getDistFilePath($sCodeName));
$asProject['codename'] = $sCodeName; $asProject['codename'] = $sCodeName;
@@ -152,6 +150,8 @@ class Project extends PhpObject {
} }
public function getGeoJson() { public function getGeoJson() {
if($this->sCodeName != '' && !Converter::isGeoJsonValid($this->sCodeName)) Converter::convertToGeoJson($this->sCodeName);
return json_decode(file_get_contents(GeoJson::getDistFilePath($this->sCodeName)), true); return json_decode(file_get_contents(GeoJson::getDistFilePath($this->sCodeName)), true);
} }
@@ -189,7 +189,7 @@ class Project extends PhpObject {
$this->sCodeName = $asProject['codename']; $this->sCodeName = $asProject['codename'];
$this->sMode = $asProject['mode']; $this->sMode = $asProject['mode'];
$this->asActive = array('from'=>$asProject['active_from'], 'to'=>$asProject['active_to']); $this->asActive = array('from'=>$asProject['active_from'], 'to'=>$asProject['active_to']);
$this->asGeo = array('geofile'=>$asProject['geofilepath'], 'gpxfile'=>$asProject['gpxfilepath']); $this->asGeo = array(/*'geofile'=>$asProject['geofilepath'], */'gpxfile'=>$asProject['gpxfilepath']);
} }
else $this->addError('Error while setting project: no project ID'); else $this->addError('Error while setting project: no project ID');
} }