Merge pull request #933 from koopjs/p/where-replacer

Handle "where" param with +

.changeset/three-actors-try.md

@@ -0,0 +1,5 @@
+---
+"@koopjs/featureserver": patch
+---
+
+- allow + as whitespace equivalent in where param

packages/featureserver/src/query/filter-and-transform.js

@@ -29,13 +29,13 @@ class FilterAndTransformParams {
   }
 
   static standardize (requestParams) {
-    const {returnDistinctValues, ...rest } = requestParams;
+    const {returnDistinctValues, where = '1=1', ...rest } = requestParams;
 
-    if (returnDistinctValues === true) {
-      rest.distinct = true;
-    }
-
-    return rest;
+    return {
+      ...rest,
+      distinct: !!returnDistinctValues,
+      where: extractPlusPlaceHolders(where)
+    };
   }
 
   constructor (requestParams) {
@@ -64,12 +64,36 @@ class FilterAndTransformParams {
     return this;
   }
 
-  addInputCrs (data = {}) {
+  addInputCrs (data) {
     const { metadata = {} } = data;
     this.inputCrs = this.inputCrs || this.sourceSR || metadata.crs || helpers.getCollectionCrs(data) || 4326;
     delete this.sourceSR;
     return this;
   }
 }
 
+function extractPlusPlaceHolders(where) {
+  let openDouble = false;
+  let openSingle = false;
+  const whereWithReplacedSingleQuotes = where.replace(/''/g, '~~xxx~~');
+
+  const charArray = Array.from(whereWithReplacedSingleQuotes);
+  return charArray
+    .map((char) => {
+      if (char === '\'' && !openDouble) {
+        openSingle = !openSingle;
+      }
+
+      if (char === '"' && !openSingle) {
+        openDouble = !openDouble;
+      }
+
+      if (char === '+' && !openDouble && !openSingle) {
+        return ' ';
+      }
+      return char;
+    })
+    .join('')
+    .replace(/~~xxx~~/g, '\'\'');
+}
 module.exports = { filterAndTransform };