Updates for newest scenery build.

diff --git a/utils/TerraSync/README.txt b/utils/TerraSync/README.txt
index 5d4d9d9fc35edf567634fc81a8d3fbb049354638..8f88be6a79dc96962af31ab4f904ba3981b548ec 100644 (file)
--- a/utils/TerraSync/README.txt
+++ b/utils/TerraSync/README.txt
@@ -58,3 +58,7 @@ Final notes:
 I have set up the scenery server at
 scenery.flightgear.org::Scenery-0.9.2.  This is the latest 0.9.2 build
 of the world.
+
+Note to self:
+
+nice ./terrasync -p 5500 -s baron.flightgear.org:/stage/fgfs05/curt/Scenery-1.0 -d /stage/catalina3/Scenery-1.0/

diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index 9be1d1e711aebcd34d61fdca79b5bf0fdc057b9e..e65c78dcccfb70c4490d2c63e86f9f7294c922f9 100644 (file)
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -131,17 +131,34 @@ static void sync_area( int lat, int lon ) {
     }
 
     char command[512];
-
-    // make container directory
     char container_dir[512];
-    snprintf( container_dir, 512, "%s/%c%03d%c%02d",
+    char dir[512];
+
+    // Sync Terrain
+    snprintf( container_dir, 512, "%s/Terrain/%c%03d%c%02d",
               dest_base.c_str(), EW, abs(baselon), NS, abs(baselat) );
     snprintf( command, 512, "mkdir -p %s", container_dir );
     cout << command << endl;
     system( command );
 
-    char dir[512];
-    snprintf( dir, 512, "%c%03d%c%02d/%c%03d%c%02d",
+    snprintf( dir, 512, "Terrain/%c%03d%c%02d/%c%03d%c%02d",
+              EW, abs(baselon), NS, abs(baselat),
+              EW, abs(lon), NS, abs(lat) );
+
+    snprintf( command, 512,
+              "rsync --verbose --archive --delete --perms --owner --group %s/%s/ %s/%s",
+              source_base.c_str(), dir, dest_base.c_str(), dir );
+    cout << command << endl;
+    system( command );
+
+    // Sync Objects
+    snprintf( container_dir, 512, "%s/Objects/%c%03d%c%02d",
+              dest_base.c_str(), EW, abs(baselon), NS, abs(baselat) );
+    snprintf( command, 512, "mkdir -p %s", container_dir );
+    cout << command << endl;
+    system( command );
+
+    snprintf( dir, 512, "Objects/%c%03d%c%02d/%c%03d%c%02d",
               EW, abs(baselon), NS, abs(baselat),
               EW, abs(lon), NS, abs(lat) );