Merge branch 'master' into Docker

# Conflicts:
#	konova/settings.py
#	konova/sub_settings/django_settings.py

konova/sub_settings/django_settings.py

@@ -32,6 +32,10 @@ SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
+ADMINS = [
+    ('KSP-Servicestelle', 'ksp-servicestelle@sgdnord.rlp.de'),
+]
+
 ALLOWED_HOSTS = [
     "127.0.0.1",
     "localhost",
@@ -212,41 +216,8 @@ if DEBUG:
     EMAIL_FILE_PATH = '/tmp/app-messages'
 
 DEFAULT_FROM_EMAIL = "no-reply@ksp.de"  # The default email address for the 'from' element
+SERVER_EMAIL = DEFAULT_FROM_EMAIL  # The default email sender address, which is used by Django to send errors via mail
 EMAIL_HOST = os.environ.get('SMTP_HOST')
 EMAIL_REPLY_TO = os.environ.get('SMTP_REAL_REPLY_MAIL')
 SUPPORT_MAIL_RECIPIENT = EMAIL_REPLY_TO
 EMAIL_PORT = os.environ.get('SMTP_PORT')
-
-# LOGGING
-BASIC_LOGGER = "logger"
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': '{levelname} {asctime} {module}: {message}',
-            'style': '{',
-        },
-        'simple': {
-            'format': '{levelname} {message}',
-            'style': '{',
-        },
-    },
-    'handlers': {
-        'log_to_file': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': '{}/logs/error.log'.format(BASE_DIR),
-            'maxBytes': 1024*1024*5, # 5 MB
-            'backupCount': 5,
-            'formatter': 'verbose',
-        },
-    },
-    'loggers': {
-        BASIC_LOGGER: {
-            'handlers': ['log_to_file'],
-            'level': 'INFO',
-            'propagate': True,
-        },
-    },
-}

konova/sub_settings/lanis_settings.py

@@ -0,0 +1,29 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 31.01.22
+
+"""
+
+# MAPS
+DEFAULT_LAT = 50.00
+DEFAULT_LON = 7.00
+DEFAULT_ZOOM = 8.0
+DEFAULT_SRID = 4326
+DEFAULT_SRID_RLP = 25832
+
+# Needed to redirect to LANIS
+## Values to be inserted are [zoom_level, x_coord, y_coord]
+LANIS_LINK_TEMPLATE = "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/index.php?lang=de&zl={}&x={}&y={}&bl=tk_rlp_tms_grau&bo=1&lo=0.8,0.8,0.8,0.6,0.8,0.8,0.8,0.8,0.8&layers=eiv_f,eiv_l,eiv_p,kom_f,kom_l,kom_p,oek_f,ema_f,mae&service=kartendienste_naturschutz"
+## This look up table (LUT) defines different zoom levels on the size of the calculate area of a geometry.
+LANIS_ZOOM_LUT = {
+    1000000000: 6,
+    100000000: 10,
+    10000000: 17,
+    1000000: 20,
+    100000: 25,
+    10000: 28,
+    1000: 30,
+    500: 31,
+}

konova/sub_settings/proxy_settings.py

@@ -0,0 +1,13 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 31.01.22
+
+"""
+
+proxy = ""
+PROXIES = {
+    "http": proxy,
+    "https": proxy,
+}

konova/sub_settings/sso_settings.py

@@ -0,0 +1,13 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 31.01.22
+
+"""
+
+# SSO settings
+SSO_SERVER_BASE = "http://127.0.0.1:8000/"
+SSO_SERVER = f"{SSO_SERVER_BASE}sso/"
+SSO_PRIVATE_KEY = "CHANGE_ME"
+SSO_PUBLIC_KEY = "CHANGE_ME"

konova/sub_settings/table_settings.py

@@ -0,0 +1,24 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 31.01.22
+
+"""
+
+# Tables
+RESULTS_PER_PAGE_PARAM = "rpp"
+PAGE_PARAM = "page"
+PAGE_SIZE_OPTIONS = [5, 10, 15, 20, 25, 50, 100]
+PAGE_SIZE_OPTIONS_TUPLES = [
+    (5, 5),
+    (10, 10),
+    (15, 15),
+    (20, 20),
+    (25, 25),
+    (50, 50),
+    (100, 100),
+]
+PAGE_SIZE_DEFAULT = 5
+PAGE_SIZE_MAX = 100
+PAGE_DEFAULT = 1

konova/sub_settings/wfs_parcel_settings.py

@@ -0,0 +1,12 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 31.01.22
+
+"""
+
+# Parcel WFS settings
+PARCEL_WFS_BASE_URL = "https://www.geoportal.rlp.de/registry/wfs/519"
+PARCEL_WFS_USER = "ksp"
+PARCEL_WFS_PW = "CHANGE_ME"