final cleanup of the last pointInitialization and wxStation code that…

… I had been editing something still looks quirky with the wxStation time and list stuff, but I think this is good enough for now
firelab · Dec 3, 2024 · 85895ad · 85895ad
1 parent e5ef783
commit 85895ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/ninja/pointInitialization.cpp b/src/ninja/pointInitialization.cpp
@@ -746,7 +746,7 @@ vector<pointInitialization::preInterpolate> pointInitialization::readDiskLine(st
     OGR_L_ResetReading(hLayer);
     int fCount=OGR_L_GetFeatureCount(hLayer,1);
 
-    CPLDebug("STATION_FETCH", "Reading csvName: %s", stationLoc.c_str());
+    CPLDebug("STATION_FETCH", "Reading csv file: %s", stationLoc.c_str());
 
     poLayer->ResetReading();
 
@@ -765,7 +765,7 @@ vector<pointInitialization::preInterpolate> pointInitialization::readDiskLine(st
         oStation.stationName=oStationName;
         pszKey = poFeature->GetFieldAsString( 1 );
 
-        //LAT LON COORDINATES
+        //COORDINATES STUFF
         if( EQUAL( pszKey, "geogcs" ) )
         {
             CPLDebug("STATION_FETCH","GEOGCS FOUND!");

diff --git a/src/ninja/wxStation.cpp b/src/ninja/wxStation.cpp
@@ -312,7 +312,6 @@ void wxStation::set_location_projected( double Xord, double Yord,
         return;
     }
 
-    //get llcorner to subtract
     GDALDataset *poDS = (GDALDataset*) GDALOpen( demFile.c_str(), GA_ReadOnly );
     if( poDS == NULL ){
         xord = Xord;
@@ -322,6 +321,7 @@ void wxStation::set_location_projected( double Xord, double Yord,
         return;
     }
 
+    //get llcorner to subtract
     double adfGeoTransform[6];
 
     if( poDS->GetGeoTransform( adfGeoTransform ) != CE_None ) {
@@ -332,10 +332,8 @@ void wxStation::set_location_projected( double Xord, double Yord,
         return;
     }
 
-    double llx = 0.0;
-    double lly = 0.0;
-    llx = adfGeoTransform[0];
-    lly = adfGeoTransform[3] + ( adfGeoTransform[5] * poDS->GetRasterYSize() );
+    double llx = adfGeoTransform[0];
+    double lly = adfGeoTransform[3] + ( adfGeoTransform[5] * poDS->GetRasterYSize() );
 
     xord = Xord - llx;
     yord = Yord - lly;
@@ -390,8 +388,8 @@ void wxStation::set_location_LatLong( double Lat, double Lon,
         yord = Lat;
         return;
     }
-    GDALDataset *poDS = (GDALDataset*)GDALOpen( demFile.c_str(), GA_ReadOnly );
 
+    GDALDataset *poDS = (GDALDataset*)GDALOpen( demFile.c_str(), GA_ReadOnly );
     if( poDS == NULL ){
         projXord = Lon;
         projYord = Lat;
@@ -408,9 +406,7 @@ void wxStation::set_location_LatLong( double Lat, double Lon,
     projXord = projX;
     projYord = projY;
 
-    //still assume dem is projected.
-    double llx = 0.0;
-    double lly = 0.0;
+    //get llcorner to subtract
     double adfGeoTransform[6];
 
     if( poDS->GetGeoTransform( adfGeoTransform ) != CE_None ){
@@ -419,8 +415,8 @@ void wxStation::set_location_LatLong( double Lat, double Lon,
         return;
     }
 
-    llx = adfGeoTransform[0];
-    lly = adfGeoTransform[3] + ( adfGeoTransform[5] * poDS->GetRasterYSize() );
+    double llx = adfGeoTransform[0];
+    double lly = adfGeoTransform[3] + ( adfGeoTransform[5] * poDS->GetRasterYSize() );
 
     xord = projXord - llx;
     yord = projYord - lly;