Align master with develop (#73)

* First iteration for porting to QGIS3 (#67)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Fix database startup scripts (#70)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Fix setup database and materialised views not working properly

* Changed version number fro QGIS

* Fix various issues (#71)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* beacon on top of parcel

* fix error on editing bearing and distance

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Port to QGIS 3 (#69)

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* First iteration for porting to QGIS3 (#67)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Fix setup database and materialised views not working properly

* Changed version number fro QGIS

* Application of styles for layers

* modified sample script

* Align develop  (#72)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* beacon on top of parcel

* fix error on editing bearing and distance

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Port to QGIS 3 (#69)

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* First iteration for porting to QGIS3 (#67)

* added qgis projects and sql for creating database

* updated metadata.txt, although how does it interact with metadata from Kartoza plugin repo?

* renamed folders and updated the sql file removing tables which are not needed by the plugin. Disabbled beacons trigger to revert when Gavin confirms its working properly

* added materialised views which I had deleted whilst testing failure for beacons delete

* modified script to create tables  properly

* modified function for deleting beacons

* added about tag

* Modified metadata for upload to QGIS plugin repository

* Removed database dumb from plugin

* added licence info into the plugin

* removed details that were duplicated in readme

* modified toolbar name to cogo

* fix lambda function error when editing parcel

* added first working version for QGIS3 - loads properly but need to fix and ensure all works

* renamed files and changed code to be compliant to the new API

* Reformat code so that test can pass

* fix for selecting feature when editng parcels

* fix no database error

* update API call

* Fix setup database and materialised views not working properly

* Changed version number fro QGIS

* Application of styles for layers

* modified sample script

.travis.yml

@@ -6,7 +6,7 @@ env:
     - ON_TRAVIS=true
     # - IMAGE=elpaso/qgis-testing-environment
     # - IMAGE=boundlessgeo/qgis-testing-environment
-    - IMAGE=kartoza/qgis-testing
+    - IMAGE=qgis-platform
 
   matrix:
     # Tags from elpaso
@@ -19,7 +19,7 @@ env:
     # - QGIS_VERSION_TAG=master # Current 3.0
 
     # Tags from kartoza
-    - QGIS_VERSION_TAG=boundlessgeo-2.14.7
+    - QGIS_VERSION_TAG=latest
 
 language: python
 
@@ -28,7 +28,7 @@ cache:
     - $HOME/.cache/pip
 
 python:
-  - "2.7"
+  - "3.5"
 
 virtualenv:
   system_site_packages: true

cogo_dialogs.py

@@ -319,9 +319,11 @@ def test_database_schema(self):
                 if crs:
                     query = open(
                         get_path("scripts", "database_setup.sql"), "r").read()
-                    query = query.replace(":CRS", "{CRS}")
+                    query = query.replace(":CRS", "{CRS}").replace(":DATABASE", "{DATABASE}").replace(":DBOWNER",
+                                                                                                      "{DBOWNER}")
                     cursor = self.db_connection.cursor()
-                    cursor.execute(query.format(CRS=crs))
+                    db_sql = query.format(CRS=crs, DATABASE=db_name, DBOWNER=db_username)
+                    cursor.execute(db_sql)
                     self.db_connection.commit()
                     del cursor
 

metadata.txt

@@ -5,7 +5,7 @@ name=CoGo Plugin
 description=A plugin to capture coordinates, bearings and distances and to use these to construct and manage land parcels.
 qgisMinimumVersion=2.99
 qgisMaximumVersion=3.99
-version=3.0
+version=3.5
 author=Kartoza
 [email protected]