Merge branch 'development' into test

DEFRA · Nov 25, 2020 · e8cfb74 · e8cfb74
2 parents 8c863c4 + a2ddcd1
commit e8cfb74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/server/routes/location.js b/server/routes/location.js
@@ -44,7 +44,14 @@ module.exports = {
   options: {
     validate: {
       query: joi.object({
-        q: joi.string().trim().max(200).required()
+        q: joi.string().trim().max(200).required(),
+        cz: joi.string(),
+        l: joi.string(),
+        btn: joi.string(),
+        ext: joi.string(),
+        fid: joi.string(),
+        lyr: joi.string(),
+        v: joi.string()
       }),
       failAction: (request, h, err) => {
         console.error('Location search error: Invalid or no string input.')

diff --git a/server/src/js/pages/station.js b/server/src/js/pages/station.js
@@ -13,7 +13,7 @@ window.flood.utils.addBrowserBackButton()
 
 // Create LiveMap
 window.flood.maps.createLiveMap('map', {
-  btnText: '<span>View on map</span>',
+  btnText: '<span>View map</span>',
   btnClasses: 'defra-button-map-s',
   layers: 'mv,sh,st',
   centre: JSON.parse(window.flood.model.station.coordinates).coordinates,