add POI support using otp-ui offline geocoder

ibi-group · Feb 27, 2024 · b54c97f · b54c97f
1 parent 8564364
commit b54c97f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/handler.ts b/handler.ts
@@ -28,6 +28,7 @@ const {
   REDIS_HOST,
   REDIS_KEY,
   GEOCODERS,
+  POIS,
   BACKUP_GEOCODERS
 } = process.env
 
@@ -53,6 +54,8 @@ if (!GEOCODERS) {
 }
 const geocoders = JSON.parse(GEOCODERS)
 const backupGeocoders = BACKUP_GEOCODERS && JSON.parse(BACKUP_GEOCODERS)
+// Serverless is not great about null
+const pois = POIS && POIS !== "null" ? JSON.parse(POIS) : []
 
 if (geocoders.length !== backupGeocoders.length) {
   throw new Error('Error: BACKUP_GEOCODERS is not set to the same length as GEOCODERS')
@@ -68,7 +71,6 @@ Bugsnag.start({
 // This handler will wrap around the handler code
 // and will report exceptions to Bugsnag automatically.
 // For reference, see https://docs.bugsnag.com/platforms/javascript/aws-lambda/#usage
-// @ts-expect-error bugsnag plugin has weird types
 const bugsnagHandler = Bugsnag.getPlugin('awsLambda').createHandler()
 
 /**
@@ -98,7 +100,7 @@ export const makeGeocoderRequests = async (
 
   // Run both requests in parallel
   let responses: FeatureCollection[] = await Promise.all(geocoders.map(geocoder => cachedGeocoderRequest(
-    getGeocoder(geocoder), apiMethod, convertQSPToGeocoderArgs(event.queryStringParameters),
+    getGeocoder(geocoder), apiMethod, { ...convertQSPToGeocoderArgs(event.queryStringParameters), items: pois },
     // TODO: add redis here
     null
 
@@ -117,6 +119,7 @@ export const makeGeocoderRequests = async (
 
   const merged = responses.reduce((prev, cur, idx) => {
     if (idx === 0) return cur
+    // @ts-expect-error Typechecking is broken here for some reason
     if (prev) return mergeResponses({ primaryResponse: prev, customResponse: cur })
   }, null)
 

diff --git a/serverless.yml b/serverless.yml
@@ -11,6 +11,7 @@ provider:
   environment:
     GEOCODERS: ${self:custom.secrets.GEOCODERS}
     BACKUP_GEOCODERS: ${self:custom.secrets.BACKUP_GEOCODERS}
+    POIS: ${self:custom.secrets.POIS, null}
     BUGSNAG_NOTIFIER_KEY: ${self:custom.secrets.BUGSNAG_NOTIFIER_KEY}
     REDIS_HOST: ${self:custom.secrets.REDIS_HOST, null}
     REDIS_KEY: ${self:custom.secrets.REDIS_KEY, null}

diff --git a/yarn.lock b/yarn.lock
@@ -2222,6 +2222,11 @@
   resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
   integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
 
+"@leeoniya/ufuzzy@^1.0.14":
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/@leeoniya/ufuzzy/-/ufuzzy-1.0.14.tgz#01572c0de9cfa1420cf6ecac76dd59db5ebd1337"
+  integrity sha512-/xF4baYuCQMo+L/fMSUrZnibcu0BquEGnbxfVPiZhs/NbJeKj4c/UmFpQzW9Us0w45ui/yYW3vyaqawhNYsTzA==
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"