#77 change gdal_dsn

Author: happyman

twmap_gen/config.inc.php.sample

@@ -34,8 +34,9 @@ $db_user = "";
 $db_pass = "";
 $db_name = "";
 $db_port = '5432';
-$db_dsn = sprintf("postgres9://%s:%s@%s:%s/%s",$db_user,$db_pass,$db_host,$db_port,$db_name);
-$gdal_dsn = sprintf("PG:dbname='%s' user='%s' password='%s' host='%s' port='%s'",$db_name,$db_user,$db_pass,$db_host,$db_port);
+$db_dsn = sprintf("postgres://%s:%s@%s:%s/%s",$db_user,$db_pass,$db_host,$db_port,$db_name);
+// from gdal 3.4
+$gdal_dsn = sprintf("postgresql://%s:%s@%s:%s/%s",$db_user,$db_pass,$db_host,$db_port,$db_name);
 
 require_once(__ROOT__."lib/twmapdb.inc.php");
 
@@ -77,4 +78,4 @@ $CONFIG['memcache_port'] = 11211;
 // redis server
 $CONFIG['redis_server'] = '127.0.0.1';
 $CONFIG['redis_port'] = 6379;
-$CONFIG['redis_password'] = 'myredispassword';
+$CONFIG['redis_password'] = 'myredispassword';

twmap_gen/lib/twmapdb.inc.php

@@ -886,6 +886,7 @@ function tilestache_clean($mid, $realdo = 1){
 		}
 	// moi_osm_gpx 
 	$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]);
+	$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]);
 	exec($cmd2);
 	error_log("tilestache_clean: ". $cmd2);
 	return array(true, "gpxtrack cleaned");
@@ -1385,17 +1386,27 @@ function ogr2ogr_export_gpx($mid, $merged_gpx) {
 	$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);
 	// echo $cmd;
 	exec($cmd, $out, $ret);
-	if ($ret != 0 ) return array(false, "export trk failed");
+	if ($ret != 0 ) {
+		error_log($cmd . " fail");
+		return array(false, "export trk failed");
+	}
 	$wpt_gpx =  tempnam("/tmp","EXPW") . ".gpx";
 	$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);
 	// echo $cmd2;
 	exec($cmd2, $out, $ret);
-	if ($ret != 0 ) return array(false, "export wpt failed");
+	if ($ret != 0 ) {
+		error_log($cmd2 . " fail");
+		return array(false, "export wpt failed");
+	}
 	// $merged_gpx = tempnam("/tmp","EXPM") . ".gpx";
 	$cmd3 = sprintf("gpsbabel -i gpx -f %s -f %s -o gpx,gpxver=1.1 -F %s",$trk_gpx,$wpt_gpx,$merged_gpx);
 	exec($cmd3, $out, $ret);
-	if ($ret != 0 ) return array(false, "merge gpx failed: $cmd3");
-	unlink($wpt_gpx);unlink($trk_gpx);
+	if ($ret != 0 ) {
+		error_log($cmd3 . " fail");
+		return array(false, "merge gpx failed: $cmd3");
+	}
+	unlink($wpt_gpx);
+	unlink($trk_gpx);
 	return array(true, "ok");
 }
 // map ranking system