diff --git a/qudtlib-js-gen/src/main/resources/template/units.ts.ftl b/qudtlib-js-gen/src/main/resources/template/units.ts.ftl index 6c119d17..88e4b6fa 100644 --- a/qudtlib-js-gen/src/main/resources/template/units.ts.ftl +++ b/qudtlib-js-gen/src/main/resources/template/units.ts.ftl @@ -68,6 +68,17 @@ export * from "@qudtlib/core"; ${optStr(unit.currencyCode)}, ${optNum(unit.currencyNumber)}, [${unit.unitOfSystems?map(s -> "\""+s.iri+"\"")?join(",")}], + ${unit.dependents}, + <#if unit.isDeprecated()> + true, + <#else> + false, + + <#if unit.isGenerated()> + true + <#else> + false + ); <#list unit.labels as label> unit.addLabel(new LangString(${q(label.string)}, ${optStr(label.languageTag)})); diff --git a/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java b/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java index b218809b..4f2470b2 100644 --- a/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java +++ b/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java @@ -688,7 +688,7 @@ public int compare(Unit left, Unit right) { } if (right.isDefinedAsOtherUnit() && left.getFactorUnits().getFactorUnits().size() == 1 - && left.getFactorUnits().getFactorUnits().get(0).getUnit().equals(left) + && left.getFactorUnits().getFactorUnits().get(0).getUnit().equals(right) && right.getFactorUnits().getFactorUnits().get(0).getExponent() == left.getFactorUnits().getFactorUnits().get(0).getExponent()) { return -1; // if a unit is just another name of another unit with same exponent,