Fix metar2glm

docs/Utilities/Metar2glm.md

@@ -0,0 +1,41 @@
+[[/Utilities/Metar2glm]] - METAR to GLM realtime weather
+
+# Synopsis
+
+Shell:
+
+~~~
+    $ gridlabd python -m metar2glm -m metar2glm [--index|STATION ...] [-c|-class CLASSNAME]
+~~~
+
+GLM:
+
+~~~
+    #python -m metar2glm -m metar2glm [--index|STATION ...] [-c|-class CLASSNAME]
+~~~
+
+Options:
+
+-  `-h|--help|help`:         Get this help information (exits with code 0)
+
+-  `-c|--class CLASSNAME`:   Name the GLM class to use for the weather data class
+
+-  `--index`:                Output a list of valid METAR stations  
+
+# Description
+
+The `metar2glm` tool creates an object that represents the realtime weather at the specifies weather stations.
+
+# Example
+
+The following outputs the realtime weather for San Francisco airport.
+
+~~~
+$ gridlabd python -m metar2glm KSFO
+~~~
+
+# See also
+
+* [https://github.com/python-metar/python-metar]
+* [https://www.ucar.edu]
+

tools/metar2glm.py

@@ -9,7 +9,8 @@
 
 station_list = []
 station_data = ucar_weather.stations()
-syntax = "python3 -m metar2glm [--index|STATION ...]"
+syntax = "python3 -m metar2glm [--index|STATION ...] [-c|-class CLASSNAME]"
+classname = "weather"
 
 n = 1
 while n < len(sys.argv):
@@ -19,6 +20,9 @@
 	elif sys.argv[n] in ["--index"]:
 		print("\n".join(station_data.keys()))
 		exit(0)
+	elif sys.argv[n] in ["-c","--class"]:
+		classname = sys.argv[n+1]
+		n = n+1
 	else:
 		station_list.append(sys.argv[n])
 	n += 1
@@ -34,9 +38,9 @@
 	"deg" : "deg",
 }
 print(f"// generated by metar2glm.py on {datetime.datetime.utcnow().isoformat()}Z")
-print("""
-class weather
-{
+print(f"""
+class {classname}
+{{
 	char8 country;
 	char8 region;
 	char32 station;
@@ -50,14 +54,13 @@ class weather
 	double pressure[mbar];
 	char256 clouds;
 	char1024 metar;
-	on_init "python:metar_weather.weather_init";
-}
+}}
 """)
 for station in station_list:
 	if not station in station_data.keys():
 		raise Exception(f"station '{station}' not found in metar index")
 	weather = ucar_weather.get(station)
-	print("object weather")
+	print(f"object {classname}")
 	print("{")
 	for attr,data in station_data[station].items():
 		print(f"    {attr} \"{data}\";");

tools/ucar_weather.py

@@ -36,8 +36,17 @@ def get(station):
 			raise Exception("request error (no observation)")
 		else:
 			raise Exception(r"request error (no observation),, query='{query}',' response='{r.text}'")
-	result = obs.to_dict()
-	result["metar"] = data
+	result = {
+		"station" : station,
+		"temperature" : f"{obs.temp.value()} degC",
+		"dew_point" : f"{obs.dewpt.value()} degC",
+		"wind_speed" : f"{obs.wind_speed.value()} knot",
+		"wind_dir" : f"{obs.wind_dir.value()} deg",
+		"visibility" : f"{obs.vis.value()} mile",
+		"pressure" : f"{obs.press.value()} inH2O",
+		"clouds" : obs.sky_conditions(),
+	}
+	result["metar"] = data.replace("\n"," ")
 	return result
 
 def stations():