fix(geocode): max sure user supplied request options are all passed t…

…hrough AFFECTS PACKAGES: @esri/arcgis-rest-geocoder
Esri · May 10, 2018 · 3ffa710 · 3ffa710
1 parent fd56e6f
commit 3ffa710
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/packages/arcgis-rest-geocoder/src/geocoder.ts b/packages/arcgis-rest-geocoder/src/geocoder.ts
@@ -191,18 +191,20 @@ export interface IGetGeocodeServiceResponse {
  */
 export function geocode(
   address: string | IGeocodeRequestOptions
-  // requestOptions?: IGeocodeRequestOptions
 ): Promise<IGeocodeResponse> {
-  const options: IGeocodeRequestOptions = {
+  let options: IGeocodeRequestOptions = {
     endpoint: worldGeocoder,
     params: {}
   };
 
   if (typeof address === "string") {
     options.params.singleLine = address;
   } else {
-    options.params = { ...address.params };
     options.endpoint = address.endpoint || worldGeocoder;
+    options = {
+      ...options,
+      ...address
+    };
   }
 
   // add spatialReference property to individual matches

diff --git a/packages/arcgis-rest-geocoder/test/geocoder.test.ts b/packages/arcgis-rest-geocoder/test/geocoder.test.ts
@@ -112,6 +112,34 @@ describe("geocode", () => {
       });
   });
 
+  it("should pass through all requestOptions when making a geocoding request", done => {
+    fetchMock.once("*", FindAddressCandidates);
+
+    geocode({
+      endpoint: customGeocoderUrl,
+      params: {
+        outSr: 3857,
+        address: "380 New York St",
+        postal: 92373
+      },
+      httpMethod: "GET"
+    })
+      .then(response => {
+        expect(fetchMock.called()).toEqual(true);
+        const [url, options]: [string, RequestInit] = fetchMock.lastCall("*");
+        expect(url).toEqual(
+          "https://foo.com/arcgis/rest/services/Custom/GeocodeServer/findAddressCandidates?f=json&outSr=3857&address=380%20New%20York%20St&postal=92373"
+        );
+        expect(options.method).toBe("GET");
+        // the only property this lib tacks on
+        expect(response.spatialReference.wkid).toEqual(4326);
+        done();
+      })
+      .catch(e => {
+        fail(e);
+      });
+  });
+
   it("should make a reverse geocoding request", done => {
     fetchMock.once("*", ReverseGeocode);