Change bounds format

Author: mathiasbynens

src/from-minimap.js

@@ -127,8 +127,8 @@ const parseMarkerData = (buffer) => {
 const drawMapSection = async (mapContext, fileName) => {
 	const id = path.basename(fileName, '.png').replace(/^Minimap_Color_/, '');
 	const coordinates = minimapIdToAbsoluteXyz(id);
-	const xOffset = coordinates.x - GLOBALS.bounds.xMin * 256;
-	const yOffset = coordinates.y - GLOBALS.bounds.yMin * 256;
+	const xOffset = coordinates.x - GLOBALS.bounds.xMin;
+	const yOffset = coordinates.y - GLOBALS.bounds.yMin;
 	const buffer = await fsp.readFile(fileName);
 	const image = new Image();
 	image.src = buffer;
@@ -138,8 +138,8 @@ const drawMapSection = async (mapContext, fileName) => {
 const drawPathSection = async (pathContext, fileName) => {
 	const id = path.basename(fileName, '.png').replace(/^Minimap_WaypointCost_/, '');
 	const coordinates = minimapIdToAbsoluteXyz(id);
-	const xOffset = coordinates.x - GLOBALS.bounds.xMin * 256;
-	const yOffset = coordinates.y - GLOBALS.bounds.yMin * 256;
+	const xOffset = coordinates.x - GLOBALS.bounds.xMin;
+	const yOffset = coordinates.y - GLOBALS.bounds.yMin;
 	const buffer = await fsp.readFile(fileName);
 	const image = new Image();
 	image.src = buffer;

src/generate-bounds-from-minimap.js

@@ -10,20 +10,18 @@ const minimapIdToAbsoluteXyz = require('./minimap-id-to-absolute-xyz.js');
 const generateBoundsFromMinimap = async (mapsDirectory, dataDirectory) => {
 	const files = await glob(`${mapsDirectory}/*.png`);
 	const bounds = {
-		'xMin': +Infinity,
-		'xMax': -Infinity,
-		'yMin': +Infinity,
-		'yMax': -Infinity,
-		'zMin': +Infinity,
-		'zMax': -Infinity,
+		xMin: +Infinity,
+		xMax: -Infinity,
+		yMin: +Infinity,
+		yMax: -Infinity,
+		zMin: +Infinity,
+		zMax: -Infinity,
 	};
 	const floorIDs = [];
 	for (const file of files) {
 		const id = path.basename(file, '.png').replace(/^Minimap_(?:Color|WaypointCost)_/, '');
 		const coordinates = minimapIdToAbsoluteXyz(id);
-		const x = Math.floor(coordinates.x / 256);
-		const y = Math.floor(coordinates.y / 256);
-		const z = coordinates.z;
+		const { x, y, z } = coordinates;
 		if (bounds.xMin > x) {
 			bounds.xMin = x;
 		}
@@ -47,8 +45,8 @@ const generateBoundsFromMinimap = async (mapsDirectory, dataDirectory) => {
 			floorIDs.push(floorID);
 		}
 	}
-	bounds.width = (1 + bounds.xMax - bounds.xMin) * 256;
-	bounds.height = (1 + bounds.yMax - bounds.yMin) * 256;
+	bounds.width = 256 + bounds.xMax - bounds.xMin;
+	bounds.height = 256 + bounds.yMax - bounds.yMin;
 	bounds.floorIDs = floorIDs.sort();
 	writeJson(`${dataDirectory}/bounds.json`, bounds);
 	return bounds;

src/id-to-xyz.js

@@ -11,7 +11,6 @@ const handleParallel = require('./handle-parallel.js');
 
 const arrayToMinimapMarkerBuffer = require('./array-to-minimap-marker.js');
 const colors = require('./colors.js');
-const idToXyz = require('./id-to-xyz.js');
 const pixelDataToMapBuffer = require('./pixel-data-to-map.js');
 const pixelDataToPathBuffer = require('./pixel-data-to-path.js');
 
@@ -42,22 +41,21 @@ const writeBuffer = (fileName, buffer) => {
 
 const forEachTile = (context, map, callback, name, floorID) => {
 	const isGroundFloor = floorID == '07';
+	const z = Number(floorID);
 	const bounds = GLOBALS.bounds;
 	const image = new Image();
 	image.src = map;
 	context.drawImage(image, 0, 0, bounds.width, bounds.height);
 	// Extract each 256×256px tile.
 	let yOffset = 0;
 	while (yOffset < bounds.height) {
-		const y = bounds.yMin + (yOffset / 256);
-		const yID = String(y).padStart(3, '0');
+		const y = bounds.yMin + yOffset;
 		let xOffset = 0;
 		while (xOffset < bounds.width) {
-			const x = bounds.xMin + (xOffset / 256);
-			const xID = String(x).padStart(3, '0');
+			const x = bounds.xMin + xOffset;
 			const pixels = context.getImageData(xOffset, yOffset, 256, 256);
 			const buffer = callback(pixels, isGroundFloor);
-			const id = `${xID}${yID}${floorID}`;
+			const id = `${x}_${y}_${z}`;
 			if (buffer) {
 				addResult(id, name, buffer);
 			}
@@ -127,14 +125,12 @@ const convertToMinimap = async (dataDirectory, outputPath, includeMarkers, overl
 				data.pathBuffer = EMPTY_PATH_BUFFER;
 			}
 			// Generate the Tibia 11-compatible minimap PNGs.
-			const coords = idToXyz(id);
-			const minimapId = `${ coords.x * 256 }_${ coords.y * 256 }_${ coords.z }`;
 			writeBuffer(
-				`${outputPath}/Minimap_Color_${minimapId}.png`,
+				`${outputPath}/Minimap_Color_${id}.png`,
 				wrapColorData(data.mapBuffer, { overlayGrid })
 			);
 			writeBuffer(
-				`${outputPath}/Minimap_WaypointCost_${minimapId}.png`,
+				`${outputPath}/Minimap_WaypointCost_${id}.png`,
 				wrapWaypointData(data.pathBuffer)
 			);
 		}