remove copyright, add AuthID to CRS

specklesystems · Jun 14, 2023 · 453becf · 453becf
1 parent ef97279
commit 453becf
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 82 deletions.
diff --git a/Makefile b/Makefile
@@ -1,22 +1,3 @@
-#/***************************************************************************
-# SpeckleQGIS
-#
-# SpeckleQGIS Description
-#							 -------------------
-#		begin				: 2021-08-04
-#		git sha				: $Format:%H$
-#		copyright			: (C) 2021 by Speckle Systems
-#		email				: [email protected]
-# ***************************************************************************/
-#
-#/***************************************************************************
-# *																		 *
-# *   This program is free software; you can redistribute it and/or modify  *
-# *   it under the terms of the GNU General Public License as published by  *
-# *   the Free Software Foundation; either version 2 of the License, or	 *
-# *   (at your option) any later version.								   *
-# *																		 *
-# ***************************************************************************/
 
 #################################################
 # Edit the following to match your sources lists

diff --git a/__init__.py b/__init__.py
@@ -1,27 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SpeckleQGIS
-                                 A QGIS plugin
- SpeckleQGIS Description
- Generated by Plugin Builder: http://g-sherman.github.io/Qgis-Plugin-Builder/
-                             -------------------
-        begin                : 2021-08-04
-        copyright            : (C) 2021 by Speckle Systems
-        email                : [email protected]
-        git sha              : $Format:%H$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
- This script initializes the plugin, making it known to QGIS.
-"""
 
 import os
 import sys

diff --git a/help/source/conf.py b/help/source/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'SpeckleQGIS'
-copyright = u'2013, Speckle Systems'
+copyright = u'2021, Speckle Systems'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/pb_tool.cfg b/pb_tool.cfg
@@ -1,24 +1,4 @@
-#/***************************************************************************
-# SpeckleQGIS
-#
-# Configuration file for plugin builder tool (pb_tool)
-# Generated by Plugin Builder: http://g-sherman.github.io/Qgis-Plugin-Builder/
-#                            -------------------
-#       begin               : 2021-08-04
-#       copyright           : (C) 2021 by Speckle Systems
-#       email               : [email protected]
-# ***************************************************************************/
-#
-#/***************************************************************************
-# *                                                                         *
-# *   This program is free software; you can redistribute it and/or modify  *
-# *   it under the terms of the GNU General Public License as published by  *
-# *   the Free Software Foundation; either version 2 of the License, or     *
-# *   (at your option) any later version.                                   *
-# *                                                                         *
-# ***************************************************************************/
-# 
-# 
+
 # You can install pb_tool using:
 #  pip install http://geoapt.net/files/pb_tool.zip
 # 

diff --git a/speckle/converter/layers/__init__.py b/speckle/converter/layers/__init__.py
@@ -29,8 +29,7 @@
 from specklepy.objects.GIS.layers import VectorLayer, RasterLayer, Layer
 from speckle.converter.layers.feature import featureToSpeckle, rasterFeatureToSpeckle, featureToNative, cadFeatureToNative, bimFeatureToNative 
 from speckle.converter.layers.utils import colorFromSpeckle, colorFromSpeckle, getElevationLayer, getLayerGeomType, getLayerAttributes, isAppliedLayerTransformByKeywords, tryCreateGroup, trySaveCRS, validateAttributeName
-from speckle.utils.panel_logging import logger
-from speckle.converter.geometry.mesh import constructMesh, writeMeshToShp
+from speckle.converter.geometry.mesh import writeMeshToShp
 
 from speckle.converter.layers.symbology import vectorRendererToNative, rasterRendererToNative, rendererToSpeckle
 
@@ -177,8 +176,8 @@ def layerToSpeckle(selectedLayer: Union[QgsVectorLayer, QgsRasterLayer], project
 
         # Convert CRS to speckle, use the projectCRS
         print(projectCRS.toWkt())
-        speckleReprojectedCrs = CRS(name=projectCRS.authid(), wkt=projectCRS.toWkt(), units=units_proj) 
-        layerCRS = CRS(name=crs.authid(), wkt=crs.toWkt(), units=units_layer, units_native = units_layer_native) 
+        speckleReprojectedCrs = CRS(authority_id=projectCRS.authid(), name=str(projectCRS.description()), wkt=projectCRS.toWkt(), units=units_proj) 
+        layerCRS = CRS(authority_id=crs.authid(), name=str(crs.description()), wkt=crs.toWkt(), units=units_layer, units_native = units_layer_native) 
 
         renderer = selectedLayer.renderer()
         layerRenderer = rendererToSpeckle(renderer) 

diff --git a/speckle_qgis.py b/speckle_qgis.py
@@ -1,18 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SpeckleQGIS
-                                 A QGIS plugin
- SpeckleQGIS Description
- Generated by Plugin Builder: https://g-sherman.github.io/Qgis-Plugin-Builder/
-                              -------------------
-        begin                : 2021-08-04
-        git sha              : $Format:%H$
-        copyright            : (C) 2021 by Speckle Systems
-        email                : [email protected]
- ***************************************************************************/
-"""
-
 
 import inspect
 import os.path