geolba/GeotiefExplore
2
1
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Wiki Activity

- new BoreholeTool: BoreholeControl.css, BoreholeControl.js, BaseEditor.js, MarkerLayer

Browse source 
- changes in: Picking.js, domUtil.js, Map.js, Layer.js (for popup), main.js, index.html (third data tab)
- npm updates
This commit is contained in:
Arno Kaimbacher 2021-03-23 12:26:43 +01:00
parent a09db46a03
commit 37d7973071
12 changed files with 830 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/js/clip/Picking.js
View file

@ -17,6 +17,8 @@ export class Picking {
plane;
touchCapable = false;
isDraging = false;
enabled = true;
defaultMapCursor;
constructor(size, center, simulation) {
this.size = size;
@ -43,6 +45,7 @@ export class Picking {
simulation.scene.add(this.plane);
this.domElement = simulation.renderer.domElement;
this.defaultMapCursor = this.domElement.style.cursor;
domEvent.on(this.domElement, 'mousemove', this.mouseMove, this);
if (this.touchCapable == true) {
domEvent.on(this.domElement, 'touchstart', this.beginDrag, this);
@ -78,7 +81,7 @@ export class Picking {
}
mouseMove(event) {
if (this.isDraging == true || this.simulation.selection.visible == false) {
if (this.isDraging == true || this.simulation.selection.visible == false || this.enabled == false) {
return;
}
let point = this._getCanvasPoint(event);
@ -110,14 +113,14 @@ export class Picking {
// cursor is not selecting the box
this.intersected.guardian.rayOut();
this.intersected = null;
this.simulation.renderer.domElement.style.cursor = 'auto';
this.simulation.renderer.domElement.style.cursor = this.defaultMapCursor;
// this.simulation.throttledRender();
this.simulation.deferringThrottle();
}
}
beginDrag(event) {
if (this.simulation.selection.visible == false) {
if (this.simulation.selection.visible == false && this.enabled == false) {
return;
}
// exit drag method, if not left mouse button was clicked
@ -225,5 +228,25 @@ export class Picking {
}
}
disable () {
domEvent.off(this.domElement, 'mousemove', this.mouseMove, this);
if (this.touchCapable == true) {
domEvent.off(this.domElement, 'touchstart', this.beginDrag, this);
} else {
domEvent.off(this.domElement, 'mousedown', this.beginDrag, this);
}
this.enabled = false;
}
enable() {
domEvent.on(this.domElement, 'mousemove', this.mouseMove, this);
if (this.touchCapable == true) {
domEvent.on(this.domElement, 'touchstart', this.beginDrag, this);
} else {
domEvent.on(this.domElement, 'mousedown', this.beginDrag, this);
}
this.enabled = true;
}
}