From 8101381cc4473c5b512854872f2706ba0ca1c535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20V=C3=B6gele?= <develop@manuel-voegele.de>
Date: Mon, 12 Jun 2023 21:39:50 +0200
Subject: [PATCH] Remove redundant & broken code path in _computeDistance
 (fixes #280)

---
 src/ruler.js | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/ruler.js b/src/ruler.js
index edf2bb6..02a417c 100644
--- a/src/ruler.js
+++ b/src/ruler.js
@@ -262,29 +262,23 @@ export function extendRuler() {
 			if (!this.isDragRuler) {
 				return super._computeDistance(gridSpaces);
 			}
-			if (!this.dragRulerEnableTerrainRuler) {
-				if (!this.dragRulerIgnoreGrid) {
-					gridSpaces = true;
-				}
-				super._computeDistance(gridSpaces);
-			} else {
-				const shape = this.draggedEntity ? getTokenShape(this.draggedEntity) : null;
-				const options = {
-					ignoreGrid: this.dragRulerIgnoreGrid,
-					gridSpaces,
-					enableTerrainRuler: this.dragRulerEnableTerrainRuler,
-				};
-				const distances = measureDistances(this.segments, this.draggedEntity, shape, options);
-				let totalDistance = 0;
-				for (const [i, d] of distances.entries()) {
-					let s = this.segments[i];
-					s.startDistance = totalDistance;
-					totalDistance += d;
-					s.last = i === this.segments.length - 1;
-					s.distance = d;
-					s.text = this._getSegmentLabel(s, totalDistance);
-				}
+			const shape = this.draggedEntity ? getTokenShape(this.draggedEntity) : null;
+			const options = {
+				ignoreGrid: this.dragRulerIgnoreGrid,
+				gridSpaces,
+				enableTerrainRuler: this.dragRulerEnableTerrainRuler,
+			};
+			const distances = measureDistances(this.segments, this.draggedEntity, shape, options);
+			let totalDistance = 0;
+			for (const [i, d] of distances.entries()) {
+				let s = this.segments[i];
+				s.startDistance = totalDistance;
+				totalDistance += d;
+				s.last = i === this.segments.length - 1;
+				s.distance = d;
+				s.text = this._getSegmentLabel(s, totalDistance);
 			}
+
 			for (const [i, segment] of this.segments.entries()) {
 				const unsnappedSegment = this.dragRulerUnsnappedSegments[i];
 				unsnappedSegment.startDistance = segment.startDistance;