Merge pull request #5085 from camptocamp/GSGMF-1057

Increase query tolerance on 'touch' devices
camptocamp · Aug 27, 2019 · 8e6a1ae · 8e6a1ae
2 parents 2ec7b54 + 2406d37
commit 8e6a1ae
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/contribs/gmf/src/controllers/AbstractMobileController.js b/contribs/gmf/src/controllers/AbstractMobileController.js
@@ -182,9 +182,5 @@ module.controller('AbstractMobileController', AbstractMobileController);
 
 module.value('isMobile', true);
 
-module.value('ngeoQueryOptions', {
-  'tolerance': 10
-});
-
 
 export default module;
diff --git a/src/query/MapQuerent.js b/src/query/MapQuerent.js
@@ -1,4 +1,5 @@
 import angular from 'angular';
+import {hasCoarsePointingDevice} from 'ngeo/utils.js';
 import ngeoQueryAction from 'ngeo/query/Action.js';
 import ngeoQueryQuerent from 'ngeo/query/Querent.js';
 import ngeoDatasourceDataSources from 'ngeo/datasource/DataSources.js';
@@ -32,6 +33,7 @@ import ngeoMiscFeatureHelper from 'ngeo/misc/FeatureHelper.js';
  * @property {number} [tolerance=3] When issuing an identify feature request at a click position, either a
  *    WMS GetFeatureInfo or a WFS GetFeature request will be used. For GetFeature requests a bbox is built
  *    around the position. This `tolerance` in pixel determines the size of the bbox.
+ * @property {number} [toleranceTouch=10] The tolerance on touch devices.
  * @property {string} [featureNS='http://mapserver.gis.umn.edu/mapserver'] The feature namespace for WFS
  *    GetFeature requests.
  * @property {string} [featurePrefix='feature'] The feature prefix for WFS GetFeature requests.
@@ -123,8 +125,13 @@ export class MapQuerent {
      * @type {number}
      * @private
      */
-    this.tolerancePx_ = options.tolerance !== undefined ?
-      options.tolerance : 3;
+    this.tolerancePx_;
+
+    if (hasCoarsePointingDevice()) {
+      this.tolerancePx_ = options.toleranceTouch !== undefined ? options.toleranceTouch : 10;
+    } else {
+      this.tolerancePx_ = options.tolerance !== undefined ? options.tolerance : 3;
+    }
 
     /**
      * @type {boolean}

diff --git a/src/utils.js b/src/utils.js
@@ -8,6 +8,16 @@ import olGeomPolygon from 'ol/geom/Polygon.js';
 import {getTopLeft, getTopRight, getBottomLeft, getBottomRight} from 'ol/extent.js';
 
 
+/**
+ * Return whether the primary pointing device is coarse or 'false' if unsupported (Internet Explorer).
+ * See https://developer.mozilla.org/en-US/docs/Web/CSS/@media/pointer
+ * @return {boolean}
+ */
+export function hasCoarsePointingDevice() {
+  return matchMedia('(pointer: coarse)').matches;
+}
+
+
 /**
  * @param {string[]} availableLanguages Available languages.
  * @return {string} The "best" language code.