fix(geocoder): Add fetch options to support custom headers.

fix opentripplanner#130
ibi-group · Jun 3, 2020 · ffdbf2e · ffdbf2e
1 parent d4ed4bc
commit ffdbf2e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/packages/geocoder/package.json b/packages/geocoder/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@conveyal/geocoder-arcgis-geojson": "^0.0.2",
     "@conveyal/lonlat": "^1.4.0",
-    "isomorphic-mapzen-search": "^1.4.1",
+    "isomorphic-mapzen-search": "^1.5.1",
     "lodash.memoize": "^4.1.2"
   },
   "gitHead": "644c72e0d08f8daf93b44eaf0deec88a1e16f414"

diff --git a/packages/geocoder/src/geocoders/abstract-geocoder.js b/packages/geocoder/src/geocoders/abstract-geocoder.js
@@ -63,11 +63,18 @@ export default class Geocoder {
    * Default autocomplete query generator
    */
   getAutocompleteQuery(query) {
-    const { apiKey, baseUrl, boundary, focusPoint } = this.geocoderConfig;
+    const {
+      apiKey,
+      baseUrl,
+      boundary,
+      focusPoint,
+      options
+    } = this.geocoderConfig;
     return {
       apiKey,
       boundary,
       focusPoint,
+      options,
       url: baseUrl ? `${baseUrl}/autocomplete` : undefined,
       ...query
     };
@@ -77,10 +84,11 @@ export default class Geocoder {
    * Default reverse query generator
    */
   getReverseQuery(query) {
-    const { apiKey, baseUrl } = this.geocoderConfig;
+    const { apiKey, baseUrl, options } = this.geocoderConfig;
     return {
       apiKey,
       format: true,
+      options,
       url: baseUrl ? `${baseUrl}/reverse` : undefined,
       ...query
     };
@@ -90,11 +98,18 @@ export default class Geocoder {
    * Default search query generator.
    */
   getSearchQuery(query) {
-    const { apiKey, baseUrl, boundary, focusPoint } = this.geocoderConfig;
+    const {
+      apiKey,
+      baseUrl,
+      boundary,
+      focusPoint,
+      options
+    } = this.geocoderConfig;
     return {
       apiKey,
       boundary,
       focusPoint,
+      options,
       url: baseUrl ? `${baseUrl}/search` : undefined,
       format: false, // keep as returned GeoJSON,
       ...query

diff --git a/packages/geocoder/src/geocoders/pelias.js b/packages/geocoder/src/geocoders/pelias.js
@@ -17,12 +17,14 @@ export default class PeliasGeocoder extends Geocoder {
       baseUrl,
       boundary,
       focusPoint,
+      options,
       sources
     } = this.geocoderConfig;
     return {
       apiKey,
       boundary,
       focusPoint,
+      options,
       // explicitly send over null for sources if provided sources is not truthy
       // in order to avoid default isomorphic-mapzen-search sources form being
       // applied
@@ -42,12 +44,14 @@ export default class PeliasGeocoder extends Geocoder {
       baseUrl,
       boundary,
       focusPoint,
+      options,
       sources
     } = this.geocoderConfig;
     return {
       apiKey,
       boundary,
       focusPoint,
+      options,
       // explicitly send over null for sources if provided sources is not truthy
       // in order to avoid default isomorphic-mapzen-search sources form being
       // applied

diff --git a/yarn.lock b/yarn.lock
@@ -8317,9 +8317,10 @@ isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
-isomorphic-mapzen-search@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-mapzen-search/-/isomorphic-mapzen-search-1.4.1.tgz#914b85d16c23ac0d1e8fb0c90c3ff12503b1c577"
+isomorphic-mapzen-search@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-mapzen-search/-/isomorphic-mapzen-search-1.5.1.tgz#5ac0214cec436fb550e8ef362cf8d11b17de8e9c"
+  integrity sha512-38GcjidOqjVQkUzDovx+ceUXHwOliIoFq+qJ/zUzaZwn2h8qEANLMTjaZkFvYN2XdSGB65zBOH5n/iP/Vs1ejA==
   dependencies:
     "@conveyal/lonlat" "^1.1.2"
     isomorphic-fetch "^2.2.1"