feat: fixup region check code

Author: garobrik

Makefile

@@ -82,4 +82,6 @@ download-soil-data:
 	gdown 1asGnnqe0zI2v8xuOszlsNmZkOSl7cJ2n; \
 	gdown 185Qjb9pJJn4AzOissiTz283tINrDqgI0; \
 	gdown 1P3xl1YRlfcMjfO_4PM39tkrrlL3hoLzv; \
-	gdown 1K0GkqxhZiVUND6yfFmaI7tYanLktekyp \
+	gdown 1K0GkqxhZiVUND6yfFmaI7tYanLktekyp; \
+	gdown 1c6EZwKAJvtkyxZsCzLM4ObmMi8mYbqds; \
+	gdown 1z7foFFHv_mTsuxMYnfOQRvXT5LKYlYFN \

soil_id/config.py

@@ -32,14 +32,14 @@
 REQUESTS_CACHE_PATH = f"{CACHE_DIR}/requests_cache"
 
 # Determines if in/out of US
-US_AREA_PATH = f"{DATA_PATH}/SoilID_US_Areas.shp"
+US_AREA_PATH = f"{DATA_PATH}/SoilID_US_Areas.shz"
 
 # US Soil ID
 STATSGO_PATH = f"{DATA_PATH}/gsmsoilmu_a_us.shp"
 MUNSELL_RGB_LAB_PATH = f"{DATA_PATH}/LandPKS_munsell_rgb_lab.csv"
 
 # Global Soil ID
-HWSD_PATH = f"{DATA_PATH}/HWSD_global_noWater_no_country.shp"
+HWSD_PATH = f"{DATA_PATH}/HWSD_global_noWater_no_country.shz"
 WISE_PATH = f"{DATA_PATH}/wise30sec_poly_simp_soil.shp"
 
 # Database

soil_id/tests/test_find_region.py

@@ -0,0 +1,29 @@
+# Copyright © 2025 Technology Matters
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see https://www.gnu.org/licenses/.
+
+from soil_id.utils import findRegionForLocation
+import pytest
+
+test_locations = [
+    (38.968984, -103.625974, 'US'),
+    (-6.708697, -69.306646, 'Global'),
+    (-3.521766, -136.995712, None)
+]
+
+@pytest.mark.parametrize("location", test_locations)
+def test_find_region(location):
+    lat, lon, region = location    
+
+    assert findRegionForLocation(lat=lat, lon=lon) == region

soil_id/utils.py

@@ -2443,7 +2443,7 @@ def create_new_layer_osd(row, top, bottom):
 ##################################################################################################
 #                                       Database and API Functions                               #
 ##################################################################################################
-def findSoilLocation(lon, lat):
+def findRegionForLocation(lon, lat):
     """
     Determines the location type (US, Global, or None) of the given longitude and latitude
     based on soil datasets.
@@ -2473,7 +2473,7 @@ def findSoilLocation(lon, lat):
     coord_transform = ogr.osr.CoordinateTransformation(pt_ref, geo_ref)
 
     # Transform the coordinate system of the input point
-    lon, lat, _ = coord_transform.TransformPoint(lon, lat)
+    lon, lat, _ = coord_transform.TransformPoint(lat, lon)
 
     # Create a point geometry
     pt = ogr.Geometry(ogr.wkbPoint)