Update app.py

app.py

@@ -67,12 +67,9 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
 
 
     # get speckle data 
-            # get stream
     stream = getSpeckleStream(STREAM_ID,
                             SOURCE_BRANCH,
                             CLIENT,
-                            commit_id = "")
-    time.sleep(2)
     # navigate to list with speckle objects of interest
     try:
       stream_data = stream["@Data"]["@{0}"]
@@ -84,8 +81,29 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
         print("check on speckle.com how to access the data")
     
 
-    # ======== assamble new stream data ============
+    # -----
+    streamTrg = getSpeckleStream(STREAM_ID,
+                            TARGET_BRANCH,
+                            CLIENT,
+    # navigate to list with speckle objects of interest
+    try:
+      stream_dataTrg = streamTrg["@Data"]["@{0}"]
+    except:
+       print("something went wrong, try again with non-capital d")
+    try:
+     stream_dataTrg = streamTrg["@data"]["@{0}"]
+    except:
+        print("check on speckle.com how to access the data")
 
+    #-----
+    idMapper = {}
+    for i, obj in enumerate(stream_dataTrg):
+        objDict = obj.__dict__
+        curUUid= objDict[UUID_COL]
+        idMapper[curUUid] = i
+    # ======== assamble new stream data ============
+    
+    
     streamData_new = []
     log = {"removedDatapoints":0,"removedID":[], "avg_attrRemoved":0, "removedAttr":[]}
     for i, obj in enumerate(stream_data):
@@ -93,9 +111,11 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
         # REMOVE DATA POINTS ==============================
         # COND A: no landuses at all.
         pass_flag = True
-
+       
         # REMOVE ATTRIBUTES ===============================
         datanew = Base()
+
+        
         for k, v in objDict.items():
             if k in attributesOfInterest:
                 datanew[k] = v
@@ -104,8 +124,11 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
                 log["removedAttr"].append(k)
         
         datanew["dataset"] = DATASET_NAME
-            
-            
+
+        # keep geometry from target branch
+        curUUid = objDict[UUID_COL]
+        targetGeoRow = idMapper[curUUid]
+        datanew["@geometry"] = stream_dataTrg[targetGeoRow].__dict__["@geometry"]
         streamData_new.append(datanew)
 
     log["avg_attrRemoved"] = log["avg_attrRemoved"]/len(stream_data)
@@ -127,6 +150,7 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
     
     # Send the data object to the speckle stream
     object_id = operations.send(stream_new, [transport])
+    
     time.sleep(1)
     # Create a new commit with the new object
     commit_id = CLIENT.commit.create(