www.spaceplanner.app

commit 1c9c6d5fcf06bb14d685607646074d586822e94e
parent 54544a004c7e6b2b252943d638042ce00637c4fa
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Sun, 13 Oct 2024 17:56:52 -0700

Fix some uses of updatedObject

Diffstat:
M
files/floorplans/floorplan/backend.js
 | 
22
+++++++++++-----------

1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/files/floorplans/floorplan/backend.js b/files/floorplans/floorplan/backend.js
@@ -455,11 +455,11 @@ export class FloorplanBackend {
 		const p = this.updatedObject(params, id, {
 			x: {
 				required: true,
-				parse: parsePos
+				parse: parseInt
 			},
 			y: {
 				required: true,
-				parse: parsePos 
+				parse: parseInt
 			}
 		})
 		return this.addData(id ?? "points", p)
@@ -534,11 +534,11 @@ export class FloorplanBackend {
 		const f = this.updatedObject(params, id, {
 			width: {
 				required: true,
-				parser: parseSize
+				parse: parseSize
 			},
 			depth: {
 				required: true,
-				parser: parseSize
+				parse: parseSize
 			},
 			type: {
 				required: true,
@@ -571,17 +571,17 @@ export class FloorplanBackend {
 		let fm = this.updatedObject(params, id, {
 			x: {
 				required: true,
-				parse: parsePos
+				parse: parseInt
 			},
 			y: {
 				required: true,
-				parse: parsePos
+				parse: parseInt
 			},
 			angle: {
 				required: true,
 				default: 0,
 				parse: function(input) {
-					let angle = validInt(input)
+					let angle = parseInt(input)
 					if (angle < 0 || angle >= 360) {
 						throw new Error(angle + ": Angle must be between 0 and 359 degrees")
 					}
@@ -598,7 +598,7 @@ export class FloorplanBackend {
 			furniture_id: {
 				required: true,
 				validate: function(id) {
-					return backend.cache.furniture_maps[id] != null
+					return idType(id) === "fur" && backend.obj(id)
 				}
 			}
 		})
@@ -1058,17 +1058,17 @@ export function parsePath(path) {
 }
 
 function parseSize(size) {
-	let n = parsePos(size)
+	let n = parseInt(size)
 	if (n <= 0) {
 		throw new Error("Size must be greater than 0")
 	}
 	return n
 }
 
-function parsePos(pos) {
+function parseInt(pos) {
 	let n = Math.round(pos)
 	if (isNaN(n)) {
-		throw new Error("Invalid coordinate (NaN)")
+		throw new Error("Invalid integer (NaN)")
 	}
 	return n
 }