New lla2ecef and moved plot_rinex to Utils

Also, pyETM now prints the node name and a timestamp to the json file

Author: demiangomez

.idea/Parallel.GAMIT.iml

@@ -27,7 +27,7 @@
 # app
 from pgamit import dbConnection, pyDate, pyJobServer, pyOptions, pyStationInfo
 from pgamit.pyGamitConfig import GamitConfiguration
-from pgamit.Utils import process_stnlist, stationID
+from pgamit.Utils import process_stnlist, stationID, plot_rinex_completion
 
 global kml, folder_project, folder_allstns, stnlist
 
@@ -121,9 +121,7 @@ def description_content(stn, DateS, DateE, count, completion, stn_issues,
             <strong>Observation distribution:</strong><br>
             </p>
             <img src="data:image/png;base64, %s" alt="Available data" />
-                        """ % plot_rinex(cnn,
-                                         stn['NetworkCode'],
-                                         stn['StationCode'])
+                        """ % plot_rinex_completion(cnn, stn['NetworkCode'], stn['StationCode'])
     else:
         data_plt = ""
 
@@ -248,7 +246,7 @@ def generate_kml_stninfo(JobServer, cnn, project, data=False,
     pbar = tqdm(
         desc=' >> Adding stations', total=len(rs), ncols=80, disable=None)
 
-    depfuncs = (plot_station_info_rinex, plot_rinex, stationID)
+    depfuncs = (plot_station_info_rinex, plot_rinex_completion, stationID)
 
     JobServer.create_cluster(description_content,
                              depfuncs,
@@ -485,7 +483,7 @@ def generate_kml(cnn, project, data=False):
 <strong>Observation distribution:</strong><br>
 </p>
 <img src="data:image/png;base64, %s" alt="Available data" />
-            """ % plot_rinex(cnn, stn['NetworkCode'], stn['StationCode'])
+            """ % plot_rinex_completion(cnn, stn['NetworkCode'], stn['StationCode'])
         else:
             data_plt = ""
 
@@ -576,64 +574,5 @@ def plot_station_info_rinex(cnn, NetworkCode, StationCode, stninfo_records):
     return figdata_png
 
 
-def plot_rinex(cnn, NetworkCode, StationCode):
-
-    import matplotlib.pyplot as plt
-
-    # find the available data
-    rinex = numpy.array(cnn.query_float("""
-    SELECT "ObservationYear", "ObservationDOY",
-    "Completion" FROM rinex_proc WHERE
-    "NetworkCode" = '%s' AND "StationCode" = '%s'""" % (NetworkCode,
-                                                        StationCode)))
-
-    fig, ax = plt.subplots(figsize=(10, 25))
-
-    fig.tight_layout(pad=5)
-    ax.set_title('RINEX and missing data for %s.%s'
-                 % (NetworkCode, StationCode))
-
-    if rinex.size:
-        # create a continuous vector for missing data
-        md = numpy.arange(1, 367)
-        my = numpy.unique(rinex[:, 0])
-        for yr in my:
-            ax.plot(numpy.repeat(yr, 366), md, 'o', fillstyle='none',
-                    color='silver', markersize=4, linewidth=0.1)
-
-        ax.scatter(rinex[:, 0], rinex[:, 1],
-                   c=['tab:blue' if c >= 0.5 else 'tab:orange'
-                      for c in rinex[:, 2]], s=10, zorder=10)
-
-        ax.tick_params(top=True, labeltop=True, labelleft=True,
-                       labelright=True, left=True, right=True)
-        plt.xticks(numpy.arange(my.min(), my.max()+1, step=1),
-                   rotation='vertical')  # Set label locations.
-
-    ax.grid(True)
-    ax.set_axisbelow(True)
-    plt.ylim([0, 367])
-    plt.yticks(numpy.arange(0, 368, step=5))  # Set label locations.
-
-    ax.set_ylabel('DOYs')
-    ax.set_xlabel('Years')
-
-    figfile = io.BytesIO()
-
-    try:
-        plt.savefig(figfile, format='png')
-        # plt.show()
-        figfile.seek(0)  # rewind to beginning of file
-
-        figdata_png = base64.b64encode(figfile.getvalue()).decode()
-    except Exception:
-        # either no rinex or no station info
-        figdata_png = ''
-
-    plt.close()
-
-    return figdata_png
-
-
 if __name__ == '__main__':
     main()

.idea/misc.xml

@@ -7,6 +7,8 @@
 import argparse
 import stat
 import shutil
+import io
+import base64
 from datetime import datetime
 from zlib import crc32 as zlib_crc32
 from pathlib import Path
@@ -420,6 +422,35 @@ def ecef2lla(ecefArr):
     return lat.ravel(), lon.ravel(), alt.ravel()
 
 
+def lla2ecef(llaArr):
+    # convert LLA coordinates to ECEF
+    # test data : test_coord = [-66.8765400174 23.876539914 999.998386689]
+    # expected result : 2297292.91, 1016894.94, -5843939.62
+
+    llaArr = numpy.atleast_1d(llaArr)
+
+    # transpose to work on both vectors and scalars
+    lat = llaArr.T[0]
+    lon = llaArr.T[1]
+    alt = llaArr.T[2]
+
+    rad_lat = lat * (numpy.pi / 180.0)
+    rad_lon = lon * (numpy.pi / 180.0)
+
+    # WGS84
+    a = 6378137.0
+    finv = 298.257223563
+    f = 1 / finv
+    e2 = 1 - (1 - f) * (1 - f)
+    v = a / numpy.sqrt(1 - e2 * numpy.sin(rad_lat) * numpy.sin(rad_lat))
+
+    x = (v + alt) * numpy.cos(rad_lat) * numpy.cos(rad_lon)
+    y = (v + alt) * numpy.cos(rad_lat) * numpy.sin(rad_lon)
+    z = (v * (1 - e2) + alt) * numpy.sin(rad_lat)
+
+    return numpy.round(x, 4).ravel(), numpy.round(y, 4).ravel(), numpy.round(z, 4).ravel()
+
+
 def process_date_str(arg, allow_days=False):
 
     rdate = pyDate.Date(datetime=datetime.now())
@@ -915,4 +946,86 @@ def fqdn_parse(fqdn, default_port=None):
         fqdn, port = fqdn.split(':')
         return fqdn, int(port[1])
     else:
-        return fqdn, default_port
+        return fqdn, default_port
+
+
+def plot_rinex_completion(cnn, NetworkCode, StationCode, landscape=False):
+
+    import matplotlib.pyplot as plt
+
+    # find the available data
+    rinex = numpy.array(cnn.query_float("""
+    SELECT "ObservationYear", "ObservationDOY",
+    "Completion" FROM rinex_proc WHERE
+    "NetworkCode" = '%s' AND "StationCode" = '%s'""" % (NetworkCode,
+                                                        StationCode)))
+
+    if landscape:
+        fig, ax = plt.subplots(figsize=(25, 10))
+        x = 1
+        y = 0
+    else:
+        fig, ax = plt.subplots(figsize=(10, 25))
+        x = 0
+        y = 1
+
+    fig.tight_layout(pad=5)
+    ax.set_title('RINEX and missing data for %s.%s'
+                 % (NetworkCode, StationCode))
+
+    if rinex.size:
+        # create a continuous vector for missing data
+        md = numpy.arange(1, 367)
+        my = numpy.unique(rinex[:, 0])
+        for yr in my:
+
+            if landscape:
+                ax.plot(md, numpy.repeat(yr, 366), 'o', fillstyle='none',
+                        color='silver', markersize=4, linewidth=0.1)
+            else:
+                ax.plot(numpy.repeat(yr, 366), md, 'o', fillstyle='none',
+                        color='silver', markersize=4, linewidth=0.1)
+
+        ax.scatter(rinex[:, x], rinex[:, y],
+                   c=['tab:blue' if c >= 0.5 else 'tab:orange'
+                      for c in rinex[:, 2]], s=10, zorder=10)
+
+        ax.tick_params(top=True, labeltop=True, labelleft=True,
+                       labelright=True, left=True, right=True)
+        if landscape:
+            plt.yticks(numpy.arange(my.min(), my.max() + 1, step=1))  # Set label locations.
+        else:
+            plt.xticks(numpy.arange(my.min(), my.max()+1, step=1),
+                       rotation='vertical')  # Set label locations.
+
+    ax.grid(True)
+    ax.set_axisbelow(True)
+
+    if landscape:
+        plt.xlim([0, 367])
+        plt.xticks(numpy.arange(0, 368, step=5))  # Set label locations.
+
+        ax.set_xlabel('DOYs')
+        ax.set_ylabel('Years')
+    else:
+        plt.ylim([0, 367])
+        plt.yticks(numpy.arange(0, 368, step=5))  # Set label locations.
+
+        ax.set_ylabel('DOYs')
+        ax.set_xlabel('Years')
+
+    figfile = io.BytesIO()
+
+    try:
+        plt.savefig(figfile, format='png')
+        # plt.show()
+        figfile.seek(0)  # rewind to beginning of file
+
+        figdata_png = base64.b64encode(figfile.getvalue()).decode()
+    except Exception:
+        # either no rinex or no station info
+        figdata_png = ''
+
+    plt.close()
+
+    return figdata_png

com/GenerateKml.py

@@ -17,6 +17,7 @@
 import logging
 from logging import INFO, ERROR, WARNING, DEBUG, StreamHandler, Formatter
 import copy
+import platform
 
 from importlib.metadata import version, PackageNotFoundError
 
@@ -859,8 +860,8 @@ def detect_jumps(self, soln):
         N_data = np.column_stack((time_scaled, l[0]))
 
         # Apply DBSCAN clustering with tuned parameters
-        eps_value = 0.0028     # Adjust as needed to detect prominent clusters
-        min_samples_value = 15 # value from tests
+        eps_value = 0.0028      # Adjust as needed to detect prominent clusters
+        min_samples_value = 15  # value from tests
 
         dbscan = DBSCAN(eps=eps_value, min_samples=min_samples_value)
         e_cluster_labels = dbscan.fit_predict(E_data)
@@ -2749,7 +2750,10 @@ def todictionary(self, time_series=False, model=False):
             'ce_y': self.ce_pos[1][0],
             'ce_z': self.ce_pos[2][0],
             't_ref': self.Linear.p.t_ref if self.A is not None else 0.0,
-            'Jumps': [to_list(jump.p.toDict()) for jump in self.Jumps.table]
+            'Jumps': [to_list(jump.p.toDict()) for jump in self.Jumps.table],
+            'timestamp': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+            'localhost': platform.node(),
+            'version': VERSION
         }
 
         if self.A is not None: