Merge branch 'dev'

data-mermaid · Dec 8, 2023 · 0d18497 · 0d18497
2 parents 7e982fa + 7ff1715
commit 0d18497
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/components/LeafletMap.js b/src/components/LeafletMap.js
@@ -82,14 +82,14 @@ const generateClusterIconStyle = ({
 }
 
 const miniMapLayer = L.tileLayer(
-  'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}{r}.{ext}',
+  'https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}{r}.{extension}',
   {
     attribution:
-      'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+      'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> &mdash; Data by &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a>, under <a href="https://www.openstreetmap.org/copyright">ODbL</a>',
     subdomains: 'abcd',
     minZoom: 0,
     maxZoom: 13,
-    ext: 'png',
+    extension: 'png',
   },
 )
 

diff --git a/src/constants/attribute-colors.js b/src/constants/attribute-colors.js
@@ -24,8 +24,12 @@ export const fishBeltAttributeColors = [
 
 export const bleachingAttributeColors = [
   { name: 'Normal', color: '#3c6e99' },
-  { name: 'Pale', color: '#a8bed5' },
-  { name: 'Bleached & Recently Dead', color: '#B4B4B4' },
+  { name: 'Pale', color: '#6288ad' },
+  { name: 'Up to 20% Bleached', color: '#85a3c1' },
+  { name: '20% - 50% Bleached', color: '#a8bed5' },
+  { name: '50% - 80% Bleached', color: '#cbdaea' },
+  { name: '80% - 100% Bleached', color: '#eff7ff' },
+  { name: 'Recently Dead', color: '#B4B4B4' },
 ]
 
 export const privateColorScale = [

diff --git a/src/constants/sample-unit-information.js b/src/constants/sample-unit-information.js
@@ -16,7 +16,11 @@ export const BLEACHING_PROPERTY_COLONIES_BLEACHED = 'colonies_bleached'
 export const bleachingCategories = [
   { type: 'percent_normal_avg', name: 'Normal' },
   { type: 'percent_pale_avg', name: 'Pale' },
-  { type: 'percent_bleached_avg', name: 'Bleached & Recently Dead' },
+  { type: 'percent_20_avg', name: 'Up to 20% Bleached' },
+  { type: 'percent_50_avg', name: '20% - 50% Bleached' },
+  { type: 'percent_80_avg', name: '50% - 80% Bleached' },
+  { type: 'percent_100_avg', name: '80% - 100% Bleached' },
+  { type: 'percent_dead_avg', name: 'Recently Dead' },
 ]
 export const chartContentProperties = {
   [BENTHIC_LIT_SAMPLE_UNIT]: 'percent_cover_benthic_category_avg',