Merge pull request #99 from MITLibraries/GDT-116-fix-wkt-coords

Fix order of coordinates in WKT string
MITLibraries · Jan 22, 2024 · b37fb43 · b37fb43
2 parents dea8457 + 3764556
commit b37fb43
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/harvester/records/fgdc.py b/harvester/records/fgdc.py
@@ -111,9 +111,9 @@ def _dcat_bbox(self) -> str:
         lat_lon_envelope = ", ".join(
             [
                 min(bbox_data["westbc"]).strip(),
-                max(bbox_data["southbc"]).strip(),
                 max(bbox_data["eastbc"]).strip(),
-                min(bbox_data["northbc"]).strip(),
+                max(bbox_data["northbc"]).strip(),
+                min(bbox_data["southbc"]).strip(),
             ]
         )
         return f"ENVELOPE({lat_lon_envelope})"

diff --git a/harvester/records/iso19139.py b/harvester/records/iso19139.py
@@ -178,9 +178,9 @@ def _dcat_bbox(self) -> str:
         lat_lon_envelope = ", ".join(
             [
                 min(bbox_data["westBoundLongitude"]).strip(),
-                max(bbox_data["southBoundLatitude"]).strip(),
                 max(bbox_data["eastBoundLongitude"]).strip(),
-                min(bbox_data["northBoundLatitude"]).strip(),
+                max(bbox_data["northBoundLatitude"]).strip(),
+                min(bbox_data["southBoundLatitude"]).strip(),
             ]
         )
 

diff --git a/tests/test_records/test_fgdc.py b/tests/test_records/test_fgdc.py
@@ -60,14 +60,14 @@ def test_fgdc_record_required_gbl_resourceClass_sm_unhandled_value_return_none(
 def test_fgdc_record_required_dcat_bbox(fgdc_source_record_required_fields):
     assert (
         fgdc_source_record_required_fields._dcat_bbox()
-        == "ENVELOPE(31.161907, 29.994131, 31.381609, 30.141311)"
+        == "ENVELOPE(31.161907, 31.381609, 30.141311, 29.994131)"
     )
 
 
 def test_fgdc_record_required_locn_geometry(fgdc_source_record_required_fields):
     assert (
         fgdc_source_record_required_fields._locn_geometry()
-        == "ENVELOPE(31.161907, 29.994131, 31.381609, 30.141311)"
+        == "ENVELOPE(31.161907, 31.381609, 30.141311, 29.994131)"
     )
 
 

diff --git a/tests/test_records/test_iso19139.py b/tests/test_records/test_iso19139.py
@@ -65,14 +65,14 @@ def test_iso19139_record_required_gbl_resourceClass_sm_unhandled_value_return_no
 def test_iso19139_record_required_dcat_bbox(iso19139_source_record_required_fields):
     assert (
         iso19139_source_record_required_fields._dcat_bbox()
-        == "ENVELOPE(88, -16.5, 138, 25.833333)"
+        == "ENVELOPE(88, 138, 25.833333, -16.5)"
     )
 
 
 def test_iso19139_record_required_locn_geometry(iso19139_source_record_required_fields):
     assert (
         iso19139_source_record_required_fields._locn_geometry()
-        == "ENVELOPE(88, -16.5, 138, 25.833333)"
+        == "ENVELOPE(88, 138, 25.833333, -16.5)"
     )