Updates based on review -- add alt_x / y to udate the model and add an alembic upgrade path, update the add_node function to accept the new coordinates.

Author: sknoxnexsys

hydra_base/db/alembic/versions/b7f3e1a92c44_node_alt_coords.py

@@ -0,0 +1,37 @@
+"""node_alt_coords
+
+Revision ID: b7f3e1a92c44
+Revises: a1b2c3d4e5f6
+Create Date: 2026-07-09 00:00:00.000000
+
+"""
+import logging
+from alembic import op
+import sqlalchemy as sa
+
+log = logging.getLogger(__name__)
+
+# revision identifiers, used by Alembic.
+revision = 'b7f3e1a92c44'
+down_revision = 'a1b2c3d4e5f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    for column in ('alt_x', 'alt_y'):
+        try:
+            op.add_column(
+                'tNode',
+                sa.Column(column, sa.Float(precision=10, asdecimal=True))
+            )
+        except Exception as e:
+            log.warning("Could not add %s to tNode: %s", column, e)
+
+
+def downgrade():
+    for column in ('alt_x', 'alt_y'):
+        try:
+            op.drop_column('tNode', column)
+        except Exception as e:
+            log.warning("Could not drop %s from tNode: %s", column, e)

hydra_base/db/model/network/network.py

@@ -113,7 +113,7 @@ def add_link(self, name, desc, layout, node_1, node_2):
         return l
 
 
-    def add_node(self, name, desc, layout, node_x, node_y):
+    def add_node(self, name, desc, layout, node_x, node_y, node_alt_x=None, node_alt_y=None):
         """
             Add a node to a network.
         """
@@ -127,6 +127,8 @@ def add_node(self, name, desc, layout, node_x, node_y):
         node.layout      = str(layout) if layout is not None else None
         node.x           = node_x
         node.y           = node_y
+        node.alt_x       = node_alt_x
+        node.alt_y       = node_alt_y
 
         #Do not call save here because it is likely that we may want
         #to bulk insert nodes, not one at a time.

hydra_base/db/model/network/node.py

@@ -39,6 +39,8 @@ class Node(Base, Inspect, Resource):
     status = Column(String(1),  nullable=False, server_default=text(u"'A'"))
     x = Column(Float(precision=10, asdecimal=True))
     y = Column(Float(precision=10, asdecimal=True))
+    alt_x = Column(Float(precision=10, asdecimal=True))
+    alt_y = Column(Float(precision=10, asdecimal=True))
     layout  = Column(Text().with_variant(mysql.LONGTEXT, 'mysql'),  nullable=True)
     cr_date = Column(TIMESTAMP(),  nullable=False, server_default=text(u'CURRENT_TIMESTAMP'))
 

hydra_base/lib/network.py

@@ -1735,19 +1735,19 @@ def get_network_extents(network_id,**kwargs):
         # Default y extent if all None values
         y_min, y_max = 0, 1
 
-    # Compute min/max extent of the network.
-    lat = [r.alt_x for r in rs if r.alt_x is not None]
-    if len(lat) > 0:
-        min_alt_x = min(lat)
-        max_alt_x = max(lat)
+    # Compute min/max extent of the network in the alternate coordinate system.
+    alt_x = [r.alt_x for r in rs if r.alt_x is not None]
+    if len(alt_x) > 0:
+        min_alt_x = min(alt_x)
+        max_alt_x = max(alt_x)
     else:
         # Default x extent if all None values
         min_alt_x, max_alt_x = 0, 1
 
-    lon = [r.alt_y for r in rs if r.alt_y is not None]
-    if len(lon) > 0:
-        min_alt_y = min(lon)
-        max_alt_y = max(lon)
+    alt_y = [r.alt_y for r in rs if r.alt_y is not None]
+    if len(alt_y) > 0:
+        min_alt_y = min(alt_y)
+        max_alt_y = max(alt_y)
     else:
         # Default y extent if all None values
         min_alt_y, max_alt_y = 0, 1

hydra_base/util/testing.py

@@ -334,8 +334,6 @@ def create_node(self, node_id, attributes=None, node_name="Test Node Name"):
             'layout'      : None,
             'x' : 10 * coord,
             'y' : 10 * coord -1,
-            #alt_ coordinates are not necessary. 
-            # they can be used for alternative coordinate systems
             'alt_x' : 100 * coord,
             'alt_y' : 100 * coord -1,
             'attributes' : attributes,