Add kgf and kilopond units

printfn · Nov 1, 2024 · aea224b · aea224b
1 parent 9559d9b
commit aea224b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/core/src/num/unit.rs b/core/src/num/unit.rs
@@ -1271,12 +1271,13 @@ impl Unit {
 		decimal_separator: DecimalSeparatorStyle,
 		int: &I,
 	) -> FResult<String> {
-		let from_base_units: Vec<_> = hash
+		let mut from_base_units: Vec<_> = hash
 			.into_iter()
 			.map(|(base_unit, exponent)| {
 				UnitExponent::new(NamedUnit::new_from_base(base_unit), exponent)
 			})
 			.collect();
+		from_base_units.sort_by(|a, b| a.unit.singular_name.cmp(&b.unit.singular_name));
 		Ok(Self {
 			components: from_base_units,
 		}

diff --git a/core/src/units/builtin.rs b/core/src/units/builtin.rs
@@ -586,6 +586,8 @@ const CGS_UNITS: &[UnitTuple] = &[
 	("G", "", "gauss", ""),
 	("Mx", "", "maxwell", ""),
 	("ph", "", "phot", ""),
+	("gf", "", "s@g force", ""),
+	("pond", "", "l@gf", ""),
 ];
 
 const IMPERIAL_UNITS: &[UnitTuple] = &[

diff --git a/core/tests/integration_tests.rs b/core/tests/integration_tests.rs
@@ -6078,3 +6078,11 @@ fn european_formatting() {
 		"approx. 0,9320390859"
 	);
 }
+
+#[test]
+fn kilopond() {
+	test_eval("kilopond to N", "9.80665 N");
+	test_eval("megapond to N", "9806.65 N");
+	test_eval("gf to N", "0.00980665 N");
+	expect_error("GF to N", Some("cannot convert from GF to N: units 'ampere^2 second^4 kilogram^-1 meter^-2' and 'kilogram meter / second^2' are incompatible"));
+}