zincjs 1.8.1 → 1.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zincjs",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "ZincJS (Web-based-Zinc-Visualisation)",
   "main": "build/zinc.js",
   "directories": {

package/src/controls.js

@@ -227,7 +227,8 @@ const CameraControls = function ( object, domElement, renderer, scene ) {
 
 	this.getVisibleHeightAtZDepth = ( depth ) => {
 		// compensate for cameras not positioned at z=0
-		const cameraOffset = this.cameraObject.position.z;
+		
+		const cameraOffset = this.cameraObject.position.distanceTo(this.cameraObject.target);
 		if ( depth < cameraOffset ) depth -= cameraOffset;
 		else depth += cameraOffset;
 	
@@ -349,20 +350,22 @@ const CameraControls = function ( object, domElement, renderer, scene ) {
 
 	const onDocumentMouseMove = event => {
     updateRect(false);
-		this.pointer_x = event.clientX - rect.left;
-		this.pointer_y = event.clientY - rect.top;
-    if (currentMode === MODE.MINIMAP) {
-      let minimapCoordinates = this.scene.getNormalisedMinimapCoordinates(this.renderer, event);
-      if (minimapCoordinates) {
-        let translation = this.scene.getMinimapDiffFromNormalised(
-          minimapCoordinates.x, minimapCoordinates.y);
-        translateViewport(translation);
-      }
-    } else {
-      if ((this._state === STATE.NONE) && (zincRayCaster !== undefined)) {
-        zincRayCaster.move(this, event.clientX, event.clientY, this.renderer);
-      }
-    }
+		if (rect) {
+			this.pointer_x = event.clientX - rect.left;
+			this.pointer_y = event.clientY - rect.top;
+			if (currentMode === MODE.MINIMAP) {
+				let minimapCoordinates = this.scene.getNormalisedMinimapCoordinates(this.renderer, event);
+				if (minimapCoordinates) {
+					let translation = this.scene.getMinimapDiffFromNormalised(
+						minimapCoordinates.x, minimapCoordinates.y);
+					translateViewport(translation);
+				}
+			} else {
+				if ((this._state === STATE.NONE) && (zincRayCaster !== undefined)) {
+					zincRayCaster.move(this, event.clientX, event.clientY, this.renderer);
+				}
+			}
+		}
 	}
 	
 	const onDocumentMouseUp = event => {
@@ -1533,7 +1536,8 @@ const RayCaster = function (sceneIn, hostSceneIn, callbackFunctionIn, hoverCallb
 			const length = pickedObjects.length;
 			for (let i = 0; i < length; i++) {
 				let zincObject = pickedObjects[i].object ? pickedObjects[i].object.userData : undefined;
-				if (zincObject && zincObject.isMarkerCluster && zincObject.visible) {
+				if (zincObject && zincObject.isMarkerCluster && zincObject.visible
+					&& zincObject.clusterIsVisible(pickedObjects[i].object.clusterIndex)) {
 					zincObject.zoomToCluster(pickedObjects[i].object.clusterIndex);
 					return;
 				}

package/src/primitives/markerCluster.js

@@ -218,6 +218,15 @@ const MarkerCluster = function(sceneIn) {
       this.markerUpdateRequired = true;
     }
   }
+
+  this.clusterIsVisible = (index) => {
+    if (index !== undefined && index > -1) {
+      if (sprites[index]) {
+        return sprites[index].group?.visible;
+      }
+    }
+    return false;
+  }
 }
 
 MarkerCluster.prototype = Object.create((require('./zincObject').ZincObject).prototype);