HFNOC/Signal-Server
2
0
Fork 0
forked from ExternalVendorCode/Signal-Server
Code Pull Requests Activity

Detect and handle errors in topo data

Browse Source
This commit is contained in:
Gareth Evans
2017-03-04 19:35:03 +00:00
parent af13a8d4ba
commit f3029bb3cf
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main.cc
View File

@@ -1708,9 +1708,13 @@ int main(int argc, char *argv[])
}else{
// DEM first
LoadTopoData(max_lon, min_lon, max_lat, min_lat);
if( (result = LoadTopoData(max_lon, min_lon, max_lat, min_lat)) != 0 ){
// This only fails on errors loading SDF tiles
fprintf(stderr, "Error loading topo data\n");
return result;
}
if (area_mode || topomap) {
if (area_mode || topomap) {
for (z = 0; z < txsites && z < max_txsites; z++) {
/* "Ball park" estimates used to load any additional
SDF files required to conduct this analysis. */
@@ -1793,7 +1797,11 @@ int main(int argc, char *argv[])
/* Load any additional SDF files, if required */
LoadTopoData(max_lon, min_lon, max_lat, min_lat);
if( (result = LoadTopoData(max_lon, min_lon, max_lat, min_lat)) != 0 ){
// This only fails on errors loading SDF tiles
fprintf(stderr, "Error loading topo data\n");
return result;
}
}
ppd=(double)ippd;
yppd=ppd;