add CHECK_NAME_DUPLICATES feature

__tests__/util.test.ts

@@ -112,13 +112,15 @@ describe('response merging', () => {
         customResponse: CUSTOM_RESPONSE,
         primaryResponse: GEOCODE_EARTH_RESPONSE
       },
+      true,
       { lat: 47.880281, lon: -122.238459 }
     )
     const mergedFocusedOnSteinerStreet = mergeResponses(
       {
         customResponse: CUSTOM_RESPONSE,
         primaryResponse: GEOCODE_EARTH_RESPONSE
       },
+      true,
       { lat: 37.793899, lon: -122.43634 }
     )
     expect(mergedFocusedOnBusStop).not.toEqual(mergedFocusedOnSteinerStreet)

env.example.yml

@@ -5,3 +5,4 @@ GEOCODERS: <Stringified JSON Array of OTP-UI `GeocoderConfig`s>
 BACKUP_GEOCODERS: <Stringified JSON Array of OTP-UI `GeocoderConfig`'s. Same length and order as GEOCODERS>
 
 COORDINATE_COMPARISON_PRECISION_DIGITS: defaults to 4 (~10m). What precision to use when comparing if two locations are the same
+CHECK_NAME_DUPLICATES: defaults to true. If disabled, name-based duplicate checking will be disabled. Useful if your GTFS has common words in its stop names

handler.ts

@@ -24,7 +24,12 @@ import {
 // This plugin must be imported via cjs to ensure its existence (typescript recommendation)
 const BugsnagPluginAwsLambda = require('@bugsnag/plugin-aws-lambda')
 
-const { BACKUP_GEOCODERS, BUGSNAG_NOTIFIER_KEY, GEOCODERS } = process.env
+const {
+  BACKUP_GEOCODERS,
+  BUGSNAG_NOTIFIER_KEY,
+  CHECK_NAME_DUPLICATES,
+  GEOCODERS
+} = process.env
 const POIS = require('./pois.json')
 
 if (!GEOCODERS) {
@@ -128,7 +133,13 @@ export const makeGeocoderRequests = async (
   >(
     (prev, cur, idx) => {
       if (idx === 0) return cur
-      return mergeResponses({ customResponse: cur, primaryResponse: prev })
+      return mergeResponses(
+        { customResponse: cur, primaryResponse: prev },
+        // Default to true
+        CHECK_NAME_DUPLICATES !== 'false'
+        // TODO: use focus point here to pre-sort results? It's possible to grab
+        // the focus point by calling convertQSPToGeocoderArgs on event.queryStringParameters
+      )
     },
     // TODO: clean this reducer up. See https://github.com/ibi-group/pelias-stitch/pull/28#discussion_r1547582739
     { features: [], type: 'FeatureCollection' }

serverless.yml

@@ -13,6 +13,7 @@ provider:
     BACKUP_GEOCODERS: ${self:custom.secrets.BACKUP_GEOCODERS}
     BUGSNAG_NOTIFIER_KEY: ${self:custom.secrets.BUGSNAG_NOTIFIER_KEY}
     COORDINATE_COMPARISON_PRECISION_DIGITS: ${self:custom.secrets.COORDINATE_COMPARISON_PRECISION_DIGITS, 4}
+    CHECK_NAME_DUPLICATES: ${self:custom.secrets.CHECK_NAME_DUPLICATES, true}
 package:
   patterns:
     - pois.json

utils.ts

@@ -1,9 +1,9 @@
 import { URLSearchParams } from 'url'
 
 import bugsnag from '@bugsnag/js'
 import { fromCoordinates } from '@conveyal/lonlat'
 import { getDistance } from 'geolib'
 import fetch from 'node-fetch'
 import type { LonLatOutput } from '@conveyal/lonlat'
 import type { Feature, FeatureCollection, Position } from 'geojson'
 import { AnyGeocoderQuery } from '@opentripplanner/geocoder/lib/geocoders/types'
@@ -131,15 +131,17 @@
  */
 const filterOutDuplicateStops = (
   feature: Feature,
-  customFeatures: Feature[]
+  customFeatures: Feature[],
+  checkNameDuplicates: boolean
 ): boolean => {
   // If the names are the same, or if the feature is too far away, we can't consider the feature
   if (
     customFeatures.find(
       (otherFeature: Feature) =>
-        (feature?.properties?.name || '')
-          .toLowerCase()
-          .includes((otherFeature?.properties?.name || '').toLowerCase()) ||
+        (checkNameDuplicates &&
+          (feature?.properties?.name || '')
+            .toLowerCase()
+            .includes((otherFeature?.properties?.name || '').toLowerCase())) ||
         // Any feature this far away is likely not worth being considered
         feature?.properties?.distance > 7500
     )
@@ -199,14 +201,19 @@
     customResponse: FeatureCollection
     primaryResponse: FeatureCollection
   },
+  checkNameDuplicates = true,
   focusPoint?: LonLatOutput
 ): FeatureCollection => {
   // Openstreetmap can sometimes include bus stop info with less
   // correct information than the GTFS feed.
   // Remove anything from the geocode.earth response that's within 10 meters of a custom result
   responses.primaryResponse.features =
     responses?.primaryResponse?.features?.filter((feature: Feature) =>
-      filterOutDuplicateStops(feature, responses.customResponse.features)
+      filterOutDuplicateStops(
+        feature,
+        responses.customResponse.features,
+        checkNameDuplicates
+      )
     ) || []
 
   // If a focus point is specified, sort custom features by distance to the focus point
@@ -258,7 +265,7 @@
   requestMethod: string,
   args: AnyGeocoderQuery
 ): Promise<FeatureCollection> => {
   const { focusPoint, text } = args
   if (!text) return { features: [], type: 'FeatureCollection' }
   const onlineResponse = await geocoder[requestMethod](args)