Merge pull request #49 from ghidalgo3/main

Support NAIP 2022 and later data

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project attempts to match the major and minor versions of [stactools](https://github.com/stac-utils/stactools) and increments the patch number as needed.
 
+## [Unreleased]
+
+### Added
+
+- Support for NAIP 2022
+
+### Changed
+
+- Updated repository structure to match [stactools](https://github.com/stac-utils/stactools)
+
 ## [v0.4.0] - 2023-05-18
 
 ### Added

docker/Dockerfile-dev

@@ -3,5 +3,6 @@ FROM stactools-naip:latest
 RUN conda install -c conda-forge pandoc
 
 COPY . /src/stactools-naip
-RUN pip install -r /src/stactools-naip/requirements-dev.txt
 WORKDIR /src/stactools-naip
+RUN pip install .[dev]
+

pyproject.toml

@@ -1,3 +1,42 @@
+[project]
+name = "stactools-naip"
+dynamic = ["version"]
+description = "STAC item creation tools for NAIP dataset."
+readme = "README.md"
+authors = [{name = "stac-utils", email = "[email protected]"}]
+keywords = ["stactools", "pystac", "catalog", "STAC"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11"
+]
+requires-python = ">=3.8"
+dependencies = [
+    "stactools>=0.4.3",
+    "pystac>=1.5"
+]
+
+[tool.setuptools.dynamic]
+version = { attr = "stactools.naip.__version__" }
+
+[project.urls]
+homepage = "https://github.com/stactools-naips/stactools-naip"
+documentation = "https://stactools-naip.readthedocs.io/en/latest/"
+
+[project.optional-dependencies]
+dev = [
+    "black~=23.3",
+    "codespell~=2.2",
+    "coverage~=7.4.0",
+    "pre-commit~=3.3",
+    "flake8~=7.0.0",
+    "pytest-cov~=3.0",
+    "pytest~=7.3",
+]
+
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"

scripts/update

@@ -18,7 +18,6 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
         usage
     else
         python -m pip install --upgrade pip
-        pip install . --no-binary rasterio
-        pip install -r requirements-dev.txt
+        pip install -e '.[dev]'
     fi
 fi

src/stactools/naip/stac.py

@@ -146,7 +146,25 @@ def create_item(
         )
 
     if fgdc_metadata_href:
-        if year in ["2020", "2021"]:
+        if year < "2020":
+            fgdc_metadata_text = read_text(fgdc_metadata_href)
+            fgdc = parse_fgdc_metadata(fgdc_metadata_text)
+            try:
+                resource_desc = fgdc["Distribution_Information"]["Resource_Description"]
+                dt = str_to_datetime(
+                    fgdc["Identification_Information"]["Time_Period_of_Content"][
+                        "Time_Period_Information"
+                    ]["Single_Date/Time"]["Calendar_Date"]
+                )
+            except KeyError:
+                res = maybe_extract_id_and_date(cog_href)
+                if res is not None:
+                    resource_desc, dt = res
+                else:
+                    raise Exception(
+                        f"Failed to extract item resource_desc and dt: {cog_href}"
+                    )
+        else:
             first_xpath = "gmd:fileIdentifier/gco:CharacterString"
 
             second_xpath = "idinfo/citation/citeinfo/title"
@@ -171,28 +189,6 @@ def create_item(
                         raise Exception(
                             f"Failed to extract item resource_desc and dt: {cog_href}"
                         )
-
-        elif year < "2020":
-            fgdc_metadata_text = read_text(fgdc_metadata_href)
-            fgdc = parse_fgdc_metadata(fgdc_metadata_text)
-            try:
-                resource_desc = fgdc["Distribution_Information"]["Resource_Description"]
-                dt = str_to_datetime(
-                    fgdc["Identification_Information"]["Time_Period_of_Content"][
-                        "Time_Period_Information"
-                    ]["Single_Date/Time"]["Calendar_Date"]
-                )
-            except KeyError:
-                res = maybe_extract_id_and_date(cog_href)
-                if res is not None:
-                    resource_desc, dt = res
-                else:
-                    raise Exception(
-                        f"Failed to extract item resource_desc and dt: {cog_href}"
-                    )
-        else:
-            raise Exception(f"Metadata for year {year} is not supported.")
-
     else:
         res = maybe_extract_id_and_date(cog_href)
         if res is not None: