update postcode search

Author: johnrees

package.json

@@ -34,10 +34,11 @@
     "husky": "^1.3.1",
     "jest": "^24.7.1",
     "jest-dom": "^3.1.3",
+    "parcel-bundler": "^1.12.3",
     "prettier": "^1.17.0",
     "rimraf": "^2.6.3",
     "ts-jest": "^24.0.2",
-    "ts-node-dev": "^1.0.0-pre.32",
+    "ts-node-dev": "^1.0.0-pre.40",
     "tslint": "^5.15.0",
     "tslint-config-airbnb": "^5.11.1",
     "tslint-config-prettier": "^1.18.0",
@@ -58,6 +59,8 @@
     "lodash": "^4.17.11",
     "method-override": "^3.0.0",
     "pg": "^7.9.0",
+    "postcode": "^2.0.0",
+    "proj4": "^2.5.0",
     "recompose": "^0.30.0",
     "reflect-metadata": "^0.1.10",
     "sharedb": "^1.0.0-beta.20",

src/rest-api/controllers/postcodes.ts

@@ -1,36 +1,80 @@
 import axios from 'axios'
 import { NextFunction, Request, Response } from 'express'
-import * as get from 'lodash/get'
+import * as proj4 from 'proj4'
+
+proj4.defs([
+  ['WGS84', '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_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 projections = {
+  standard: new proj4.Proj('WGS84'),
+  ordnanceSurvey: new proj4.Proj('EPSG:27700'),
+}
 
 export async function search(
   request: Request,
   response: Response,
   next: NextFunction
 ) {
-  const url = `https://api.ideal-postcodes.co.uk/v1/postcodes/${
-    request.params.postcode
-  }?api_key=${process.env.IDEAL_POSTCODES_KEY}`
+  // const postcode = await formatPostcode(request.params.postcode)
 
   try {
+    const { data: pdata } = await axios.get(
+      `https://api.postcodes.io/postcodes/${request.params.postcode}`
+    )
+
+    const postcode = pdata.result.postcode
+    const localAuthority = pdata.result.admin_district.toLowerCase()
+
+    if (localAuthority !== 'southwark') {
+      return response.json({
+        localAuthority,
+        results: [],
+      })
+    }
+
+    const url = `https://llpg.planx.uk/LLPG_ALL?limit=100&POSTALLY_ADDRESSABLE=eq.Y&POSTCODE=eq.${postcode}`
+
     const { data } = await axios.get(url)
 
     response.json({
-      localAuthority: get(data, 'result[0].district', 'unknown')
-        .toLowerCase()
-        .replace(' ', ''),
-      results: data.result.map(result => {
-        return {
-          id: result.udprn.toString(),
-          name: [result.line_1, result.line_2].filter(Boolean).join(', '),
-          uprn: result.udprn.toString(),
-          updrn: result.udprn.toString(),
-          x: result.eastings,
-          y: result.northings,
-          lat: result.latitude,
-          lng: result.longitude,
-          rawData: result,
-        }
-      }),
+      localAuthority,
+      results: data
+        .map(result => {
+          const { x: lng, y: lat } = proj4.transform(
+            projections.ordnanceSurvey,
+            projections.standard,
+            [Number(result.X), Number(result.Y)]
+          )
+
+          return {
+            lat,
+            lng,
+            id: result.UPRN.toString(),
+            name: [
+              result.ORGANISATION,
+              result.SAO,
+              [result.PAO, result.STREET].filter(Boolean).join(' '),
+            ]
+              .filter(Boolean)
+              .join(', '),
+            uprn: result.UPRN.toString(),
+            updrn: result.UPRN.toString(),
+            x: Number(result.X),
+            y: Number(result.Y),
+            rawData: result,
+          }
+        })
+        .sort((a, b) => {
+          const aa = [a.rawData.PAO, a.rawData.STREET].filter(Boolean).join(' ')
+          const bb = [b.rawData.PAO, b.rawData.STREET].filter(Boolean).join(' ')
+          // return bb < aa
+          return aa < bb ? -1 : aa > bb ? 1 : 0
+        }),
     })
   } catch (e) {
     next(e)

src/rest-api/controllers/postcodes.ts.old

@@ -0,0 +1,38 @@
+import axios from 'axios'
+import { NextFunction, Request, Response } from 'express'
+import * as get from 'lodash/get'
+
+export async function search(
+  request: Request,
+  response: Response,
+  next: NextFunction
+) {
+  const url = `https://api.ideal-postcodes.co.uk/v1/postcodes/${
+    request.params.postcode
+  }?api_key=${process.env.IDEAL_POSTCODES_KEY}`
+
+  try {
+    const { data } = await axios.get(url)
+
+    response.json({
+      localAuthority: get(data, 'result[0].district', 'unknown')
+        .toLowerCase()
+        .replace(' ', ''),
+      results: data.result.map(result => {
+        return {
+          id: result.udprn.toString(),
+          name: [result.line_1, result.line_2].filter(Boolean).join(', '),
+          uprn: result.udprn.toString(),
+          updrn: result.udprn.toString(),
+          x: result.eastings,
+          y: result.northings,
+          lat: result.latitude,
+          lng: result.longitude,
+          rawData: result,
+        }
+      }),
+    })
+  } catch (e) {
+    next(e)
+  }
+}