From 1f63dfe6d6ed65e2b9272a30fcf3748e0a17c7db Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Fri, 13 May 2022 17:10:04 -0500 Subject: [PATCH] Add more units, plus unit aliases This means you should be able to type the singular or the plural form for most units now. --- macrovision.js | 114 ++++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 48 deletions(-) diff --git a/macrovision.js b/macrovision.js index 1f1e6cd5..43d910bf 100644 --- a/macrovision.js +++ b/macrovision.js @@ -163,136 +163,120 @@ math.createUnit("humans", { definition: "5.75 feet", }); -math.createUnit("story", { - definition: "12 feet", - prefixes: "long", -}); math.createUnit("stories", { definition: "12 feet", prefixes: "long", + aliases: ["story", "floor", "floors", "storey", "storeys"] }); math.createUnit("buses", { definition: "11.95 meters", prefixes: "long", + aliases: ["bus"] }); math.createUnit("marathons", { definition: "26.2 miles", prefixes: "long", + aliases: ["marathon"] }); math.createUnit("timezones", { definition: "1037.54167 miles", prefixes: "long", - aliases: ["timezone", "timezones"], + aliases: ["timezone"], }); math.createUnit("nauticalMiles", { definition: "6080 feet", prefixes: "long", - aliases: ["nauticalMile", "nauticalMiles"], + aliases: ["nauticalMile"], }); math.createUnit("fathoms", { definition: "6 feet", prefixes: "long", - aliases: ["fathom", "fathoms"], + aliases: ["fathom"], }); - math.createUnit("U", { definition: "1.75 inches", prefixes: "short", + aliases: ["rackUnits"] }); - math.createUnit("earths", { definition: "12756km", prefixes: "long", aliases: ["earth", "earths", "Earth", "Earths"], }); -math.createUnit("lightsecond", { - definition: "299792458 meters", - prefixes: "long", -}); math.createUnit("lightseconds", { definition: "299792458 meters", prefixes: "long", -}); - -math.createUnit("parsec", { - definition: "3.086e16 meters", - prefixes: "long", + aliases: ["lightsecond"] }); math.createUnit("parsecs", { definition: "3.086e16 meters", prefixes: "long", + aliases: ["parsec"] }); math.createUnit("lightyears", { definition: "9.461e15 meters", prefixes: "long", -}); -math.createUnit("AU", { - definition: "149597870700 meters", + aliases: ["lightyear"] }); math.createUnit("AUs", { definition: "149597870700 meters", -}); -math.createUnit("dalton", { - definition: "1.66e-27 kg", - prefixes: "long", + aliases: ["AU", "astronomicalUnits", "astronomicalUnit"] }); math.createUnit("daltons", { definition: "1.66e-27 kg", prefixes: "long", + alias: ["dalton", "Daltons", "Dalton"] }); math.createUnit("solarradii", { definition: "695990 km", prefixes: "long", + alias: ["solarRadii"] }); math.createUnit("solarmasses", { definition: "2e30 kg", prefixes: "long", -}); -math.createUnit("galaxy", { - definition: "105700 lightyears", - prefixes: "long", + aliases: ["solarMasses"] }); math.createUnit("galaxies", { definition: "105700 lightyears", prefixes: "long", -}); -math.createUnit("universe", { - definition: "93.016e9 lightyears", - prefixes: "long", + aliases: ["galaxy"] }); math.createUnit("universes", { definition: "93.016e9 lightyears", prefixes: "long", -}); -math.createUnit("multiverse", { - definition: "1e30 lightyears", - prefixes: "long", + aliases: ["universe"] }); math.createUnit("multiverses", { definition: "1e30 lightyears", prefixes: "long", + aliases: ["multiverse"] }); math.createUnit("pinHeads", { definition: "3.14159 mm^2", prefixes: "long", + aliases: ["pinHead"] }); math.createUnit("dinnerPlates", { definition: "95 inches^2", prefixes: "long", + aliases: ["dinnerPlate"] }); math.createUnit("suburbanHouses", { definition: "2000 feet^2", prefixes: "long", + aliases: ["suburbanHouse"] }); math.createUnit("footballFields", { definition: "57600 feet^2", prefixes: "long", + aliases: ["footballField"] }); math.createUnit("blocks", { definition: "20000 m^2", prefixes: "long", - aliases: ["block", "blocks"], + aliases: ["block"], }); math.createUnit("peopleInRural", { @@ -314,47 +298,57 @@ math.createUnit("peopleInDenseCrowd", { math.createUnit("people", { definition: "75 liters", prefixes: "long", + aliases: ["prey", "preys"] }); math.createUnit("shippingContainers", { definition: "1169 ft^3", prefixes: "long", + aliases: ["shippingContainer"] }); math.createUnit("olympicPools", { definition: "2500 m^3", prefixes: "long", + aliases: ["olympicPool"] }); math.createUnit("oceans", { definition: "700000000 km^3", prefixes: "long", + aliases: ["ocean"] }); math.createUnit("earthVolumes", { definition: "1.0867813e12 km^3", prefixes: "long", + aliases: ["earthVolume"] }); math.createUnit("universeVolumes", { definition: "4.2137775e+32 lightyears^3", prefixes: "long", + aliases: ["universeVolume"] }); math.createUnit("multiverseVolumes", { definition: "5.2359878e+89 lightyears^3", prefixes: "long", + aliases: ["multiverseVolume"] }); - math.createUnit("peopleMass", { definition: "80 kg", prefixes: "long", + aliases: ["peopleMasses"] }); math.createUnit("cars", { definition: "1250kg", prefixes: "long", + aliases: ["car"] }); math.createUnit("busMasses", { definition: "15000kg", prefixes: "long", + aliases: ["busMass"] }); -math.createUnit("earthMass", { +math.createUnit("earthMasses", { definition: "5.97e24 kg", prefixes: "long", + aliases: ["earthMass"] }); math.createUnit("kcal", { @@ -394,52 +388,71 @@ math.createUnit("metrosEaten", { prefixes: "long", }); -math.createUnit("barn", { - definition: "10e-28 m^2", - prefixes: "long", -}); math.createUnit("barns", { definition: "10e-28 m^2", prefixes: "long", + aliases: ["barn"] }); math.createUnit("points", { definition: "0.013888888888888888888888888 inches", prefixes: "long", + aliases: ["point"] +}); +math.createUnit("picas", { + definition: "12 points", + prefixes: "long", + aliases: ["pica"] }); math.createUnit("beardSeconds", { definition: "10 nanometers", prefixes: "long", + aliases: ["beardSecond"] }); math.createUnit("smoots", { definition: "5.5833333 feet", prefixes: "long", + aliases: ["smoot"] }); math.createUnit("furlongs", { definition: "660 feet", prefixes: "long", + aliases: ["furlong"] }); math.createUnit("nanoacres", { definition: "1e-9 acres", prefixes: "long", + aliases: ["nanoacre"] }); math.createUnit("barnMegaparsecs", { definition: "1 barn megaparsec", prefixes: "long", + aliases: ["barnMegaparsec"] }); math.createUnit("firkins", { definition: "90 lb", prefixes: "long", + aliases: ["firkin"] }); math.createUnit("donkeySeconds", { definition: "250 joules", prefixes: "long", + aliases: ["donkeySecond"] }); math.createUnit("HU", { definition: "0.75 inches", aliases: ["HUs", "hammerUnits"], }); +math.createUnit("sections", { + definition: "640 acres", + aliases: ["section"] +}); +math.createUnit("townships", { + definition: "36 sections", + aliases: ["township", "surveytownships", "surveytownships"] +}); + //#endregion const defaultUnits = { @@ -515,7 +528,11 @@ const unitChoices = { quirky: [ "beardSeconds", "points", + "picas", "smoots", + "links", + "rods", + "chains", "furlongs", "HUs", "U", @@ -525,7 +542,7 @@ const unitChoices = { }, area: { metric: ["cm^2", "meters^2", "kilometers^2"], - customary: ["inches^2", "feet^2", "acres", "miles^2"], + customary: ["inches^2", "feet^2", "chains^2", "acres", "miles^2", "sections", "townships"], relative: [ "pinHeads", "dinnerPlates", @@ -544,8 +561,9 @@ const unitChoices = { }, volume: { metric: ["milliliters", "liters", "m^3"], - customary: ["in^3", "floz", "cups", "pints", "quarts", "gallons"], + customary: ["in^3", "floz", "teaspoons", "tablespoons", "cups", "pints", "quarts", "gallons"], relative: [ + "oilbarrels", "shippingContainers", "olympicPools", "oceans", @@ -558,8 +576,8 @@ const unitChoices = { }, mass: { metric: ["kilograms", "milligrams", "grams", "tonnes"], - customary: ["lbs", "ounces", "tons"], - relative: ["cars", "busMasses", "earthMass", "solarmasses"], + customary: ["grains", "lbs", "ounces", "tons"], + relative: ["cars", "busMasses", "earthMasses", "solarmasses"], quirky: ["firkins"], human: ["peopleMass"], },