fix(data): update data triggers

ubilabs · Jun 22, 2020 · bd21777 · bd21777
1 parent 6738a05
commit bd21777
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 59 deletions.
diff --git a/data/gdal-colors/colors-ice_conc.txt b/data/gdal-colors/colors-ice_conc.txt
@@ -1,3 +1,3 @@
 10000 0 255 0
-0 255 0 0
+0 255 0 0 0
 nv 0 255 255 0
diff --git a/data/layers-config.json b/data/layers-config.json
@@ -1,6 +1,6 @@
 {
   "fire.burned_area": {
-    "colorMap": "hot",
+    "colorMap": "afmhot",
     "timeFormat": {
       "year": "2-digit",
       "month": "numeric",
@@ -24,15 +24,15 @@
     }
   },
   "aerosol.AOD550_mean": {
-    "colorMap": "inferno",
+    "colorMap": "Oranges",
     "timeFormat": {
       "year": "numeric",
       "month": "long",
       "day": "2-digit"
     }
   },
   "cloud.cfc": {
-    "colorMap": "bone",
+    "colorMap": "gray",
     "timeFormat": {
       "year": "numeric",
       "month": "long",
@@ -56,15 +56,15 @@
     }
   },
   "soil_moisture.sm": {
-    "colorMap": "inferno",
+    "colorMap": "BrBG",
     "timeFormat": {
       "year": "numeric",
       "month": "long",
       "day": "2-digit"
     }
   },
   "ozone.atmosphere_mole_content_of_ozone": {
-    "colorMap": "jet",
+    "colorMap": "viridis",
     "timeFormat": {
       "year": "numeric",
       "month": "long",

diff --git a/data/triggers/aerosol_aod550_mean.sh b/data/triggers/aerosol_aod550_mean.sh
@@ -3,10 +3,10 @@
 TIMEOUT=8000
 LAYER_ID="aerosol.AOD550_mean"
 VARIABLE_ID="AOD550_mean"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
-MIN="auto"
-MAX="auto"
+MIN="0"
+MAX="5"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/biomass_agb.sh b/data/triggers/biomass_agb.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-TIMEOUT=2000
+TIMEOUT=8000
 LAYER_ID="biomass.agb"
 VARIABLE_ID="agb"
-VERSION="0.4.1"
-ZOOM_LEVELS="0-7"
+VERSION="0.5.1"
+ZOOM_LEVELS="0-5"
 MIN_LON="-180"
 MAX_LON="180"
 MIN_LAT="-60"
@@ -18,6 +18,9 @@ if [ ! -f ./package.json ]; then
     exit 1
 fi
 
+# Note! If process takes too long use "-ts 81000 x 31500 \" in gdalwarp command to
+# output only a 1/5th-resolution image
+
 gcloud builds submit --config ./ci/cloudbuild-tiles-reproject.yaml \
   --machine-type=$MACHINE_TYPE \
   --timeout=$TIMEOUT \

diff --git a/data/triggers/cloud_cfc.sh b/data/triggers/cloud_cfc.sh
@@ -3,10 +3,10 @@
 TIMEOUT=8000
 LAYER_ID="cloud.cfc"
 VARIABLE_ID="cfc"
-VERSION="test"
-ZOOM_LEVELS="0-4"
-MIN="auto"
-MAX="auto"
+VERSION="0.5.1"
+ZOOM_LEVELS="0-3"
+MIN="0"
+MAX="1"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/fire_burned_area.sh b/data/triggers/fire_burned_area.sh
@@ -3,10 +3,10 @@
 TIMEOUT=8000
 LAYER_ID="fire.burned_area"
 VARIABLE_ID="burned_area"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
-MIN="auto"
-MAX="auto"
+MIN="0"
+MAX="400000000"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/greenhouse_xch4.sh b/data/triggers/greenhouse_xch4.sh
@@ -3,7 +3,7 @@
 TIMEOUT=3000
 LAYER_ID="greenhouse.xch4"
 VARIABLE_ID="xch4"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-2"
 MIN_LON="-180"
 MAX_LON="180"

diff --git a/data/triggers/greenhouse_xco2.sh b/data/triggers/greenhouse_xco2.sh
@@ -3,7 +3,7 @@
 TIMEOUT=3000
 LAYER_ID="greenhouse.xco2"
 VARIABLE_ID="xco2"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN_LON="-180"
 MAX_LON="180"

diff --git a/data/triggers/greenland_ice_sec.sh b/data/triggers/greenland_ice_sec.sh
@@ -3,7 +3,7 @@
 TIMEOUT=2000
 LAYER_ID="greenland_ice.sec"
 VARIABLE_ID="SEC"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN_LON="-90"
 MAX_LON="7.594643368591434"

diff --git a/data/triggers/land_cover_lccs_class.sh b/data/triggers/land_cover_lccs_class.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-TIMEOUT=8000
+TIMEOUT=12000
 LAYER_ID="land_cover.lccs_class"
 VARIABLE_ID="lccs_class"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-6"
 MIN_LON="-180"
 MAX_LON="180"

diff --git a/data/triggers/oc_chlor_a.sh b/data/triggers/oc_chlor_a.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-TIMEOUT=8000
+TIMEOUT=12000
 LAYER_ID="oc.chlor_a"
 VARIABLE_ID="chlor_a"
-VERSION="test"
-ZOOM_LEVELS="0-4"
+VERSION="0.5.1"
+ZOOM_LEVELS="0-3"
 MIN=0
 MAX=2
 MACHINE_TYPE="N1_HIGHCPU_8"
@@ -14,8 +14,8 @@ if [ ! -f ./package.json ]; then
     exit 1
 fi
 
-# --machine-type=$MACHINE_TYPE \
 gcloud builds submit --config ./ci/cloudbuild-tiles.yaml \
+  --machine-type=$MACHINE_TYPE \
   --timeout=$TIMEOUT \
   --substitutions _LAYER_ID=$LAYER_ID,_VARIABLE_ID=$VARIABLE_ID,_ZOOM_LEVELS=$ZOOM_LEVELS,_VERSION=$VERSION,_MIN=$MIN,_MAX=$MAX \
   .
diff --git a/data/triggers/ozone_atmosphere_mole_content_of_ozone.sh b/data/triggers/ozone_atmosphere_mole_content_of_ozone.sh
@@ -3,10 +3,10 @@
 TIMEOUT=8000
 LAYER_ID="ozone.atmosphere_mole_content_of_ozone"
 VARIABLE_ID="atmosphere_mole_content_of_ozone"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
-MIN="auto"
-MAX="auto"
+MIN="100"
+MAX="500"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/permafrost_pfr.sh b/data/triggers/permafrost_pfr.sh
@@ -3,7 +3,7 @@
 TIMEOUT=2000
 LAYER_ID="permafrost.pfr"
 VARIABLE_ID="PFR"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-4"
 MIN_LON="-180"
 MAX_LON="180"

diff --git a/data/triggers/sea_ice_nh_ice_conc.sh b/data/triggers/sea_ice_nh_ice_conc.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 
-TIMEOUT=2000
+TIMEOUT=8000
 LAYER_ID="sea_ice_nh.ice_conc"
 VARIABLE_ID="ice_conc"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-4"
 MIN_LON="-180"
 MAX_LON="180"
 MIN_LAT="16.62393"
 MAX_LAT="90"
-MIN="auto"
-MAX="auto"
+MIN="0"
+MAX="100"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/sea_ice_sh_ice_conc.sh b/data/triggers/sea_ice_sh_ice_conc.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 
-TIMEOUT=2000
+TIMEOUT=8000
 LAYER_ID="sea_ice_sh.ice_conc"
 VARIABLE_ID="ice_conc"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN_LON="-180"
 MAX_LON="180"
 MIN_LAT="-90"
 MAX_LAT="-16.62393"
-MIN="auto"
-MAX="auto"
+MIN="0"
+MAX="100"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/sea_level_sla.sh b/data/triggers/sea_level_sla.sh
@@ -1,21 +1,21 @@
 #!/usr/bin/env bash
 
-TIMEOUT=8000
+TIMEOUT=10000
 LAYER_ID="sea_level.sla"
 VARIABLE_ID="sla"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
-MIN="auto"
-MAX="auto"
+MIN="-0.5"
+MAX="0.5"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then
     echo "You have to be in the root folder of the project to run this script!"
     exit 1
 fi
 
-# --machine-type=$MACHINE_TYPE \
 gcloud builds submit --config ./ci/cloudbuild-tiles.yaml \
+  --machine-type=$MACHINE_TYPE \
   --timeout=$TIMEOUT \
   --substitutions _LAYER_ID=$LAYER_ID,_VARIABLE_ID=$VARIABLE_ID,_ZOOM_LEVELS=$ZOOM_LEVELS,_VERSION=$VERSION,_MIN=$MIN,_MAX=$MAX \
   .
diff --git a/data/triggers/sea_state_swh_mean.sh b/data/triggers/sea_state_swh_mean.sh
@@ -3,7 +3,7 @@
 TIMEOUT=8000
 LAYER_ID="sea_state.swh_mean"
 VARIABLE_ID="swh_mean"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN="auto"
 MAX="auto"

diff --git a/data/triggers/sea_surface_salinity_sss.sh b/data/triggers/sea_surface_salinity_sss.sh
@@ -3,7 +3,7 @@
 TIMEOUT=8000
 LAYER_ID="sea_surface_salinity.sss"
 VARIABLE_ID="sss"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN="auto"
 MAX="auto"

diff --git a/data/triggers/snow_swe.sh b/data/triggers/snow_swe.sh
@@ -3,7 +3,7 @@
 TIMEOUT=8000
 LAYER_ID="snow.swe"
 VARIABLE_ID="swe"
-VERSION="0.4.1"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
 MIN="auto"
 MAX="auto"

diff --git a/data/triggers/soil_moisture_sm.sh b/data/triggers/soil_moisture_sm.sh
@@ -3,10 +3,10 @@
 TIMEOUT=8000
 LAYER_ID="soil_moisture.sm"
 VARIABLE_ID="sm"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-3"
-MIN="auto"
-MAX="auto"
+MIN="0"
+MAX="0.4"
 MACHINE_TYPE="N1_HIGHCPU_8"
 
 if [ ! -f ./package.json ]; then

diff --git a/data/triggers/sst_analysed_sst.sh b/data/triggers/sst_analysed_sst.sh
@@ -3,19 +3,19 @@
 TIMEOUT=12000
 LAYER_ID="sst.analysed_sst"
 VARIABLE_ID="analysed_sst"
-VERSION="test"
+VERSION="0.5.1"
 ZOOM_LEVELS="0-4"
-MIN="auto"
-MAX="auto"
+MIN="-5"
+MAX="35"
 MACHINE_TYPE="N1_HIGHCPU_32"
 
 if [ ! -f ./package.json ]; then
     echo "You have to be in the root folder of the project to run this script!"
     exit 1
 fi
 
-# --machine-type=$MACHINE_TYPE \
 gcloud builds submit --config ./ci/cloudbuild-tiles.yaml \
+  --machine-type=$MACHINE_TYPE \
   --timeout=$TIMEOUT \
   --substitutions _LAYER_ID=$LAYER_ID,_VARIABLE_ID=$VARIABLE_ID,_ZOOM_LEVELS=$ZOOM_LEVELS,_VERSION=$VERSION,_MIN=$MIN,_MAX=$MAX \
   .
diff --git a/data/utility.py b/data/utility.py
@@ -30,10 +30,10 @@ def write_world_file(shape, attributes):
   lon_max = 180
 
   try:
-    lat_min = attributes['geospatial_lat_min']
-    lat_max = attributes['geospatial_lat_max']
-    lon_min = attributes['geospatial_lon_min']
-    lon_max = attributes['geospatial_lon_max']
+    lat_min = float(attributes['geospatial_lat_min'])
+    lat_max = float(attributes['geospatial_lat_max'])
+    lon_min = float(attributes['geospatial_lon_min'])
+    lon_max = float(attributes['geospatial_lon_max'])
   except KeyError:
     print("Write Worldfile: Could not read geospatil info using defauls!")