-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ISSUE #5163 vertical range is now converted to calibbration units
test adjusted
- Loading branch information
1 parent
bd9c225
commit 8070467
Showing
6 changed files
with
124 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /** | ||
| * Copyright (C) 2024 3D Repo Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| const { isNumber } = require('./typeCheck'); | ||
|
|
||
| const UnitsHelper = {}; | ||
|
|
||
| const UNITS_CONVERSION_FACTORS_TO_METRES = { | ||
| m: 1, | ||
| dm: 10, | ||
| cm: 100, | ||
| mm: 1000, | ||
| ft: 3.28084, | ||
| }; | ||
|
|
||
| UnitsHelper.convertArrayUnits = (array, fromUnit, toUnit) => { | ||
| const fromFactor = UNITS_CONVERSION_FACTORS_TO_METRES[fromUnit]; | ||
| const toFactor = UNITS_CONVERSION_FACTORS_TO_METRES[toUnit]; | ||
|
|
||
| if (!array.every(isNumber) || !fromFactor || !toFactor) { | ||
| return null; | ||
| } | ||
|
|
||
| return array.map((n) => (n / fromFactor) * toFactor); | ||
| }; | ||
|
|
||
| module.exports = UnitsHelper; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /** | ||
| * Copyright (C) 2024 3D Repo Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| const { src } = require('../../../helper/path'); | ||
| const { generateRandomString } = require('../../../helper/services'); | ||
|
|
||
| const UnitsHelper = require(`${src}/utils/helper/units`); | ||
|
|
||
| const testConvertArrayUnits = () => { | ||
| describe.each([ | ||
| ['invalid fromUnit', [1, 5], generateRandomString(), 'm'], | ||
| ['invalid toUnit', [1, 5], 'm', generateRandomString()], | ||
| ['array with non numbers', [generateRandomString(), 5], 'm', 'mm'], | ||
| ['m to dm', [1, 5], 'm', 'dm', [10, 50]], | ||
| ['m to cm', [1, 5], 'm', 'cm', [100, 500]], | ||
| ['m to mm', [1, 5], 'm', 'mm', [1000, 5000]], | ||
| ['m to ft', [1, 5], 'm', 'ft', [3.281, 16.404]], | ||
| ['dm to m', [1, 5], 'dm', 'm', [0.1, 0.5]], | ||
| ['dm to cm', [1, 5], 'dm', 'cm', [10, 50]], | ||
| ['dm to mm', [1, 5], 'dm', 'mm', [100, 500]], | ||
| ['dm to ft', [1, 5], 'dm', 'ft', [0.328, 1.640]], | ||
| ['mm to dm', [1, 5], 'mm', 'dm', [0.01, 0.05]], | ||
| ['mm to cm', [1, 5], 'mm', 'cm', [0.1, 0.5]], | ||
| ['mm to m', [1, 5], 'mm', 'm', [0.001, 0.005]], | ||
| ['mm to ft', [1, 5], 'mm', 'ft', [0.003, 0.016]], | ||
| ['ft to dm', [1, 5], 'ft', 'dm', [3.048, 15.24]], | ||
| ['ft to cm', [1, 5], 'ft', 'cm', [30.48, 152.4]], | ||
| ['ft to m', [1, 5], 'ft', 'm', [0.305, 1.524]], | ||
| ['ft to mm', [1, 5], 'ft', 'mm', [304.8, 1524]], | ||
| ])('Convert array units', (description, array, fromUnit, toUnit, result = null) => { | ||
| test(`with ${description} should return ${result}`, () => { | ||
| let res = UnitsHelper.convertArrayUnits(array, fromUnit, toUnit); | ||
|
|
||
| if (res) { | ||
| res = res.map((r) => Math.round(r * 1000) / 1000); | ||
| } | ||
|
|
||
| expect(res).toEqual(result); | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| describe('utils/helper/units', () => { | ||
| testConvertArrayUnits(); | ||
| }); |