Merge pull request #157 from sh4rkman/dev

Yeho fix
sh4rkman · Jun 13, 2024 · c8601de · c8601de
2 parents a4dbd37 + fd6a1e7
commit c8601de
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 
 
+# <img src="https://img.shields.io/badge/-major%20release-blue?style=flat-square">  **25.0.2** *(2024-06-12)*
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Corrected Yehorivka heightmap [#155](https://github.com/sh4rkman/SquadCalc/issues/155) (Thanks SuisQi!)
+
+
+</br></br><!-- CHANGELOG SPLIT MARKER -->
+
+
 # <img src="https://img.shields.io/badge/-major%20release-blue?style=flat-square">  **25.0.1** *(2024-06-12)*
 
 <img src="https://img.shields.io/badge/-%20Improv%20-orange">  Added minimum range for M1064-A3

diff --git a/config/playwright-tests/legacyui.spec.ts b/config/playwright-tests/legacyui.spec.ts
@@ -96,7 +96,7 @@ test('Advanced calc', async ({  }) => {
   await expect(page.locator('#elevationNum')).toContainText("1214");
 
   // Select BM21 Grad
-  await page.getByRole('textbox', { name: 'mortar' }).click();
+  await page.getByRole('textbox', { name: 'Mortar', exact: true }).click();
   await page.getByRole('option', { name: 'BM-21 Grad' }).click();
 
   // Check calcs
@@ -122,8 +122,8 @@ test('Save calc', async ({  }) => {
   await page.locator('#target-location').pressSequentially('C01245');
 
   // Select mortar
-  await page.getByRole('textbox', { name: 'mortar' }).click();
-  await page.getByRole('option', { name: 'mortar' }).click();
+  await page.getByRole('textbox', { name: 'Mortar', exact: true }).click();
+  await page.getByRole('option', { name: 'Mortar', exact: true }).click();
 
   // Select a map
   await page.getByRole('textbox', { name: 'Al basrah' }).click();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squadcalc",
-  "version": "25.0.1",
+  "version": "25.0.2",
   "description": "A Complete Mortar Calculator for Squad",
   "author": "Maxime 'sharkman' Boussard",
   "license": "MIT",

diff --git a/public/maps/yehorivka/heightmap.webp b/public/maps/yehorivka/heightmap.webp
diff --git a/src/js/maps.js b/src/js/maps.js
@@ -207,7 +207,7 @@ export const MAPS = [
         name: "Yehorivka", 
         size: 6350, // Not the SDK values weirdly
         offset: [-8300, -8300], 
-        scaling: 0.2732, 
+        scaling: 0.3332, 
         mapURL: "/yehorivka/", 
         maxZoomLevel: 4,
     }

diff --git a/src/js/tests/mapdata.js b/src/js/tests/mapdata.js
@@ -687,12 +687,12 @@ const MAPDATA = [
       ],
       extra: {
         scale: [1, 1, 4],
-        levels: [70, 753],
+        levels: [0, 833],
         minimap: [
           [-3002, -3002],
           [3048, 3048],
         ],
-        hDim: [6050, 6050],
+        hDim: [6351, 6351],
         lOrigin: [-3002, -3002], // don't trust sdk, landscape origin changed
       },
     },