Merge pull request #4570 from camptocamp/getfeature_pass_bbox_as_param

Add a option to send bbox as GET param of getfeature requests
camptocamp · Jan 31, 2019 · e765ddc · e765ddc
2 parents c6e42f4 + 200248f
commit e765ddc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/options/ngeox.js b/options/ngeox.js
@@ -586,6 +586,7 @@ ngeox.DimensionsActive;
  * The options to use when sending GetFeature/GetFeatureInfo requests using
  * the querent or map query service.
  * @typedef {{
+ *     bboxAsGETParam: (boolean|undefined),
  *     coordinate: (ol.Coordinate|undefined),
  *     dataSources: (Array.<ngeox.DataSource>|undefined),
  *     extent: (ol.Extent|undefined),
@@ -600,6 +601,14 @@ ngeox.DimensionsActive;
 ngeox.IssueGetFeaturesOptions;
 
 
+/**
+ * Pass the queried bbox as a parameter of the GET query on WFS requests.
+ * Default to false.
+ * @type {boolean|undefined}
+ */
+ngeox.IssueGetFeaturesOptions.prototype.bboxAsGETParam;
+
+
 /**
  * The coordinate to issue the requests with, which can end up with either
  * WMS or WFS requests.
@@ -1054,6 +1063,7 @@ ngeox.QueryResultSource.prototype.totalFeatureCount;
 /**
  * The options for the query service.
  * @typedef {{
+ *     bboxAsGETParam: (boolean|undefined),
  *     limit: (number|undefined),
  *     queryCountFirst: (boolean|undefined),
  *     sourceIdsProperty: (string|undefined),
@@ -1066,6 +1076,14 @@ ngeox.QueryResultSource.prototype.totalFeatureCount;
 ngeox.QueryOptions;
 
 
+/**
+ * Pass the queried bbox as a parameter of the GET query on WFS requests.
+ * Default to false.
+ * @type {boolean|undefined}
+ */
+ngeox.QueryOptions.prototype.bboxAsGETParam;
+
+
 /**
  * The maximum number of records per request the query service should ask.
  * Defaults to `50`. Note that sources sharing the same URL are combined

diff --git a/src/services/mapquerent.js b/src/services/mapquerent.js
@@ -91,6 +91,12 @@ ngeo.MapQuerent = class {
     this.tolerancePx_ = options.tolerance !== undefined ?
       options.tolerance : 3;
 
+    /**
+     * @type {boolean}
+     * @private
+     */
+    this.bboxAsGETParam_ = options.bboxAsGETParam || false;
+
     /**
      * A hash of data source names classified by ids.
      * @type {Object.<number, string>}
@@ -125,7 +131,8 @@ ngeo.MapQuerent = class {
       queryableDataSources,
       limit,
       tolerancePx: this.tolerancePx_,
-      wfsCount: this.queryCountFirst_
+      wfsCount: this.queryCountFirst_,
+      bboxAsGETParam: this.bboxAsGETParam_
     });
     this.result_.pending = true;
     this.ngeoQuerent_.issue(options).then(this.handleResult_.bind(this));

diff --git a/src/services/querent.js b/src/services/querent.js
@@ -371,6 +371,10 @@ ngeo.Querent = class {
       let url;
       const params = {};
 
+      if (options.bboxAsGETParam && bbox) {
+        params['bbox'] = bbox.join(',');
+      }
+
       // (3) Build query options
       for (const dataSource of dataSources) {