@@ -886,6 +886,7 @@ function tilestache_clean($mid, $realdo = 1){
886
886
}
887
887
// moi_osm_gpx
888
888
$ cmd2 = sprintf ("ssh happyman@twmap tilestache-clean.py -c /home/happyman/etc/tile_main_8089.cfg -l gpxtrack -b %f %f %f %f 10 11 12 13 14 15 16 17 18 2>&1 > /dev/null " ,$ tl [1 ],$ tl [0 ],$ br [1 ],$ br [0 ]);
889
+ $ cmd2 = sprintf ("tilestache-clean.py -c /home/happyman/etc/tile_main_8089.cfg -l gpxtrack -b %f %f %f %f 10 11 12 13 14 15 16 17 18 2>&1 > /dev/null " ,$ tl [1 ],$ tl [0 ],$ br [1 ],$ br [0 ]);
889
890
exec ($ cmd2 );
890
891
error_log ("tilestache_clean: " . $ cmd2 );
891
892
return array (true , "gpxtrack cleaned " );
@@ -1385,17 +1386,27 @@ function ogr2ogr_export_gpx($mid, $merged_gpx) {
1385
1386
$ cmd = sprintf ("ogr2ogr -f GPX -dsco GPX_USE_EXTENSIONS=YES -lco FORCE_GPX_TRACK=YES %s %s -where \"mid=%d \" gpx_trk " , $ trk_gpx , $ gdal_dsn , $ mid );
1386
1387
// echo $cmd;
1387
1388
exec ($ cmd , $ out , $ ret );
1388
- if ($ ret != 0 ) return array (false , "export trk failed " );
1389
+ if ($ ret != 0 ) {
1390
+ error_log ($ cmd . " fail " );
1391
+ return array (false , "export trk failed " );
1392
+ }
1389
1393
$ wpt_gpx = tempnam ("/tmp " ,"EXPW " ) . ".gpx " ;
1390
1394
$ cmd2 = sprintf ("ogr2ogr -f GPX -dsco GPX_USE_EXTENSIONS=YES -lco FORCE_GPX_TRACK=YES %s %s -where \"mid=%d \" gpx_wp " , $ wpt_gpx , $ gdal_dsn , $ mid );
1391
1395
// echo $cmd2;
1392
1396
exec ($ cmd2 , $ out , $ ret );
1393
- if ($ ret != 0 ) return array (false , "export wpt failed " );
1397
+ if ($ ret != 0 ) {
1398
+ error_log ($ cmd2 . " fail " );
1399
+ return array (false , "export wpt failed " );
1400
+ }
1394
1401
// $merged_gpx = tempnam("/tmp","EXPM") . ".gpx";
1395
1402
$ cmd3 = sprintf ("gpsbabel -i gpx -f %s -f %s -o gpx,gpxver=1.1 -F %s " ,$ trk_gpx ,$ wpt_gpx ,$ merged_gpx );
1396
1403
exec ($ cmd3 , $ out , $ ret );
1397
- if ($ ret != 0 ) return array (false , "merge gpx failed: $ cmd3 " );
1398
- unlink ($ wpt_gpx );unlink ($ trk_gpx );
1404
+ if ($ ret != 0 ) {
1405
+ error_log ($ cmd3 . " fail " );
1406
+ return array (false , "merge gpx failed: $ cmd3 " );
1407
+ }
1408
+ unlink ($ wpt_gpx );
1409
+ unlink ($ trk_gpx );
1399
1410
return array (true , "ok " );
1400
1411
}
1401
1412
// map ranking system
0 commit comments