Sync

.github/workflows/cmake-multi-platform.yml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install spdlog on Ubuntu
-      run: sudo apt-get install -y libspdlog-dev
+      run: sudo apt-get install -y libspdlog-dev libbz2-dev
 
     - name: Set reusable strings
       id: strings

.gitignore

@@ -50,6 +50,17 @@ _deps
 # Output data
 *.ppm
 *.dcf
+output/
 
 # VSCode
-.vscode/
+.vscode/
+
+# Images
+*.png
+*.kmz
+*.tiff
+
+# Built utils
+utils/sdf/usgs2sdf/srtm2sdf
+utils/sdf/usgs2sdf/srtm2sdf-hd
+utils/sdf/usgs2sdf/usgs2sdf

src/inputs.cc

@@ -2076,7 +2076,7 @@ int LoadTopoData(bbox region)
             spdlog::debug("Loading topo for tile {}N {}W to {}N {}W", tile_lat, tile_lon, tile_lat + 1, tile_lon + 1);
             // Generate the filename string to load
             char basename[32], string[32];
-            snprintf(basename, 12, "%d_%d_%d_%d", tile_lat, tile_lat + 1, tile_lon, tile_lon + 1);
+            snprintf(basename, 16, "%d_%d_%d_%d", tile_lat, tile_lat + 1, tile_lon, tile_lon + 1);
             strcpy(string, basename);
             if (ippd == 3600) strcat(string, "-hd");
             // Load the tile

src/main.cc

@@ -1082,8 +1082,6 @@ int main(int argc, char *argv[])
         IPPD = 6000; // will be overridden based upon file header...
     }
 
-    spdlog::info(VERT_SEP);
-
     if (strstr(argv[0], "signalserverHD")) {
         spdlog::info(sshd_block);
     }
@@ -1098,7 +1096,7 @@ int main(int argc, char *argv[])
     spdlog::info("Version {}.{} ({} {})", VER_MAJ, VER_MIN, GIT_BRANCH, GIT_COMMIT_HASH);
     spdlog::info("    Compile date: {} {}", __DATE__, __TIME__);
     spdlog::info("    Built for {} DEM tiles at {} pixels", MAXPAGES, IPPD);
-    spdlog::info(VERT_SEP);
+    spdlog::info("");
 
     if (argc == 1) {
         fprintf(stdout, "License: GNU General Public License (GPL) version 2\n\n");
@@ -2090,17 +2088,11 @@ int main(int argc, char *argv[])
 
         if (tx_site[0].lon < -180.0)
             tx_site[0].lon += 360;
-
         if (cropping) {
-            spdlog::debug("| {:.6f} ", tx_site[0].lat+cropLat);
-            spdlog::debug("| {:.6f} ", tx_site[0].lon+cropLon);
-            spdlog::debug("| {:.6f} ", tx_site[0].lat-cropLat);
-            spdlog::debug("| {:.6f} |",tx_site[0].lon-cropLon);
+            spdlog::info("Area boundaries:{:.6f} | {:.6f} | {:.6f} | {:.6f} ", tx_site[0].lat+cropLat, tx_site[0].lon+cropLon, tx_site[0].lat-cropLat,tx_site[0].lon-cropLon);
+
         } else {
-            spdlog::debug("| {:.6f} ", max_north);
-            spdlog::debug("| {:.6f} ", east);
-            spdlog::debug("| {:.6f} ", min_north);
-            spdlog::debug("| {:.6f} |",west);
+            spdlog::info("Area boundaries:{:.6f} | {:.6f} | {:.6f} | {:.6f} ",max_north,east,min_north,west);
         }
 
     } else {

src/models/los.cc

@@ -139,7 +139,7 @@ namespace {
 
         spdlog::debug("Starting rangePropagation for {} range {:.6f}N {:.6f}W to {:.6f}N {:.6f}W, {} points at {:.8f} dpp [Segment {}]",
             vertical ? "vertical" : "horizontal",
-            v->min_north, v->min_west, v->max_north, v->max_west, progress.total, dpp, progress.id);
+            v->min_north, v->min_west, v->max_north, v->max_west, progress.total.load(), dpp, progress.id);
 
         // Init our varaibles for tracking position over the loop
         double lat = v->min_north;

src/outputs.cc

@@ -1534,8 +1534,8 @@ void PathReport(struct site source, struct site destination, char *name,
 
         if((loss*1.5) < free_space_loss){
 			fprintf(fd2,"Model error! Computed loss of %.1fdB is greater than free space loss of %.1fdB. Check your inuts for model %d\n",loss,free_space_loss,propmodel);
-            spdlog::error("Model error! Computed loss of {:.1f} dB is greater than free space loss of {:.1f} dB. Check your inuts for model {}",loss,free_space_loss,propmodel);
-            return;
+			spdlog::error("Model error! Computed loss of {:.1f} dB is greater than free space loss of {:.1f} dB. Check your inputs for model {}", loss, free_space_loss, static_cast<int>(propmodel));
+			return;
         }
 
 		if (free_space_loss != 0.0)