Merge pull request #33 from specklesystems/kate/2.11

Kate/2.10.4

.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
             echo $semver
             python patch_version.py $semver
             python setup.py sdist bdist_wheel
-            Copy-Item -Path "\\dist\*" -Destination "\\speckle_arcgis_installer" -Recurse
+            Copy-Item -Path "dist\speckle_toolbox-$($ver)-py3-none-any.whl" -Destination "speckle_arcgis_installer"
             speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss
       - when:
           condition: << parameters.installer >>

setup.py

@@ -16,6 +16,8 @@ def read(fname):
 setup(name='speckle_toolbox', 
       author='SpeckleSystems',
 			version="2.9.4",
+      author_email="connectors@speckle.systems",
+      url="https://speckle.systems/",
       description=("Example for extending geoprocessing through Python modules"),
       long_description=read('Readme.md'),
       python_requires='~=3.3',

speckle_toolbox/esri/toolboxes/speckle/converter/geometry/mesh.py

@@ -16,12 +16,28 @@ def meshToNative(meshes: List[Mesh], path: str):
     w.field('speckleTyp', 'C')
 
     shapes = []
-    for mesh_full in meshes:
-        #print(mesh_full)
-        #print(mesh_full.get_dynamic_member_names())
-        mesh = mesh_full.displayMesh
-        #print(mesh)
-        w = fill_mesh_parts(w, mesh)
+    for geom in meshes:
+        
+        try: 
+            if geom.displayValue and isinstance(geom.displayValue, Mesh): 
+                mesh = geom.displayValue
+                w = fill_mesh_parts(w, mesh)
+            elif geom.displayValue and isinstance(geom.displayValue, List): 
+                for part in geom.displayValue:
+                    if isinstance(part, Mesh): 
+                        mesh = part
+                        w = fill_mesh_parts(w, mesh)
+        except: 
+            try: 
+                if geom.displayMesh and isinstance(geom.displayMesh, Mesh): 
+                    mesh = geom.displayMesh
+                    w = fill_mesh_parts(w, mesh)
+                elif geom.displayMesh and isinstance(geom.displayMesh, List): 
+                    for part in geom.displayMesh:
+                        if isinstance(part, Mesh): 
+                            mesh = part
+                            w = fill_mesh_parts(w, mesh)
+            except: pass
     w.close()
     return path
 
@@ -33,7 +49,7 @@ def fill_mesh_parts(w: shapefile.Writer, mesh: Mesh):
     count = 0 # sequence of vertex (not of flat coord list) 
     try:
         #print(len(mesh.faces))
-        if len(mesh.faces) % 4 == 0 and mesh.faces[0] == 0:
+        if len(mesh.faces) % 4 == 0 and (mesh.faces[0] == 0 or mesh.faces[0] == 3):
             for f in mesh.faces:
                 try:
                     if mesh.faces[count] == 0 or mesh.faces[count] == 3: # only handle triangles

speckle_toolbox/esri/toolboxes/speckle/converter/layers/_init_.py

@@ -171,9 +171,12 @@ def bimLayerToNative(layerContentList: List[Base], layerName: str, streamBranch:
     layer_meshes = None
     #filter speckle objects by type within each layer, create sub-layer for each type (points, lines, polygons, mesh?)
     for geom in layerContentList:
-        #print(geom)
-        if geom.displayMesh and isinstance(geom.displayMesh, Mesh): 
-            geom_meshes.append(geom)
+        try: 
+            if geom.displayMesh: geom_meshes.append(geom)
+        except:
+            try: 
+                if geom.displayValue: geom_meshes.append(geom)
+            except: pass
 
     if len(geom_meshes)>0: layer_meshes = bimVectorLayerToNative(geom_meshes, layerName, "Mesh", streamBranch, project)
 
@@ -184,19 +187,22 @@ def bimVectorLayerToNative(geomList, layerName: str, geomType: str, streamBranch
     # no support for mltipatches, maybe in 3.1: https://community.esri.com/t5/arcgis-pro-ideas/better-support-for-multipatches-in-arcpy/idi-p/953614/page/2#comments
     print("02_________BIM vector layer to native_____")
     #get Project CRS, use it by default for the new received layer
+    
     vl = None
-    layerName = layerName.replace("[","_").replace("]","_").replace(" ","_").replace("-","_").replace("(","_").replace(")","_").replace(":","_").replace("\\","_").replace("/","_").replace("\"","_").replace("&","_").replace("@","_").replace("$","_").replace("%","_").replace("^","_")
     layerName = layerName + "_" + geomType
+    layerName = layerName.replace("[","_").replace("]","_").replace(" ","_").replace("-","_").replace("(","_").replace(")","_").replace(":","_").replace("\\","_").replace("/","_").replace("\"","_").replace("&","_").replace("@","_").replace("$","_").replace("%","_").replace("^","_")
     #if not "__Structural_Foundations_Mesh" in layerName: return None
     
-    sr = arcpy.SpatialReference(project.activeMap.spatialReference.name)
+    sr = arcpy.SpatialReference(text = project.activeMap.spatialReference.exportToString())
     active_map = project.activeMap
+    
     path = project.filePath.replace("aprx","gdb") #
     path_bim = "\\".join(project.filePath.split("\\")[:-1]) + "\\BIM_layers_speckle\\" + streamBranch+ "\\" + layerName + "\\" #arcpy.env.workspace + "\\" #
     print(path_bim)
+    
     if not os.path.exists(path_bim): os.makedirs(path_bim)
     print(path)
-
+    
     if sr.type == "Geographic": 
         arcpy.AddMessage(f"Project CRS is set to Geographic type, and objects in linear units might not be received correctly")
 
@@ -368,7 +374,7 @@ def cadVectorLayerToNative(geomList, layerName: str, geomType: str, streamBranch
     layerName = layerName.replace("[","_").replace("]","_").replace(" ","_").replace("-","_").replace("(","_").replace(")","_").replace(":","_").replace("\\","_").replace("/","_").replace("\"","_").replace("&","_").replace("@","_").replace("$","_").replace("%","_").replace("^","_")
     layerName = layerName + "_" + geomType
     
-    sr = arcpy.SpatialReference(project.activeMap.spatialReference.name)
+    sr = arcpy.SpatialReference(text = project.activeMap.spatialReference.exportToString())
     active_map = project.activeMap
     path = project.filePath.replace("aprx","gdb") #"\\".join(project.filePath.split("\\")[:-1]) + "\\speckle_layers\\" #arcpy.env.workspace + "\\" #
     

speckle_toolbox/esri/toolboxes/speckle/converter/layers/feature.py

@@ -133,6 +133,14 @@ def cadFeatureToNative(feature: Base, fields: dict, sr: arcpy.SpatialReference):
     feat_updated = updateFeat(feat, fields, feature)
     return feat_updated
 
+def addFeatVariant(key, variant, value, f):
+    
+    feat = f
+    if variant == "TEXT": value = str(value) 
+    if variant == getVariantFromValue(value) and value != "NULL" and value != "None": feat.update({key: value})   
+    elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
+    return feat 
+
 def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
     
     for key, variant in fields.items(): 
@@ -142,17 +150,11 @@ def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
                 if key != "parameters": print(value)
                 feat[key] = value 
 
-                if variant == "TEXT": value = str(value) 
-                if variant == getVariantFromValue(value) and value != "NULL" and value != "None": feat.update({key: value})   
-                elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
-
+                feat = addFeatVariant(key, variant, value, feat)
             else:
                 try: 
                     value = feature[key] 
-                    if variant == "TEXT": value = str(value) 
-                    if variant == getVariantFromValue(value) and value != "NULL" and value != "None": feat.update({key: value})   
-                    elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
-
+                    feat = addFeatVariant(key, variant, value, feat)
                 except:
                     value = None
                     rootName = key.split("_")[0]
@@ -165,9 +167,7 @@ def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
                                 for i, (key,value) in enumerate(newVals.items()):
                                     for k, (x,y) in enumerate(newF.items()):
                                         if key == x: variant = y; break
-                                    if variant == "TEXT": value = str(value) 
-                                    if variant == getVariantFromValue(value) and value != "NULL" and value != "None": feat.update({key: value})   
-                                    elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
+                                    feat = addFeatVariant(key, variant, value, feat)
                             except Exception as e: print(e)
                     #except: # if not a list
                     else:
@@ -176,10 +176,7 @@ def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
                             for i, (key,value) in enumerate(newVals.items()):
                                 for k, (x,y) in enumerate(newF.items()):
                                     if key == x: variant = y; break
-                                #print(variant)
-                                if variant == "TEXT": value = str(value) 
-                                if variant == getVariantFromValue(value) and value != "NULL" and value != "None": feat.update({key: value})   
-                                elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
+                                feat = addFeatVariant(key, variant, value, feat)
                         except Exception as e: feat.update({key: None})
         except Exception as e: 
             feat.update({key: None})
@@ -382,7 +379,7 @@ def rasterFeatureToSpeckle(selectedLayer: arcLayer, projectCRS: arcpy.SpatialRef
             pt3 = arcpy.PointGeometry(arcpy.Point(extent.XMin+(h+1)*rasterResXY[0], extent.YMax-(v+1)*rasterResXY[1]), my_raster.spatialReference, has_z = True)
             pt4 = arcpy.PointGeometry(arcpy.Point(extent.XMin+(h+1)*rasterResXY[0], extent.YMax-v*rasterResXY[1]), my_raster.spatialReference, has_z = True)
             # first, get point coordinates with correct position and resolution, then reproject each:
-            if my_raster.spatialReference.name != projectCRS.name:
+            if my_raster.spatialReference.exportToString() != projectCRS.exportToString():
                 pt1 = findTransformation(pt1, "Point", my_raster.spatialReference, projectCRS, selectedLayer)
                 pt2 = findTransformation(pt2, "Point", my_raster.spatialReference, projectCRS, selectedLayer)
                 pt3 = findTransformation(pt3, "Point", my_raster.spatialReference, projectCRS, selectedLayer)

speckle_toolbox/esri/toolboxes/speckle/converter/layers/utils.py

@@ -6,7 +6,7 @@ import arcpy
 from arcpy._mp import ArcGISProject, Map, Layer as arcLayer
 import os
 
-ATTRS_REMOVE = ['geometry','applicationId','bbox','displayStyle', 'id', 'renderMaterial', 'displayMesh'] 
+ATTRS_REMOVE = ['geometry','applicationId','bbox','displayStyle', 'id', 'renderMaterial', 'displayMesh', 'displayValue'] 
 
 def getVariantFromValue(value: Any) -> Union[str, None]:
     #print("_________get variant from value_______")

speckle_toolbox/esri/toolboxes/speckle/speckle_arcgis.py

@@ -144,7 +144,11 @@ class Speckle:
             category=cat1
             )
         streamsDefalut.filter.type = 'ValueList'
-        streamsDefalut.filter.list = [ (st.name + " - " + st.id) for st in self.speckleInputs.streams_default ]
+        if isinstance(self.speckleInputs.streams_default, SpeckleException):
+            arcpy.AddError("Speckle account not accessible")
+            streamsDefalut.filter.list = []
+        else:
+            streamsDefalut.filter.list = [ (st.name + " - " + st.id) for st in self.speckleInputs.streams_default ]
 
         addDefStreams = arcpy.Parameter(
             displayName="Add",
@@ -257,7 +261,7 @@ class Speckle:
 
         msg = arcpy.Parameter(
             displayName="Message",
-            name="message",
+            name="msg",
             datatype="GPString",
             parameterType="Optional",
             direction="Input",
@@ -398,12 +402,12 @@ class Speckle:
                 for p in parameters:
                     if p.name == "lat" and p.valueAsText is not None:
                         # add value from the UI to saved lat
-                        lat = p.valueAsText[:].replace(",","").replace(" ","").replace(";","").replace("-","").replace("_","")
+                        lat = p.valueAsText[:].replace(",","").replace(" ","").replace(";","").replace("_","")
                         try: lat = float(lat)
                         except: lat = 0; p.value = "0.0"
                     if p.name == "lon" and p.valueAsText is not None:
                         # add value from the UI to saved lat
-                        lon = p.valueAsText[:].replace(",","").replace(" ","").replace(";","").replace("-","").replace("_","")
+                        lon = p.valueAsText[:].replace(",","").replace(" ","").replace(";","").replace("_","")
                         try: lon = float(lon)
                         except: lon = 0; p.value = "0.0"
                     coords = [lat, lon]
@@ -692,6 +696,8 @@ class Speckle:
 
             # Clear 'latest' group
             streamBranch = streamId + "_" + self.toolboxInputs.active_branch.name + "_" + str(commit.id)
+            streamBranch = streamBranch.replace("[","_").replace("]","_").replace(" ","_").replace("-","_").replace("(","_").replace(")","_").replace(":","_").replace("\\","_").replace("/","_").replace("\"","_").replace("&","_").replace("@","_").replace("$","_").replace("%","_").replace("^","_")
+    
             newGroupName = f'{streamBranch}'
             
             groupExists = 0
@@ -750,6 +756,8 @@ class Speckle:
                     except: pass
 
             def loopVal(value: Any, name: str): # "name" is the parent object/property/layer name
+                if name.endswith('/displayValue'): return 
+                
                 if isinstance(value, Base): 
                     try: # dont go through parts of Speckle Geometry object
                         print("objects to loop through: " + value.speckle_type)
@@ -769,7 +777,7 @@ class Speckle:
                             if pl is not None: print("Layer group created: " + pl.name())
                             break
                         
-                        if item.speckle_type and "Revit" in item.speckle_type and item.speckle_type.startswith("Objects.BuiltElements."): 
+                        if item.speckle_type and item.speckle_type.startswith("Objects.BuiltElements."): #  and "Revit" in item.speckle_type
 
                             msh_bool = bimLayerToNative(value, name, streamBranch, self.speckleInputs.project)
                             #if msh is not None: print("Layer group created: " + msh.name())
@@ -777,9 +785,11 @@ class Speckle:
                 
             traverseObject(commitObj, callback, check)
       
-        except SpeckleException as e:
-            print("Receive failed")
+        except (SpeckleException, GraphQLException) as e:
+            print("Receive failed: " + str(e))
+            arcpy.AddError("Receive failed: " + str(e))
             return
+        
         print("received")
         #self.updateParameters(parameters, True)
         #self.refresh(parameters)

speckle_toolbox/esri/toolboxes/speckle/ui/project_vars.py

@@ -253,15 +253,21 @@ class toolboxInputsClass:
         newCrsString = "+proj=tmerc +ellps=WGS84 +datum=WGS84 +units=m +no_defs +lon_0=" + str(self.lon) + " lat_0=" + str(self.lat) + " +x_0=0 +y_0=0 +k_0=1"
         newCrs = osr.SpatialReference()
         newCrs.ImportFromProj4(newCrsString)
-        print(newCrs.ExportToWkt())
+        newCrs.MorphToESRI() # converts the WKT to an ESRI-compatible format
+        
 
         validate = True if len(newCrs.ExportToWkt())>10 else False
 
         if validate: 
             newProjSR = arcpy.SpatialReference()
             newProjSR.loadFromString(newCrs.ExportToWkt())
+
+            #source = osr.SpatialReference() 
+            #source.ImportFromWkt(self.project.activeMap.spatialReference.exportToString())
+            #transform = osr.CoordinateTransformation(source, newCrs)
+
             self.project.activeMap.spatialReference =  newProjSR
-            arcpy.AddWarning("Custom project CRS successfully applied")
+            arcpy.AddMessage("Custom project CRS successfully applied")
         else:
             arcpy.AddWarning("Custom CRS could not be created")