Merge pull request #63 from nsidc/0.18.1

0.19.0: Add legendRelativePath to `regions/root.json`, set cache `max-age`
nsidc · Mar 5, 2024 · 44917b2 · 44917b2
2 parents a3e1fad + 2f73eaa
commit 44917b2
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.19.0 (2024-03-05)
+
+* Set `Cache-Control: max-age=900` header in NGINX server
+* Add `legendRelativePath` to `snow-surface-properties/regions/root.json` at the
+  variable level.
+* Update some variable-level labels, names, other text.
+
+
 # v0.18.0 (2024-03-04)
 
 * Change `historicStartWaterYear` -> `historicWaterYearRange`, a tuple including end

diff --git a/VERSION.env b/VERSION.env
@@ -1 +1 @@
-export SERVER_VERSION="v0.18.0"
+export SERVER_VERSION="v0.19.0"
diff --git a/doc/interfaces/incoming_snow_surface_properties/example_data/regions/root.json b/doc/interfaces/incoming_snow_surface_properties/example_data/regions/root.json
@@ -12,7 +12,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26100_51.tif"
+        "geotiffRelativePath": "regions/cogs/26100_51.tif",
+        "legendRelativePath": "regions/legends/26100_51.tif"
       },
       "45": {
         "default": false,
@@ -22,7 +23,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26100_45.tif"
+        "geotiffRelativePath": "regions/cogs/26100_45.tif",
+        "legendRelativePath": "regions/legends/26100_45.tif"
       },
       "40": {
         "default": true,
@@ -32,7 +34,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26100_40.tif"
+        "geotiffRelativePath": "regions/cogs/26100_40.tif",
+        "legendRelativePath": "regions/legends/26100_40.tif"
       },
       "44": {
         "default": false,
@@ -42,7 +45,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26100_44.tif"
+        "geotiffRelativePath": "regions/cogs/26100_44.tif",
+        "legendRelativePath": "regions/legends/26100_44.tif"
       }
     },
     "subRegionsRelativePath": "regions/26100.json",
@@ -62,7 +66,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2018, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26004_51.tif"
+        "geotiffRelativePath": "regions/cogs/26004_51.tif",
+        "legendRelativePath": "regions/legends/26004_51.tif"
       },
       "45": {
         "default": false,
@@ -72,7 +77,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2018, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26004_45.tif"
+        "geotiffRelativePath": "regions/cogs/26004_45.tif",
+        "legendRelativePath": "regions/legends/26004_45.tif"
       },
       "40": {
         "default": true,
@@ -82,7 +88,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2018, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26004_40.tif"
+        "geotiffRelativePath": "regions/cogs/26004_40.tif",
+        "legendRelativePath": "regions/legends/26004_40.tif"
       },
       "44": {
         "default": false,
@@ -92,7 +99,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2018, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26004_44.tif"
+        "geotiffRelativePath": "regions/cogs/26004_44.tif",
+        "legendRelativePath": "regions/legends/26004_44.tif"
       }
     },
     "subRegionsRelativePath": "regions/26004.json",
@@ -112,7 +120,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26101_51.tif"
+        "geotiffRelativePath": "regions/cogs/26101_51.tif",
+        "legendRelativePath": "regions/legends/26101_51.tif"
       },
       "45": {
         "default": false,
@@ -122,7 +131,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26101_45.tif"
+        "geotiffRelativePath": "regions/cogs/26101_45.tif",
+        "legendRelativePath": "regions/legends/26101_45.tif"
       },
       "40": {
         "default": true,
@@ -132,7 +142,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26101_40.tif"
+        "geotiffRelativePath": "regions/cogs/26101_40.tif",
+        "legendRelativePath": "regions/legends/26101_40.tif"
       },
       "44": {
         "default": false,
@@ -142,7 +153,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26101_44.tif"
+        "geotiffRelativePath": "regions/cogs/26101_44.tif",
+        "legendRelativePath": "regions/legends/26101_44.tif"
       }
     },
     "subRegionsRelativePath": "regions/26101.json",
@@ -162,7 +174,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26002_51.tif"
+        "geotiffRelativePath": "regions/cogs/26002_51.tif",
+        "legendRelativePath": "regions/legends/26002_51.tif"
       },
       "45": {
         "default": false,
@@ -172,7 +185,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26002_45.tif"
+        "geotiffRelativePath": "regions/cogs/26002_45.tif",
+        "legendRelativePath": "regions/legends/26002_45.tif"
       },
       "40": {
         "default": true,
@@ -182,7 +196,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26002_40.tif"
+        "geotiffRelativePath": "regions/cogs/26002_40.tif",
+        "legendRelativePath": "regions/legends/26002_40.tif"
       },
       "44": {
         "default": false,
@@ -192,7 +207,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26002_44.tif"
+        "geotiffRelativePath": "regions/cogs/26002_44.tif",
+        "legendRelativePath": "regions/legends/26002_44.tif"
       }
     },
     "subRegionsRelativePath": "regions/26002.json",
@@ -212,7 +228,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26000_51.tif"
+        "geotiffRelativePath": "regions/cogs/26000_51.tif",
+        "legendRelativePath": "regions/legends/26000_51.tif"
       },
       "45": {
         "default": false,
@@ -222,7 +239,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26000_45.tif"
+        "geotiffRelativePath": "regions/cogs/26000_45.tif",
+        "legendRelativePath": "regions/legends/26000_45.tif"
       },
       "40": {
         "default": true,
@@ -232,7 +250,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26000_40.tif"
+        "geotiffRelativePath": "regions/cogs/26000_40.tif",
+        "legendRelativePath": "regions/legends/26000_40.tif"
       },
       "44": {
         "default": false,
@@ -242,7 +261,8 @@
         "lastDateWithData": "2023-04-03",
         "historicWaterYearRange": [2001, 2020],
         "historicSource": "JPL modscag/drfs",
-        "geotiffRelativePath": "regions/cogs/26000_44.tif"
+        "geotiffRelativePath": "regions/cogs/26000_44.tif",
+        "legendRelativePath": "regions/legends/26000_44.tif"
       }
     },
     "subRegionsRelativePath": "regions/26000.json",

diff --git a/nginx/default.conf b/nginx/default.conf
@@ -14,6 +14,7 @@ server {
         autoindex on;
 
         add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Cache-Control' 'max-age=900';
 
         # Hacky support for CORS pre-flight OPTIONS requests
         if ($request_method = OPTIONS) {

diff --git a/snow_today_webapp_ingest/types_/regions.py b/snow_today_webapp_ingest/types_/regions.py
@@ -88,6 +88,7 @@ class SuperRegionVariable(BaseModel):
     )
     historic_source: str = Field(description="The source of the climatology")
     geotiff_relative_path: Path
+    legend_relative_path: Path
 
 
 class SuperRegion(SubRegion):