2.10.3 whl to release

Kate/2.10.2-beta

.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/layers/_init_.py

@@ -189,7 +189,7 @@ def bimVectorLayerToNative(geomList, layerName: str, geomType: str, streamBranch
     layerName = layerName + "_" + geomType
     #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 + "\\" #
@@ -368,7 +368,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

@@ -382,7 +382,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/speckle_arcgis.py

@@ -257,7 +257,7 @@ class Speckle:
 
         msg = arcpy.Parameter(
             displayName="Message",
-            name="message",
+            name="msg",
             datatype="GPString",
             parameterType="Optional",
             direction="Input",
@@ -398,12 +398,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]
@@ -777,9 +777,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")