Update CHANGELOG

openaddresses · Oct 25, 2023 · 3d9054e · 3d9054e
1 parent 50fd62c
commit 3d9054e
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 ## Version History
 
+### v4.5.0
+
+- :rocket: Use user provided `where` parameter where possible
+
 ### v4.4.1
 
 - :bug: Include built version

diff --git a/dist/cli.js b/dist/cli.js
diff --git a/dist/lib/fetch.js b/dist/lib/fetch.js
diff --git a/dist/lib/fetch.js.map b/dist/lib/fetch.js.map
diff --git a/dist/lib/geometry.js b/dist/lib/geometry.js
diff --git a/dist/lib/geometry.js.map b/dist/lib/geometry.js.map
diff --git a/lib/fetch.ts b/lib/fetch.ts
@@ -13,6 +13,8 @@ export default async function Fetch(
     url: URL,
     opts: FetchRequest = {}
 ): Promise<any> {
+    url = new URL(url);
+
     if (!config.headers) config.headers = {};
     if (!config.params) config.params = {};
 

diff --git a/lib/geometry.ts b/lib/geometry.ts
@@ -57,7 +57,7 @@ export default class Geometry extends EventEmitter {
 
         const url = new URL(String(this.baseUrl) + '/query');
         url.searchParams.append('returnCountOnly', 'true');
-        url.searchParams.append('where', '1=1');
+        if (!config.params.where) url.searchParams.append('where', '1=1');
 
         if (process.env.DEBUG) console.error(String(url));
         const res = await Fetch(config, url);
@@ -74,7 +74,7 @@ export default class Geometry extends EventEmitter {
             let attempts = 0;
 
             const url = new URL(String(this.baseUrl) + '/query');
-            url.searchParams.append('where', '1=1');
+            if (!config.params.where) url.searchParams.append('where', '1=1');
             url.searchParams.append('geometryPrecision', '7');
             url.searchParams.append('returnGeometry', 'true');
             url.searchParams.append('outSR', '4326');

diff --git a/package-lock.json b/package-lock.json