remove GeoParms

SlideRuleEarth · Oct 10, 2024 · ca00b48 · ca00b48
1 parent 6482baa
commit ca00b48
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 806 deletions.
diff --git a/datasets/icesat2/package/MeritRaster.h b/datasets/icesat2/package/MeritRaster.h
@@ -37,7 +37,6 @@
  ******************************************************************************/
 
 #include "RasterObject.h"
-#include "GeoParms.h"
 #include "RasterSample.h"
 
 /******************************************************************************

diff --git a/packages/core/RequestFields.cpp b/packages/core/RequestFields.cpp
@@ -218,7 +218,7 @@ int RequestFields::luaGetSamplers (lua_State* L)
     {
         RequestFields* lua_obj = dynamic_cast<RequestFields*>(getLuaSelf(L, 1));
 
-        // create table of GeoParms
+        // create table of GeoFields
         lua_newtable(L);
 
         // loop through each GeoFields

diff --git a/packages/geo/CMakeLists.txt b/packages/geo/CMakeLists.txt
@@ -37,7 +37,6 @@ if (GDAL_FOUND AND PROJ_FOUND AND TIFF_FOUND)
             ${CMAKE_CURRENT_LIST_DIR}/RasterSampler.cpp
             ${CMAKE_CURRENT_LIST_DIR}/RasterSubset.cpp
             ${CMAKE_CURRENT_LIST_DIR}/GeoFields.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/GeoParms.cpp
             ${CMAKE_CURRENT_LIST_DIR}/GeoLib.cpp
             ${CMAKE_CURRENT_LIST_DIR}/GeoRtree.cpp
             $<$<CONFIG:Debug>:${CMAKE_CURRENT_LIST_DIR}/UT_RasterSubset.cpp>
@@ -63,7 +62,6 @@ if (GDAL_FOUND AND PROJ_FOUND AND TIFF_FOUND)
             ${CMAKE_CURRENT_LIST_DIR}/RasterSample.h
             ${CMAKE_CURRENT_LIST_DIR}/RasterSubset.h
             ${CMAKE_CURRENT_LIST_DIR}/GeoFields.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/GeoParms.h
             ${CMAKE_CURRENT_LIST_DIR}/GeoLib.h
             ${CMAKE_CURRENT_LIST_DIR}/GeoRtree.h
             $<$<CONFIG:Debug>:${CMAKE_CURRENT_LIST_DIR}/UT_RasterSubset.h>

diff --git a/packages/geo/GeoFields.cpp b/packages/geo/GeoFields.cpp
@@ -45,6 +45,15 @@
 
 const char* GeoFields::DEFAULT_KEY = "default";
 
+const char* GeoFields::NEARESTNEIGHBOUR_ALGO_STR = "NearestNeighbour";
+const char* GeoFields::BILINEAR_ALGO_STR         = "Bilinear";
+const char* GeoFields::CUBIC_ALGO_STR            = "Cubic";
+const char* GeoFields::CUBICSPLINE_ALGO_STR      = "CubicSpline";
+const char* GeoFields::LANCZOS_ALGO_STR          = "Lanczos";
+const char* GeoFields::AVERAGE_ALGO_STR          = "Average";
+const char* GeoFields::MODE_ALGO_STR             = "Mode";
+const char* GeoFields::GAUSS_ALGO_STR            = "Gauss";
+
 /******************************************************************************
  * CLASS METHODS
  ******************************************************************************/

diff --git a/packages/geo/GeoFields.h b/packages/geo/GeoFields.h
@@ -73,7 +73,17 @@ class GeoFields: public FieldDictionary
         * Constants
         *--------------------------------------------------------------------*/
 
-       static const char* DEFAULT_KEY;
+        static const char* DEFAULT_KEY;
+
+        static const char* NEARESTNEIGHBOUR_ALGO_STR;
+        static const char* BILINEAR_ALGO_STR;
+        static const char* CUBIC_ALGO_STR;
+        static const char* CUBICSPLINE_ALGO_STR;
+        static const char* LANCZOS_ALGO_STR;
+        static const char* AVERAGE_ALGO_STR;
+        static const char* MODE_ALGO_STR;
+        static const char* GAUSS_ALGO_STR;
+        static const char* ZONALSTATS_ALGO_STR;
 
         /*--------------------------------------------------------------------
         * Typedefs

diff --git a/packages/geo/GeoJsonRaster.h b/packages/geo/GeoJsonRaster.h
@@ -37,7 +37,7 @@
  ******************************************************************************/
 
 #include "GeoRaster.h"
-#include "GeoParms.h"
+#include "GeoFields.h"
 
 /******************************************************************************
  * GEOJSON RASTER CLASS
@@ -62,7 +62,7 @@ class GeoJsonRaster: public GeoRaster
          * Typedefs
          *--------------------------------------------------------------------*/
 
-        /* import bbox_t into this namespace from GeoParms.h */
+        /* import bbox_t into this namespace from GeoFields.h */
         using bbox_t=GeoFields::bbox_t;
 
         /*--------------------------------------------------------------------