fixing ambigous issue in pint

rahulworld · Jul 26, 2018 · 836a345 · 836a345
1 parent d5847bd
commit 836a345
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 7 deletions.
diff --git a/istsos/plugins/unit_con_pint/retrievers/aiopg/__pycache__/observations.cpython-36.pyc b/istsos/plugins/unit_con_pint/retrievers/aiopg/__pycache__/observations.cpython-36.pyc
diff --git a/istsos/plugins/unit_con_pint/retrievers/aiopg/observations.py b/istsos/plugins/unit_con_pint/retrievers/aiopg/observations.py
@@ -237,6 +237,8 @@ def __get_array_2(self, offerings, request):
 
         yield from cur.execute(sql, tuple(params*len(unions)))
         rec = yield from cur.fetchone()
+        print('Data in Pint')
+        print(rec)
         request['observations'] = {}
         for idx in range(0, len(headers)):
             header = headers[idx]

diff --git a/istsos/plugins/unit_con_post/retrievers/aiopg/observations.py b/istsos/plugins/unit_con_post/retrievers/aiopg/observations.py
@@ -3,13 +3,115 @@
 # License: https://github.com/istSOS/istsos3/master/LICENSE.md
 # Version: v3.0.0
 lookups = {
-    "°C":["°C", "celcius", "degree Celsius", "degree-celsius", "degree-celsius", "degree", "degree centigrade", "degcelsius", "degC"],
-    "°F":["°F", "fahrenheit", "degfahrenheit", "degF", "degfahrenheit", "degree-fahrenheit", "degree fahrenheit"],
-    "°K":["°K", "kelvin", "degK", "tempK"],
-    "°R":["°R", "Rankine", "°Ra"],
-    "°De":["°De", "Delisle"],
-    "°N":["°N", "Newton"],
-    "°N":["°N", "Newton"],
+    "°C":["°C", "C", "celcius", "degree Celsius", "degree-celsius", "degree-celsius", "degree", "degree centigrade", "degcelsius", "degC"],
+    "°F":["°F", "F", "fahrenheit", "degfahrenheit", "degF", "degfahrenheit", "degree-fahrenheit", "degree fahrenheit"],
+    "°K":["°K", "K", "kelvin", "degK", "tempK"],
+    "°R":["°R", "R", "Rankine", "°Ra"],
+    "°De":["°De", "De", "Delisle"],
+
+    "mm":["mm", "millimeter", "milli-meter"],
+    "cm":["cm", "centi-meter", "centi", "centimeter"],
+    "m":["m", "meter"],
+    "in":["in", "inch"],
+    "ft":["ft", "feet", "foot"],
+    # "ft":["ft-us", "Newton"],
+    "fathom":["fathom", ],
+    "mi":["mi", "miles", "mile"],
+    "nMi":["nMi"],
+
+    "ns":["ns"],
+    "mu":["mu"],
+    "ms":["ms","millisecond"],
+    "s":["s"],
+    "min":["min"],
+    "h":["h","hour"],
+    "d":["day"],
+    "week":["week"],
+    "month":["month"],
+    "year":["year"],
+
+    "Hz":["Hz"],
+    "mHz":["mHz"],
+    "kHz":["kHz"],
+    "MHz":["MHz"],
+    "GHz":["GHz"],
+    "THz":["THz"],
+    "rpm":["rpm"],
+    "deg/s":["deg/s"],
+    "rad/s":["rad/s"],
+
+    "mm/s":["mm/s", "millimeter/s", "milli-meter/s"],
+    "cm/s":["cm/s", "centi-meter/s", "centi/s", "centimeter/s"],
+    "m/s":["m/s", "meter/s"],
+    "m/h":["m/h", "meter/h"],
+    "in/s":["in/s", "inch/s"],
+    "ft/s":["ft/s", "feet/s", "foot/s"],
+    "mi/h":["mi/h", "miles/h", "mile/h"],
+    "knot":["knot"],
+
+    "mm^2":["mm^2", "mm2", "millimeter-2", "millimeter2", "mm square" ],
+    "cm^2":["cm^2", "cm2", "centimeter-2", "centimeter2", "cm square"],
+    "m^2":["m^2", "m2","meter2", "meter square"],
+    "ha":["ha", "hactare"],
+    "km^2":["km^2", "km2", "kilometer2", "kilometer square"],
+    "in^2":["in^2", "in2", "inch2", "inch^2", "inch-square", "inch square"],
+    "ft^2":["ft^2" , "ft2", "feet2", "feetsquare"],
+    "ac":["ac", "acre"],
+    "mi^2":["mi^2", "miles square", "miles2", "miles^2"],
+
+    "mm^3":["mm^3", "mm3", "millimeter-3", "millimeter3", "mm cube" ],
+    "cm^3":["cm^3", "cm3", "centimeter-3", "centimeter3", "cm cube"],
+    "m^3":["m^3", "m3","meter3", "meter cube"],
+    "km^3":["km^3", "km3", "kilometer3", "kilometer cube"],
+    "in^3":["in^3", "in3", "inch3", "inch^3", "inch-cube", "inch cube"],
+    "ft^3":["ft^3" , "ft3", "feet3", "feetcube"],
+    "mi^3":["mi^3", "miles cube", "miles3", "miles^3"],
+    "ml":["ml", "milliliter"],
+    "l":["l", "liter"],
+    "kl":["kl", "kiloliter"],
+    "tsp":["tsp", "teaspoon"],
+    "in^3":["in^3"],
+    "cup":["cup"],
+    "pnt":["pnt"],
+    "qt":["qt"],
+    "gal":["gal","gallon"],
+    "yd^3":["yd^3","yd3"],
+
+    "mcg":["mcg"],
+    "mg":["mg"],
+    "g":["g"],
+    "kg":["kg"],
+    "oz":["oz"],
+    "lb":["lb"],
+    "mt":["mt"],
+    "t":["t"],
+
+    "mm^3/s":["mm^3/s", "mm3/s", "millimeter-3/s", "millimeter3/s", "mm cube/s" ],
+    "cm^3/s":["cm^3/s", "cm3/s", "centimeter-3/s", "centimeter3/s", "cm cube/s"],
+    "m^3/s":["m^3/s", "m3/s","meter3/s", "meter cube/s"],
+    "ml/s":["ml/s", "milliliter/s"],
+    "kl^3/s":["kl^3/s", "kl3/s", "kiloliter3/s", "kiloliter cube/s"],
+    "kl^3/min":["kl^3/min", "kl3/min", "kiloliter3/min", "kiloliter cube/min"],
+    "kl^3/h":["kl^3/h", "kl3/h", "kiloliter3/h", "kiloliter cube/h"],
+    "km^3/h":["km^3/h", "km3/h", "kilometer3/h", "kilometer cube/h"],
+    "cl/s":["cl/s", "cl/s", "cl/s", "cl/s"],
+    "dl/s":["dl/s"],
+    "l/s":["l/s", "liter/s"],
+    "l/min":["l/min", "liter/min"],
+    "l/h":["l/h", "liter/h"],
+    "ft^3/s":["ft^3/s" , "ft3/s", "feet3/s", "feetcube/s"],
+    "mi^3/s":["mi^3/s", "miles cube/s", "miles3/s", "miles^3/s"],
+    "ml/s":["ml/s", "milliliter/s"],
+    "kl/s":["kl/s", "kiloliter/s"],
+    "tsp/s":["tsp/s", "teaspoon/s"],
+    "in^3/s":["in^3/s"],
+    "cup/s":["cup/s"],
+    "pnt/s":["pnt/s"],
+    "qt/s":["qt/s"],
+    "gal/s":["gal/s","gallon/s"],
+    "gal/min":["gal/min","gallon/min"],
+    "yd^3/s":["yd^3/s","yd3/s"],
+
      }
 
 import asyncio