Merge branch '202291-main'

Remove metric v imperial definitons

README.md

@@ -90,9 +90,7 @@ ConvUnit("vol", 34, "cm3", "inch3") // 2.0748027411805627
 ConvUnit("vol", 490, Volume.Quart, Volume.Liter) // 463.71297
 ```
 
-[Distance/Area/Volume definitons](https://github.com/Yetity/ump/blob/main/src/libmath/convTable.json)
-
-[Distance/Area/Volume aliases](https://github.com/Yetity/ump/blob/master/src/libmath/def/unit-ali.json)
+[Distance/Area/Volume definitons](https://github.com/Yetity/ump/blob/main/src/libmath/Units.js)
 
 ## Releases
 [Github](https://github.com/Yetity/ump/releases) \

src/index.js

@@ -67,9 +67,9 @@ const PrimeFactorize = (num) => {
 const ConvUnit = (unit, n, fromUnit, toUnit) => {
 	const fromFactor = conversionFactors[fromUnit];
 	const toFactor = conversionFactors[toUnit];
-	const distance = ["nanometre", "nanometer", "nm", "micrometre", "micrometer", "millimetre", "millimeter", "mm", "centimeter", "centimetre", "cm", "meter", "metre", "m", "kilometer", "kilometre", "km", "nautical-mile", "nmi", "inch", "foot", "ft", "yard", "yd", "mile", "mi"]
-	const area = ["square-centimetre", "square-centimeter", "centimeter-square", "centimetre-square", "cm2", "2cm", "square-foot", "square-feet", "foot-square", "feet-square", "ft2", "2ft", "square-inch", "inch-square", "inch2", "2inch", "in2", "2in", "square-meter", "square-metre", "meter-square", "metre-square", "m2", "2m", "acre", "a", "hectare", "ha"]
-	const volume = ["milliliter", "millilitre", "ml", "centilitre", "centiiter", "cl", "deciliter", "decilitre", "dl", "liter", "litre", "l", "kiloliter", "kilolitre", "kl", "decalitre", "decaliter", "dal", "hectoliter", "hectolitre", "hl", "cubic-millimeter", "cubic-millimetre", "3mm", "mm3", "cubic-centimetre", "cubic-centimeter", "3cm", "cm3", "cubic-meter", "cubic-metre", "m3", "3m", "cubic-inch", "3in", "in3", "3inch", "inch3", "fluid-ounce", "floz", "gill", "pint", "pt", "quart", "qt", "gallon", "gl"]
+	const distance = ["nanometer", "nm", "micrometer", "millimeter", "mm", "centimeter", "cm", "meter", "m", "kilometer", "km", "nautical-mile", "nmi", "inch", "foot", "ft", "yard", "yd", "mile", "mi"]
+	const area = ["square-centimeter", "cm2", "square-foot", "ft2", "square-inch", "2inch", "2in", "square-meter", "2m", "acre", "hectare"]
+	const volume = ["milliliter", "ml", "centiliter", "cl", "deciliter", "dl", "liter",  "l", "kiloliter", "kl", "decaliter", "dal", "hectoliter",, "hl", "cubic-millimeter", "3mm", "cubic-centimeter", "3cm", "cubic-meter","3m", "cubic-inch", "3inch", "fluid-ounce", "floz", "gill", "pint", "quart", "gallon"]
 	if (!fromFactor || !toFactor) {
 		return `invalid from/to Unit, ${fromUnit} or ${toUnit} is not a valid unit.`;
 	}

src/libmath/convTable.json

@@ -1,113 +1,69 @@
 {
-    "nanometer": 0.000001,
     "nanometre": 0.000001,
     "nm" : 0.00001,
     "micrometer": 0.001,
-    "micrometre": 0.001,
     "µ" : 0.001,
     "millimeter": 1,
-    "millimetre": 1,
     "mm" : 1,
     "centimeter": 10,
-    "centimetre": 10,
     "cm" : 10,
     "meter": 1000,
-    "metre": 1000,
     "m" : 1000,
     "kilometer": 1000000,
-    "kilometre": 1000000,
     "km" : 1000000,
     "nautical-mile" : 1852000,
     "nmi": 1852000,
     "inch": 25.4,
-    "″": 25.4,
     "foot": 304.8,
     "ft": 304.8,
     "yard": 914.4,
     "yd": 914.4,
     "mile": 1609000,
     "mi": 1609000,
 
-    "square-centimetre": 0.0001,
     "square-centimeter": 0.0001,
     "centimeter-square": 0.0001,
-    "centimetre-square": 0.0001,
-    "cm2": 0.0001,
     "2cm": 0.0001,
     "square-foot": 0.092903,
-    "square-feet": 0.092903,
-    "foot-square": 0.092903,
-    "feet-square": 0.092903,
-    "ft2": 0.092903,
     "2ft": 0.092903,
     "square-inch": 0.00064516,
-    "inch-square": 0.00064516,
-    "inch2": 0.00064156,
     "2inch": 0.00064516,
-    "in2": 0.00064156,
-    "2in": 0.00064516,
     "square-meter": 1,
-    "square-metre": 1,
-    "meter-square": 1,
-    "metre-square": 1,
-    "m2": 1,
     "2m" : 1,
     "square-kilometer": 1000000,
-    "square-kilometre": 1000000,
-    "kilometer-square": 1000000,
-    "kilometre-square": 1000000,
-    "km2": 1000000,
     "2km" : 1000000,
     "acre": 100,
     "a": 100,
     "hectare": 10000,
     "ha": 10000,
 
     "milliliter": 1,
-    "millilitre": 1,
     "ml": 1,
     "centiliter": 10,
-    "centilitre": 10,
     "cl": 10,
     "deciliter": 100,
-    "decilitre": 100,
     "dl": 100,
     "liter": 1000,
-    "litre": 1000,
     "l": 1000,
     "kiloliter": 1000000,
-    "kilolitre": 1000000,
     "kl": 1000000,
     "decaliter": 10000,
-    "decalitre": 10000,
     "dal": 10000,
     "hectoliter": 100000,
-    "hectolitre": 100000,
     "hl": 100000,
     "cubic-millimeter": 0.000001,
-    "cubic-millimetre": 0.000001,
-    "mm3": 0.000001,
     "3mm": 0.000001,
     "cubic-centimeter": 1,
-    "cubic-centimetre": 1,
-    "cm3": 1,
     "3cm": 1,
     "cubic-meter": 1000000,
-    "cubic-metre": 1000000,
-    "m3": 1000000,
     "3m": 1000000,
     "cubic-inch": 16.3871,
-    "in3": 16.3871,
     "3in": 16.3871,
-    "inch3": 16.3871,
     "3inch": 16.3871,
     "fluid-ounce": 29.5735,
     "floz": 29.5735,
     "gill": 118.294,
     "pint": 473.176,
-    "pt": 473.176,
     "quart": 946.353,
-    "qt": 946.353,
-    "gallon": 3785.41,
-    "gl": 3785.41
+    "gallon": 3785.41
 }