Small cleanups

Author: Basssiiie

src/services/vehicleDragger.ts

@@ -2,8 +2,7 @@ import { Store } from "openrct2-flexui";
 import { isMultiplayer } from "../environment";
 import { getCarById, RideVehicle } from "../objects/rideVehicle";
 import * as Log from "../utilities/logger";
-import { getTileElement } from "../utilities/map";
-import { floor } from "../utilities/math";
+import { alignWithMap, getTileElement, toTileUnit } from "../utilities/map";
 import { cancelCurrentTool, cancelTools } from "../utilities/tools";
 import { isNumber, isUndefined } from "../utilities/type";
 import { register } from "./actions";
@@ -209,8 +208,9 @@ function updateVehicleDrag(args: DragVehicleArgs): void
 
 	const position = args.position;
 	const progress = position.progress;
-	if (isNumber(position.trackElementIndex) && isNumber(progress)) {
-		car.moveToTrack(tileCoordinate(position.x), tileCoordinate(position.y-16), position.trackElementIndex);
+	if (isNumber(position.trackElementIndex) && isNumber(progress))
+	{
+		car.moveToTrack(toTileUnit(position.x), toTileUnit(position.y), position.trackElementIndex);
 		car.travelBy(getDistanceFromProgress(car, progress - car.trackProgress));
 	}
 	else
@@ -222,19 +222,3 @@ function updateVehicleDrag(args: DragVehicleArgs): void
 
 	invoke(refreshVehicle, id);
 }
-
-/**
- * Align the coordinate with the edge of a map tile.
- */
-function alignWithMap(coordinate: number): number
-{
-	return floor(coordinate / 32) * 32;
-}
-
-/**
- * Align the coordinate with the edge of a map tile.
- */
-function tileCoordinate(coordinate: number): number
-{
-	return floor(coordinate / 32);
-}

src/utilities/map.ts

@@ -1,15 +1,29 @@
 import { floor } from "./math";
 
-
 const UnitsPerTile = 32;
 
+/**
+ * Converts a entity coordinate unit to a tile coordinate unit.
+ */
+export function toTileUnit(coordinate: number): number
+{
+	return floor(coordinate / UnitsPerTile);
+}
+
+/**
+ * Align the coordinate with the edge of a map tile.
+ */
+export function alignWithMap(coordinate: number): number
+{
+	return toTileUnit(coordinate) * UnitsPerTile;
+}
 
 /**
  * Get a tile from non-tile coordinates (like entity coordinates).
  */
 export function getTileByCoords(x: number, y: number): Tile
 {
-	return map.getTile(floor(x / UnitsPerTile), floor(y / UnitsPerTile));
+	return map.getTile(toTileUnit(x), toTileUnit(y));
 }
 
 /**
@@ -19,4 +33,4 @@ export function getTileElement<T extends TileElement = TileElement>(x: number, y
 {
 	const tile = getTileByCoords(x, y);
 	return tile.getElement<T>(elementIdx);
-}
+}

src/viewmodels/vehicleViewModel.ts

@@ -302,7 +302,7 @@ export class VehicleViewModel
 	{
 		if (this._isOpen)
 		{
-			toggleVehicleDragger(active, this._selectedVehicle, this._x, this._y, this._z, this._trackLocation, this._trackProgress, () => this._isDragging.set(false))
+			toggleVehicleDragger(active, this._selectedVehicle, this._x, this._y, this._z, this._trackLocation, this._trackProgress, () => this._isDragging.set(false));
 		}
 	}