Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-08-04 18:50:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mph/mpg behavior

Browse Source
This commit is contained in:
Mark
2023-06-11 15:05:17 -07:00
parent 3294d4d5fb
commit 7382627041
7 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/quantity/unit/mod.rs
View File

@ -39,8 +39,6 @@ pub enum UnitBase {
// Area
Barn,
Hectare,
MilesPerHour,
MilesPerGallon,
Acre,
@ -190,8 +188,6 @@ macro_rules! fromstring_db {
(UnitBase::JulianYear, "julianYears"),
// Misc
(UnitBase::MilesPerHour, "mph"),
(UnitBase::MilesPerGallon, "mpg"),
(UnitBase::Barn, "b"),
(UnitBase::Barn, "barn"),
(UnitBase::Hectare, "ha"),
@ -346,7 +342,7 @@ macro_rules! unit_db {
),
UnitBase::Hour => $X!(
UnitBase::Hour, "hour",
UnitBase::Hour, "h",
rational, "3600",
(UnitBase::Second, 1f64)
),
@ -457,21 +453,6 @@ macro_rules! unit_db {
(UnitBase::Meter, 1f64)
),
// Misc
UnitBase::MilesPerHour => $X!(
UnitBase::MilesPerHour, "mph",
float, "0.44704",
(UnitBase::Meter, 1f64),
(UnitBase::Second, -1f64)
),
UnitBase::MilesPerGallon => $X!(
UnitBase::MilesPerGallon, "mpg",
float, "425144",
(UnitBase::Meter, -2f64)
),
UnitBase::Barn => $X!(
UnitBase::Barn, "b",
rational, "1e-28",