Feature/sir 1144 (#221)

* SIR-1144 adding a OSGB to WGS84 point transform * sonarcloud issue
DEFRA · Nov 15, 2024 · e5049bc · e5049bc
1 parent 217f529
commit e5049bc
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 4 deletions.
diff --git a/server/routes/__tests__/smell/location-map.spec.js b/server/routes/__tests__/smell/location-map.spec.js
@@ -41,6 +41,14 @@ describe(url, () => {
         ...baseAnswer,
         answerId: question.answers.northing.answerId,
         otherDetails: '343015'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lng.answerId,
+        otherDetails: '-2.511745'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lat.answerId,
+        otherDetails: '52.983397'
       }])
     })
     it('Sad: errors on no point provided', async () => {

diff --git a/server/routes/__tests__/water-pollution/location-map.spec.js b/server/routes/__tests__/water-pollution/location-map.spec.js
@@ -42,6 +42,14 @@ describe(url, () => {
         ...baseAnswer,
         answerId: question.answers.northing.answerId,
         otherDetails: '343015'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lng.answerId,
+        otherDetails: '-2.511745'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lat.answerId,
+        otherDetails: '52.983397'
       }])
     })
     it('Sad: errors on no point provided', async () => {

diff --git a/server/routes/smell/location-map.js b/server/routes/smell/location-map.js
@@ -1,6 +1,7 @@
 import constants from '../../utils/constants.js'
 import bngToNgr from '../../utils/bng-to-ngr.js'
 import { questionSets } from '../../utils/question-sets.js'
+import { oSGBToWGS84 } from '../../utils/transform-point.js'
 
 const question = questionSets.SMELL.questions.SMELL_LOCATION_MAP
 const baseAnswer = {
@@ -27,7 +28,9 @@ const handlers = {
       })
     }
 
-    request.yar.set(constants.redisKeys.SMELL_LOCATION_MAP, buildAnswers(point))
+    const lngLat = oSGBToWGS84(point)
+
+    request.yar.set(constants.redisKeys.SMELL_LOCATION_MAP, buildAnswers(point, lngLat))
 
     // handle redirects
     return h.redirect(constants.routes.SMELL_PREVIOUS)
@@ -40,8 +43,9 @@ const getContext = () => {
   }
 }
 
-const buildAnswers = point => {
+const buildAnswers = (point, lngLat) => {
   const ngr = bngToNgr(point).text
+  const six = 6
   return [{
     ...baseAnswer,
     answerId: question.answers.nationalGridReference.answerId,
@@ -54,6 +58,14 @@ const buildAnswers = point => {
     ...baseAnswer,
     answerId: question.answers.northing.answerId,
     otherDetails: Math.floor(point[1]).toString()
+  }, {
+    ...baseAnswer,
+    answerId: question.answers.lng.answerId,
+    otherDetails: lngLat[0].toFixed(six)
+  }, {
+    ...baseAnswer,
+    answerId: question.answers.lat.answerId,
+    otherDetails: lngLat[1].toFixed(six)
   }]
 }
 

diff --git a/server/routes/water-pollution/location-map.js b/server/routes/water-pollution/location-map.js
@@ -1,6 +1,7 @@
 import constants from '../../utils/constants.js'
 import bngToNgr from '../../utils/bng-to-ngr.js'
 import { questionSets } from '../../utils/question-sets.js'
+import { oSGBToWGS84 } from '../../utils/transform-point.js'
 
 const question = questionSets.WATER_POLLUTION.questions.WATER_POLLUTION_LOCATION_MAP
 const baseAnswer = {
@@ -27,7 +28,9 @@ const handlers = {
       })
     }
 
-    request.yar.set(constants.redisKeys.WATER_POLLUTION_LOCATION_MAP, buildAnswers(point))
+    const lngLat = oSGBToWGS84(point)
+
+    request.yar.set(constants.redisKeys.WATER_POLLUTION_LOCATION_MAP, buildAnswers(point, lngLat))
 
     // handle redirects
     return h.redirect(constants.routes.WATER_POLLUTION_WHEN)
@@ -40,8 +43,9 @@ const getContext = () => {
   }
 }
 
-const buildAnswers = point => {
+const buildAnswers = (point, lngLat) => {
   const ngr = bngToNgr(point).text
+  const six = 6
   return [{
     ...baseAnswer,
     answerId: question.answers.nationalGridReference.answerId,
@@ -54,6 +58,14 @@ const buildAnswers = point => {
     ...baseAnswer,
     answerId: question.answers.northing.answerId,
     otherDetails: Math.floor(point[1]).toString()
+  }, {
+    ...baseAnswer,
+    answerId: question.answers.lng.answerId,
+    otherDetails: lngLat[0].toFixed(six)
+  }, {
+    ...baseAnswer,
+    answerId: question.answers.lat.answerId,
+    otherDetails: lngLat[1].toFixed(six)
   }]
 }
 

diff --git a/server/utils/OSTN15_NTv2_OSGBtoETRS.gsb b/server/utils/OSTN15_NTv2_OSGBtoETRS.gsb
diff --git a/server/utils/question-sets.js b/server/utils/question-sets.js
@@ -230,6 +230,12 @@ const questionSets = {
           },
           northing: {
             answerId: 2703
+          },
+          lng: {
+            answerId: 2704
+          },
+          lat: {
+            answerId: 2705
           }
         }
       },
@@ -453,6 +459,12 @@ const questionSets = {
           },
           northing: {
             answerId: 2703
+          },
+          lng: {
+            answerId: 2704
+          },
+          lat: {
+            answerId: 2705
           }
         }
       },

diff --git a/server/utils/transform-point.js b/server/utils/transform-point.js
@@ -0,0 +1,14 @@
+import proj4 from 'proj4'
+import { readFileSync } from 'fs'
+
+const oSTN15 = readFileSync('./server/utils/OSTN15_NTv2_OSGBtoETRS.gsb').buffer
+
+proj4.nadgrid('OSTN15_NTv2_OSGBtoETRS', oSTN15)
+proj4.defs('EPSG:27700', '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +units=m +no_defs +nadgrids=OSTN15_NTv2_OSGBtoETRS')
+// proj4.defs('EPSG:27700', '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +towgs84=446.448,-125.157,542.06,0.15,0.247,0.842,-20.489 +units=m +no_defs')
+
+const oSGBToWGS84 = point => proj4('EPSG:27700', 'EPSG:4326', point)
+
+export {
+  oSGBToWGS84
+}