Merge branch 'development' into test

DEFRA · Nov 22, 2021 · 3a8afec · 3a8afec
2 parents 53d57e6 + 189bcdf
commit 3a8afec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/server/src/js/components/map/container.js b/server/src/js/components/map/container.js
@@ -38,6 +38,7 @@ window.flood.maps.MapContainer = function MapContainer (mapId, options) {
   // Disable body scrolling and hide non-map elements
   document.title = options.title
   document.body.classList.add('defra-map-body')
+  document.documentElement.classList.add('defra-map-html')
 
   // Create the map container element
   const containerElement = document.createElement('div')
@@ -256,6 +257,7 @@ window.flood.maps.MapContainer = function MapContainer (mapId, options) {
       document.title = options.originalTitle
       // Unlock body scroll
       document.body.classList.remove('defra-map-body')
+      document.documentElement.classList.remove('defra-map-html')
       clearAllBodyScrollLocks()
       // Remove map and return focus
       containerElement.parentNode.removeChild(containerElement)
@@ -436,9 +438,11 @@ window.flood.maps.MapContainer = function MapContainer (mapId, options) {
 
   // Mouse or touch interaction
   containerElement.addEventListener('pointerdown', (e) => {
-    infoElement.blur()
-    keyElement.blur()
     viewport.removeAttribute('keyboard-focus')
+    // Address OpenLayers performance bug when viewport has focus?
+    if (document.activeElement === viewport) {
+      exitMapButtonElement.focus()
+    }
   })
 
   // Disable pinch and double tap zoom

diff --git a/server/src/sass/components/map/_map.scss b/server/src/sass/components/map/_map.scss
@@ -32,6 +32,9 @@
     @include defra-visually-hidden;
   }
 }
+.defra-map-html {
+  height: 100vh;
+}
 .defra-map-body {
   position: fixed;
   overflow: hidden;
@@ -40,6 +43,9 @@
   bottom:0px;
   left:0px;
 }
+.defra-map-visibility-hidden {
+  visibility: hidden;
+}
 .defra-map-viewport {
   -webkit-touch-callout: none;
   -webkit-user-select: none;

diff --git a/server/src/templates/info-outlook.html b/server/src/templates/info-outlook.html
@@ -15,9 +15,9 @@ <h2 class="govuk-heading-s">{{ model.name }}</h2>
         {% case "2-i4-l1" %}
         <span>It’s possible but not expected that {{ messageText.sources[0] }} will cause severe flooding and travel disruption.</span>
         {% case "3-i3-l3" %}
-        <span>It’s possible but not expected that {{ messageText.sources[0] }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
+        <span>It’s likely that {{ messageText.sources[0] }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
         {% case "3-i3-l4" %}
-        <span>It’s possible but not expected that {{ messageText.sources[0] }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
+        <span>We expect {{ messageText.sources[0] }} to cause properties and roads to flood. If this happens, your life might be in danger.</span>
         {% case "3-i4-l2" %}
         <span>{{ messageText.sources[0] | capitalize }} could cause severe flooding and travel disruption. If this happens, your life might be in danger. Be prepared to evacuate.</span>
         {% case "3-i4-l3" %}

diff --git a/server/views/partials/outlook-region-messages.html b/server/views/partials/outlook-region-messages.html
@@ -10,9 +10,9 @@
 {% case "2-i4-l1" %}
 <span>It’s possible but not expected that {{ sources }} will cause severe flooding and travel disruption.</span>
 {% case "3-i3-l3" %}
-<span>It’s possible but not expected that {{ sources }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
+<span>It’s likely that {{ sources }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
 {% case "3-i3-l4" %}
-<span>It’s possible but not expected that {{ sources }} will cause properties and roads to flood. If this happens, your life might be in danger.</span>
+<span>We expect {{ sources }} to cause properties and roads to flood. If this happens, your life might be in danger.</span>
 {% case "3-i4-l2" %}
 <span>{{ sources | capitalize }} could cause severe flooding and travel disruption. If this happens, your life might be in danger. Be prepared to evacuate.</span>
 {% case "3-i4-l3" %}