Merge branch 'master' of github.com:NASA-IMPACT/covid-api

NASA-IMPACT · Nov 11, 2020 · a2e256b · a2e256b
2 parents d29fae2 + 68854f4
commit a2e256b
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 24 deletions.
diff --git a/covid_api/db/static/datasets/__init__.py b/covid_api/db/static/datasets/__init__.py
@@ -1,6 +1,5 @@
 """ covid_api static datasets """
 import os
-import re
 from copy import deepcopy
 from typing import Any, Dict, List, Set
 
@@ -245,10 +244,13 @@ def _get_global_datasets(self):
         filtering out datasets where the "source.tiles" value contains either
         `spotlightId`.
         """
+
         return {
             k: v
             for k, v in self._data.items()
-            if not re.search(r"{spotlightId}", v.source.tiles[0])
+            if not any(
+                i in v.source.tiles[0] for i in ["{spotlightId}", "greatlakes", "togo"]
+            )
         }
 
 

diff --git a/covid_api/db/static/datasets/no2-diff.json b/covid_api/db/static/datasets/no2-diff.json
@@ -8,7 +8,7 @@
     "source": {
         "type": "raster",
         "tiles": [
-            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/OMNO2d_HRMDifference/OMI_trno2_0.10x0.10_{date}_Col3_V4.nc.tif&resampling_method=bilinear&bidx=1&rescale=-8000000000000000%2C8000000000000000&color_map=rdbu_r&color_formula=gamma r {gamma}"
+            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/OMNO2d_HRMDifference/OMI_trno2_0.10x0.10_{date}_Col3_V4.nc.tif&resampling_method=bilinear&bidx=1&rescale=-8000000000000000%2C8000000000000000&color_map=rdbu_r"
         ]
     },
     "exclusive_with": [

diff --git a/covid_api/db/static/datasets/wq-gl-chl.json b/covid_api/db/static/datasets/wq-gl-chl.json
@@ -2,12 +2,12 @@
     "id": "water-wq-gl-chl",
     "name": "Chlorophyll",
     "type": "raster-timeseries",
-    "s3_location": "wq-greatlakes-chl",
+    "s3_location": "wq-gl-chl",
     "time_unit": "day",
     "source": {
         "type": "raster",
         "tiles": [
-            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/wq-greatlakes-chl/chl_anomaly_greatlakes_{date}.tif&resampling_method=bilinear&bidx=1&rescale=-100%2C100&color_map=rdbu_r"
+            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/wq-gl-chl/chl_anomaly_greatlakes_{date}.tif&resampling_method=bilinear&bidx=1&rescale=-100%2C100&color_map=rdbu_r"
         ]
     },
     "exclusive_with": [

diff --git a/covid_api/db/static/datasets/wq-gl-spm.json b/covid_api/db/static/datasets/wq-gl-spm.json
@@ -3,11 +3,11 @@
     "name": "Turbidity",
     "type": "raster-timeseries",
     "time_unit": "day",
-    "s3_location": "wq-greatlakes-sm",
+    "s3_location": "wq-gl-spm",
     "source": {
         "type": "raster",
         "tiles": [
-            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/wq-greatlakes-sm/sm_anomaly_greatlakes_{date}.tif&resampling_method=bilinear&bidx=1&rescale=-100%2C100&color_map=rdbu_r"
+            "{api_url}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/wq-gl-spm/sm_anomaly_greatlakes_{date}.tif&resampling_method=bilinear&bidx=1&rescale=-100%2C100&color_map=rdbu_r"
         ]
     },
     "exclusive_with": [

diff --git a/covid_api/db/static/sites/gl.json b/covid_api/db/static/sites/gl.json
@@ -0,0 +1,41 @@
+{
+  "id": "gl",
+  "label": "Great Lakes",
+  "center": [
+    -83.05755,
+    43.22715
+  ],
+  "polygon": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          -84.3695,
+          41.2530
+        ],
+        [
+          -81.7492,
+          41.2530
+        ],
+        [
+          -81.7492,
+          45.2013
+        ],
+        [
+          -84.3695,
+          45.2013
+        ],
+        [
+          -84.3695,
+          41.2530
+        ]
+      ]
+    ]
+  },
+  "bounding_box": [
+    -84.3695,
+    45.2013,
+    -81.7492,
+    41.2530
+  ]
+}
diff --git a/covid_api/db/static/sites/wble.json b/covid_api/db/static/sites/wble.json
diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
 
 setup(
     name="covid_api",
-    version="0.3.0",
+    version="0.3.1",
     description=u"",
     long_description=long_description,
     long_description_content_type="text/markdown",