Merge pull request #52 from ropable/master

Drop cddp application, implement import_cpt_cadastre_scdb function

Dockerfile

@@ -21,7 +21,6 @@ RUN poetry config virtualenvs.create false \
 # Install the project.
 COPY geocoder.py gunicorn.py manage.py ./
 COPY caddy ./caddy
-COPY cddp ./cddp
 COPY shack ./shack
 
 # Run the application as the www-data user.

caddy/settings.py

@@ -39,7 +39,6 @@
     'django_extensions',
     'tastypie',
     'shack',
-    'cddp',
 )
 MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
@@ -69,9 +68,6 @@
     # Defined in the DATABASE_URL env variable.
     'default': dj_database_url.config(),
 }
-if env('CDDP_DATABASE_URL', None):
-    DATABASES['cddp'] = dj_database_url.parse(env('CDDP_DATABASE_URL'))
-    DATABASE_ROUTERS = ['cddp.router.CddpDBRouter']
 
 
 # Internationalization

pyproject.toml

@@ -1,14 +1,14 @@
 [tool.poetry]
 name = "caddy"
-version = "2.2.12"
+version = "2.3.0"
 description = "Lightweight application service to harvest and index the cadastre dataset, and expose an API endpoint to allow full-text searching of addresses."
 authors = ["Ashley Felton <[email protected]>"]
 license = "Apache License 2.0"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-django = "3.2.20"
-psycopg2 = "2.9.5"
+django = "3.2.21"
+psycopg2 = "2.9.6"
 python-dotenv = "1.0.0"
 dj-database-url = "1.0.0"
 SQLAlchemy = "2.0.20"
@@ -20,6 +20,7 @@ bottle = "0.12.25"
 gunicorn = "21.2.0"
 mixer = "7.2.2"
 WebTest = "3.0.0"
+fudgeo = "0.7.0"
 
 [tool.poetry.group.dev.dependencies]
 ipython = "^8.14.0"

shack/management/commands/harvest_addresses.py → shack/management/commands/harvest_cadastre_wfs.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand, CommandError
 import logging
-from shack.utils import harvest_state_cadastre
+from shack.utils import harvest_cadastre_wfs
 
 logger = logging.getLogger('caddy')
 
@@ -24,7 +24,7 @@ def handle(self, *args, **options):
 
         self.stdout.write('Starting harvest of cadastre addresses')
         logger.info('Starting harvest of cadastre addresses')
-        harvest_state_cadastre(limit)
+        harvest_cadastre_wfs(limit)
         self.stdout.write('Finished harvest of cadastre addresses')
         logger.info('Finished harvest of cadastre addresses')
 

shack/management/commands/import_cpt_cadastre_scdb.py

@@ -0,0 +1,27 @@
+from django.core.management.base import BaseCommand, CommandError
+import logging
+from shack.utils import import_cpt_cadastre_scdb
+
+logger = logging.getLogger('caddy')
+
+
+class Command(BaseCommand):
+    help = 'Undertakes harvest of address data from CPT_CADASTRE_SCDB.gpkg'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--path', action='store', dest='path', default=None,
+            help='File path to the Geopackage file',
+        )
+
+    def handle(self, *args, **options):
+        if options['path']:
+            path = options['path']
+        else:
+            path = None
+
+        logger.info('Starting harvest of cadastre addresses')
+        import_cpt_cadastre_scdb(path)
+        self.stdout.write('Finished harvest of cadastre addresses')
+
+        return