Merge version 0.6.0 into master (#370)

* feat(electron): don’t show dev tools on load (#350) * 0.5.1 * feat(layer-info): use markdown for layer description * fix(globe): fix problems with touch devices in compare mode (#359) * fix(globe): make tile changes less “flickery” (#360) * feat(globe): use new basemap tiles (#364) * fix(globe): use correct version in basemap url (#365) * fix(data): update data triggers * fix(data): download complete time ranges * Feat add content (#367) * feat(config): extract base url allows to easily override the baseurl for local content development * fix(stories): format inline image captions but keep regular ems we only want ems that follw an image to be treated as inline captions, regular ems should stay inline * feat(stories): add parameters to youtube embed adding some more parameters to confuigure the youtube embed * feat(layers): adding first round of datalayer descriptions * feat(stories): adding breaking the ice story * feat(gitignore): ignore aple system file ignoring the .ds_store files. Got them when importing assets for stories * feat(stories): adding ozone story * feat(stories): renaming and adding stories * feat(stories): renaming story * feat(stories): added translations for new tags * fix(stories): fix typo in tag name * Feat stories minor adjustments (#368) * feat(upload): forcing file copy to prevent user interaction * feat(ozone story): add cover image * 0.6.0 (#369) Co-authored-by: Philipp Wambach <pwambach@users.noreply.github.com> Co-authored-by: Philipp Wambach <philippwambach@googlemail.com>
ubilabs · Jun 29, 2020 · edfd322 · edfd322
1 parent 6ab46f7
commit edfd322
Show file tree

Hide file tree

Showing 108 changed files with 979 additions and 211 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ dist-src-electron
 storage/**/*.zip
 download
 *.ipynb
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# [0.6.0](https://github.com/ubilabs/esa-climate-from-space/compare/v0.5.1...v0.6.0) (2020-06-29)
+
+
+### Bug Fixes
+
+* **data:** download complete time ranges ([03923bc](https://github.com/ubilabs/esa-climate-from-space/commit/03923bc67c0357cb1dda92696daea3c5f336fec2))
+* **data:** update data triggers ([bd21777](https://github.com/ubilabs/esa-climate-from-space/commit/bd2177749a8bd3f5840b154dc79062359f379b24))
+* **globe:** fix problems with touch devices in compare mode ([#359](https://github.com/ubilabs/esa-climate-from-space/issues/359)) ([d34f18f](https://github.com/ubilabs/esa-climate-from-space/commit/d34f18f72892cd597b0f730287fee8487ade736d))
+* **globe:** make tile changes less “flickery” ([#360](https://github.com/ubilabs/esa-climate-from-space/issues/360)) ([5b26cf5](https://github.com/ubilabs/esa-climate-from-space/commit/5b26cf5bf5d0f5bfbc54017216b388efe691ddf5))
+* **globe:** use correct version in basemap url ([#365](https://github.com/ubilabs/esa-climate-from-space/issues/365)) ([6738a05](https://github.com/ubilabs/esa-climate-from-space/commit/6738a05f3c145716918be44f77914c6a6c53479d))
+
+
+### Features
+
+* **globe:** use new basemap tiles ([#364](https://github.com/ubilabs/esa-climate-from-space/issues/364)) ([bb5660a](https://github.com/ubilabs/esa-climate-from-space/commit/bb5660a5dff321ed127479446d83731a52fcf52d))
+* **layer-info:** use markdown for layer description ([b53528c](https://github.com/ubilabs/esa-climate-from-space/commit/b53528cb80ed6c9e72eb5e7fa61a9fc869ba7221))
+
+
+
+## [0.5.1](https://github.com/ubilabs/esa-climate-from-space/compare/v0.5.0...v0.5.1) (2020-06-10)
+
+
+### Features
+
+* **electron:** don’t show dev tools on load ([#350](https://github.com/ubilabs/esa-climate-from-space/issues/350)) ([d41423d](https://github.com/ubilabs/esa-climate-from-space/commit/d41423d463d40d62e345f5f2ee74289dd43157e7))
+
+
+
 # [0.5.0](https://github.com/ubilabs/esa-climate-from-space/compare/v0.4.1...v0.5.0) (2020-06-10)
 
 

diff --git a/data/downloads/odp-ftp-aerosol.sh b/data/downloads/odp-ftp-aerosol.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/aerosol/data/AATSR_SU/L3/v4.21/MONTHLY/"
 START_DATE=2002-07-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/aerosol
 
-for i in {0..24}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..117}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-cloud.sh b/data/downloads/odp-ftp-cloud.sh
diff --git a/data/downloads/odp-ftp-fire.sh b/data/downloads/odp-ftp-fire.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/fire/data/burned_area/MODIS/grid/v5.1"
 START_DATE=2001-01-01
-OUTPUT_FOLDER=./download
+OUTPUT_FOLDER=./download/fire
 
-for i in {0..4}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..227}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_DATE_SPACE=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-land-cover.sh b/data/downloads/odp-ftp-land-cover.sh
@@ -2,11 +2,14 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/land_cover/data/land_cover_maps/v2.0.7/ESACCI-LC-L4-LCCS-Map-300m-P1Y-"
 START_DATE=1992-01-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/land-cover
 
-for i in {0..2}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..23}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i year")
+  NEXT_DATE=$(date +%Y-%m-%d -d "$START_DATE + $i year")
   FILENAME=$OUTPUT_FODLER/$(date +%Y%m%d -d "$START_DATE + $i year").nc
   FTP_URL=$BASE_URL$NEXT_YEAR-v2.0.7b.nc
   echo $FTP_URL

diff --git a/data/downloads/odp-ftp-oc.sh b/data/downloads/odp-ftp-oc.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/ocean_colour/data/v4.0-release/geographic/netcdf/chlor_a/monthly/v4.0/"
 START_DATE=1997-09-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/oc
 
-for i in {0..10}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..255}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-ozone.sh b/data/downloads/odp-ftp-ozone.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/ozone/data/total_columns/l3/merged/v0100"
 START_DATE=2001-04-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/ozone
 
-for i in {0..10}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..122}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-permafrost.sh b/data/downloads/odp-ftp-permafrost.sh
@@ -2,13 +2,15 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/permafrost/data/permafrost_extent/L4/area4/pp/v01.0/ESACCI-PERMAFROST-L4-MODIS-PFR-AREA4_PP"
 START_DATE=2003-01-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/permafrost
 
-for i in {0..5}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..14}
 do
-  NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
-  NEXT_DATE=$(date +%Y-%m-%d -d "$START_DATE + $i month")
-  FILENAME=$OUTPUT_FODLER/$(date +%Y%m%d -d "$START_DATE + $i month").nc
+  NEXT_YEAR=$(date +%Y -d "$START_DATE + $i year")
+  NEXT_DATE=$(date +%Y-%m-%d -d "$START_DATE + $i year")
+  FILENAME=$OUTPUT_FODLER/$(date +%Y%m%d -d "$START_DATE + $i year").nc
   FTP_URL=$BASE_URL"-"$NEXT_YEAR"-fv01.0.nc"
   echo $FTP_URL
 

diff --git a/data/downloads/odp-ftp-sea-ice.sh b/data/downloads/odp-ftp-sea-ice.sh
@@ -3,12 +3,12 @@
 BASE_URL_SH="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sea_ice/data/sea_ice_concentration/L4/amsr/25km/v2.1/SH"
 BASE_URL_NH="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sea_ice/data/sea_ice_concentration/L4/amsr/25km/v2.1/NH"
 START_DATE=2002-06-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/sea-ice
 
-mkdir $OUTPUT_FODLER/NH
-mkdir $OUTPUT_FODLER/SH
+mkdir -p $OUTPUT_FODLER/NH
+mkdir -p $OUTPUT_FODLER/SH
 
-for i in {0..5}
+for i in {0..179}
 do
   NEXT_YEAR=$(date +%Y/%m -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-sea-level.sh b/data/downloads/odp-ftp-sea-level.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sea_level/data/L4/MSLA/v2.0/"
 START_DATE=1994-01-15
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/sea-level
 
-for i in {0..10}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..263}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-sea-state.sh b/data/downloads/odp-ftp-sea-state.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sea_state/data/v1.1_release/l4/v1.1"
-START_DATE=1993-01-01
-OUTPUT_FODLER=./download
+START_DATE=1991-08-01
+OUTPUT_FODLER=./download/sea-state
 
-for i in {0..10}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..328}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-sea-surface-salinity.sh b/data/downloads/odp-ftp-sea-surface-salinity.sh
@@ -2,9 +2,11 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sea_surface_salinity/data/v01.8/30days"
 START_DATE=2010-01-01
-OUTPUT_FODLER=./download
+OUTPUT_FODLER=./download/sss
 
-for i in {0..5}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..106}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_DATE=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-soil-moisture.sh b/data/downloads/odp-ftp-soil-moisture.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/soil_moisture/data/daily_files/COMBINED/v04.5"
-START_DATE=1987-11-01
-OUTPUT_FODLER=./download
+START_DATE=1978-11-01
+OUTPUT_FODLER=./download/soil
 
-for i in {0..5}
+mkdir -p $OUTPUT_FODLER
+
+for i in {0..481}
 do
   NEXT_YEAR=$(date +%Y -d "$START_DATE + $i month")
   NEXT_MONTH=$(date +%Y%m%d -d "$START_DATE + $i month")

diff --git a/data/downloads/odp-ftp-sst.sh b/data/downloads/odp-ftp-sst.sh
@@ -2,15 +2,19 @@
 
 BASE_URL="ftp://anon-ftp.ceda.ac.uk/neodc/esacci/sst/data/CDR_v2/Analysis/L4/v2.1/"
 START_DATE=1981-09-01
-OUTPUT_FODLER=./download
+OUTPUT_FOLDER=./download/sst
 
-for i in {0..4}
+mkdir -p $OUTPUT_FOLDER
+
+for i in {0..423}
 do
-  NEXT_DATE=$(date +%Y/%m/%d -d "$START_DATE + $i day")
-  NEXT_DATE_SPACE=$(date +%Y%m%d -d "$START_DATE + $i day")
+  NEXT_DATE=$(date +%Y/%m/%d -d "$START_DATE + $i month")
+  NEXT_DATE_SPACE=$(date +%Y%m%d -d "$START_DATE + $i month")
   FILENAME=$OUTPUT_FOLDER/$(date +%Y%m%d -d "$START_DATE + $i month").nc
   FTP_URL=$BASE_URL$NEXT_DATE/$NEXT_DATE_SPACE"120000-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc"
   echo $FTP_URL
 
   curl --silent $FTP_URL > $FILENAME
+
+  python ./data/drop-unused-vars.py --file $FILENAME --variable analysed_sst
 done
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"