Merge branch 'release-4.8.13'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 4.8.13
+- Removed MPA download option
+- Changed Mapbox basemap to most recent version
+- Hid PA growth charts from country pages
+- Changed PA text to include "and other effective area-based conservation measures"
+
 ### 4.8.12
 - Removed Western Sahara flag
 - Fixed French Guiana typo

app/controllers/marine_controller.rb

@@ -20,7 +20,8 @@ def index
     @marineSitesTotal = number_with_delimiter(ProtectedArea.marine_areas.count())
     @marineViewAllUrl = search_areas_path(filters: {is_type: ['marine']}) 
 
-    @download_options = helpers.download_options(['csv', 'shp', 'gdb', 'mpa_map'], 'general', 'marine')
+    # Removed mpa_map from ['csv', 'shp', 'gdb', 'map_map'] in feat/hide-mpa-download-button
+    @download_options = helpers.download_options(['csv', 'shp', 'gdb'], 'general', 'marine')
 
     @regionCoverage = Region.without_global.map do |region|
       RegionPresenter.new(region).marine_coverage

app/javascript/components/map/default-options.js

@@ -2,12 +2,12 @@ export const BASELAYERS_DEFAULT = [
   {
     id: 'terrain',
     name: 'Terrain',
-    style: 'mapbox://styles/unepwcmc/ckfy4y2nm0vqn19mkcmiyqo73'
+    style: 'mapbox://styles/unepwcmc/cko1hsfi50vog17l697cr4d6p'
   },
   {
     id: 'satellite',
     name: 'Satellite',
-    style: 'mapbox://styles/unepwcmc/ckfy4tzxq0vq719lgi34s2lad'
+    style: 'mapbox://styles/unepwcmc/ckniq2twg0q3b17s5gqfxhagf'
   }
 ]
 export const RTL_TEXT_PLUGIN_URL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js'

app/javascript/components/pages/RegionCountryPages.vue

@@ -86,14 +86,18 @@
       }"
     />
 
-    <stats-growth
-      v-if="hasGrowth"
-      v-bind="{
-        chart: activeDatabase.growth.chart,
-        smallprint: activeDatabase.growth.smallprint,
-        title: activeDatabase.growth.title,
-      }"
-    />
+    <!--
+      Growth chart hidden because calculation is incorrect
+      https://unep-wcmc.codebasehq.com/projects/protected-planet-support-and-maintenance/tickets/265
+      <stats-growth
+        v-if="hasGrowth"
+        v-bind="{
+          chart: activeDatabase.growth.chart,
+          smallprint: activeDatabase.growth.smallprint,
+          title: activeDatabase.growth.title,
+        }"
+      />
+    -->
 
     <slot name="related_countries" />
 

config/locales/search/en.yml

@@ -48,7 +48,7 @@ en:
       site: Individual Areas
     map: Map View
     no-results: No results. Please search again.
-    protected-areas: Protected Areas
+    protected-areas: protected areas and other effective area-based conservation measures
     results: results
     search-areas-title: Explore protected areas and OECMs