Add example in desktop interface and fix issue with snapping

camptocamp · Jul 25, 2019 · eabe6c7 · arnaud-morvan · Aug 22, 2019 · eabe6c7
1 parent 851613e
commit eabe6c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/contribs/gmf/apps/desktop/Controller.js b/contribs/gmf/apps/desktop/Controller.js
@@ -16,6 +16,7 @@ import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
+import olSourceVector from 'ol/source/Vector.js';
 
 if (!window.requestAnimationFrame) {
   alert('Your browser is not supported, please update it or use another one. You will be redirected.\n\n'
@@ -123,6 +124,9 @@ exports.module = angular.module('Appdesktop', [
   gmfControllersAbstractDesktopController.module.name,
 ]);
 
+exports.module.value('ngeoSnappingTolerance', 20);
+exports.module.value('ngeoSnappingSource', new olSourceVector());
+
 exports.module.value('gmfContextualdatacontentTemplateUrl', 'gmf/contextualdata');
 exports.module.run(/* @ngInject */ ($templateCache) => {
   $templateCache.put('gmf/contextualdata', require('./contextualdata.html'));

diff --git a/contribs/gmf/src/editing/Snapping.js b/contribs/gmf/src/editing/Snapping.js
@@ -9,7 +9,9 @@ import * as olBase from 'ol/index.js';
 import * as olEvents from 'ol/events.js';
 import olCollection from 'ol/Collection.js';
 import olFormatWFS from 'ol/format/WFS.js';
-import olInteractionSnap from 'ol/interaction/Snap.js';
+import olInteractionSnap, {handleEvent as snapHandleEvent} from 'ol/interaction/Snap.js';
+import {handleEvent as handlePointerEvent} from 'ol/interaction/Pointer.js';
+
 
 /**
  * The snapping service of GMF. Responsible of collecting the treeCtrls that
@@ -139,19 +141,12 @@ class CustomSnap extends olInteractionSnap {
     document.body.addEventListener('keyup', () => {
       this.modifierPressed = false;
     });
-  }
-
-  handleEvent(evt) {
-    if (this.modifierPressed) {
-      return;
-    } else {
-      const result = this.snapTo(evt.pixel, evt.coordinate, evt.map);
-      if (result.snapped) {
-        evt.coordinate = result.vertex.slice(0, 2);
-        evt.pixel = result.vertexPixel;
+    this.handleEvent = (evt) => { // horrible hack
+      if (!this.modifierPressed) {
+        return snapHandleEvent.call(this, evt);
       }
-      return super.handleEvent(evt);
-    }
+      return handlePointerEvent.call(this, evt);
+    };
   }
 }