Merge branch 'main' into deprecate-snow-ice

stac-extensions · May 29, 2024 · 82320f4 · 82320f4
2 parents a1fbf13 + 8bee966
commit 82320f4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+- `s2:generation_time` in favor of `processing:datetime`
+
+- `s2:processing_baseline` in favor of `processing:version`
+
 ### Removed
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -39,8 +39,6 @@ The fields in the table below can be used in these parts of STAC documents:
 | s2:datastrip_id                         | string   | Datastrip Identifier                           |
 | s2:product_type                         | string   | Product Type                                   |
 | s2:datatake_type                        | string   | Datatake Type                                  |
-| s2:generation_time                      | datetime | Generation Time                                |
-| s2:processing_baseline                  | string   | [Processing Baseline](https://sentinels.copernicus.eu/web/sentinel/technical-guides/sentinel-2-msi/processing-baseline) |
 | s2:reflectance_conversion_factor        | number   | Reflectance Conversion Factor                  |
 | s2:water_percentage                     | number   | Water Percentage                               |
 | s2:vegetation_percentage                | number   | Vegetation Percentage                          |
@@ -55,6 +53,8 @@ The fields in the table below can be used in these parts of STAC documents:
 | s2:medium_proba_clouds_percentage       | number   | Medium Probability Clouds Percentage           |
 | s2:saturated_defective_pixel_percentage | number   | Saturated Defective Pixel Percentage           |
 | s2:snow_ice_percentage                  | number   | **DEPRECATED** Snow and Ice Percentage         |
+| s2:generation_time                      | datetime | **DEPRECATED** Generation Time                                |
+| s2:processing_baseline                  | string   | **DEPRECATED** [Processing Baseline](https://sentinels.copernicus.eu/web/sentinel/technical-guides/sentinel-2-msi/processing-baseline) |
 | s2:granule_id                           | string   | **DEPRECATED** Granule Identifier              |
 | s2:mgrs_tile                            | string   | **DEPRECATED** Sentinel-2 MGRS Tile Identifier |
 | s2:mean_solar_zenith                    | number   | **DEPRECATED** Mean Solar Zenith               |
@@ -64,6 +64,10 @@ The fields in the table below can be used in these parts of STAC documents:
 
 **s2:snow_ice_percentage** is deprecated in favor of `eo:snow_cover`
 
+**s2:generation_time** is deprecated in favor of `processing:datetime`
+
+**s2:processing_baseline** is deprecated in favor of `processing:version`
+
 **s2:granule_id** is deprecated in favor of `s2:tile_id`
 
 **s2:mean_solar_zenith** is deprecated in favor of the View Extension field `view:sun_elevation`

diff --git a/examples/item.json b/examples/item.json
@@ -712,11 +712,11 @@
     "s2:product_type": "S2MSI2A",
     "sat:orbit_state": "descending",
     "s2:datatake_type": "INS-NOBS",
-    "s2:generation_time": "2023-11-07T18:21:59.14490Z",
+    "processing:datetime": "2023-11-07T18:21:59.14490Z",
     "sat:relative_orbit": 139,
     "s2:water_percentage": 95.782292,
-    "s2:processing_baseline": "05.09",
     "eo:snow_cover": 0,
+    "processing:version": "05.09",
     "s2:vegetation_percentage": 0,
     "s2:thin_cirrus_percentage": 0.774645,
     "s2:cloud_shadow_percentage": 0,
@@ -734,7 +734,8 @@
     "https://stac-extensions.github.io/sentinel-2/v1.0.0/schema.json",
     "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/projection/v1.1.0/schema.json"
+    "https://stac-extensions.github.io/projection/v1.1.0/schema.json",
+    "https://stac-extensions.github.io/processing/v1.2.0/schema.json"
   ],
   "stac_version": "1.0.0"
 }
diff --git a/examples/item2.json b/examples/item2.json
@@ -24,6 +24,8 @@
     "eo:snow_cover": 0,
     "sat:orbit_state": "descending",
     "sat:relative_orbit": 13,
+    "processing:datetime": "2020-10-07T16:08:57.135Z",
+    "processing:version": "02.12",
     "proj:epsg": 32707,
     "proj:centroid": {
       "lat": -31.6824,
@@ -36,8 +38,6 @@
     "view:sun_azimuth": 62.3286549448294,
     "view:sun_elevation": 57.292926148638,
     "s2:product_uri": "S2A_MSIL2A_20190212T192651_N0212_R013_T07HFE_20201007T160857.SAFE",
-    "s2:generation_time": "2020-10-07T16:08:57.135Z",
-    "s2:processing_baseline": "02.12",
     "s2:product_type": "S2MSI2A",
     "s2:datatake_id": "GS2A_20190212T192651_019029_N02.12",
     "s2:datatake_type": "INS-NOBS",
@@ -1785,6 +1785,7 @@
     "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/processing/v1.2.0/schema.json",
     "https://stac-extensions.github.io/projection/v1.1.0/schema.json",
     "https://stac-extensions.github.io/mgrs/v1.0.0/schema.json",
     "https://stac-extensions.github.io/grid/v1.1.0/schema.json",

diff --git a/json-schema/schema.json b/json-schema/schema.json
@@ -58,8 +58,6 @@
         { "required": ["s2:datastrip_id"] },
         { "required": ["s2:product_type"] },
         { "required": ["s2:datatake_type"] },
-        { "required": ["s2:generation_time"] },
-        { "required": ["s2:processing_baseline"] },
         { "required": ["s2:water_percentage"] },
         { "required": ["s2:vegetation_percentage"] },
         { "required": ["s2:thin_cirrus_percentage"] },
@@ -110,12 +108,14 @@
         "s2:generation_time": {
           "title": "Generation Time",
           "type": "string",
-          "format": "date-time"
+          "format": "date-time",
+          "deprecated": true
         },
         "s2:processing_baseline": {
           "title": "Processing Baseline",
           "type": "string",
-          "pattern": "^\\d\\d\\.\\d\\d$"
+          "pattern": "^\\d\\d\\.\\d\\d$",
+          "deprecated": true
         },
         "s2:water_percentage": {
           "title": "Water Percentage",