Merge pull request '# Requirements update' (#531) from django_6_upgrade into master

Reviewed-on: #531

analysis/urls.py

@@ -10,6 +10,6 @@ from analysis.views import *
 
 app_name = "analysis"
 urlpatterns = [
-    path("reports/", index_reports_view, name="reports"),
+    path("reports/", ReportIndexView.as_view(), name="reports"),
-    path("reports/<id>", detail_report_view, name="report-detail"),
+    path("reports/<id>", ReportDetailView.as_view(), name="report-detail"),
 ]

analysis/views.py

@@ -1,8 +1,12 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.generic import DetailView
 
 from analysis.forms import TimespanReportForm
 from analysis.utils.excel.excel import TempExcelFile
@@ -42,57 +46,112 @@ def index_reports_view(request: HttpRequest):
     context = BaseContext(request, context).context
     return render(request, template, context)
 
+class ReportIndexView(LoginRequiredMixin, View):
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest) -> HttpResponse:
 
-@login_required
+        """
-@conservation_office_group_required
-def detail_report_view(request: HttpRequest, id: str):
-    """ Renders the detailed report for a conservation office
 
-    Args:
+        Args:
-        request (HttpRequest): The incoming request
+            request (HttpRequest): The incoming request
-        id (str): The conservation_office KonovaCode id
 
-    Returns:
+        Returns:
 
-    """
+        """
-    # Try to resolve the requested office id
+        template = "analysis/reports/index.html"
-    cons_office = get_object_or_404(
+        form = TimespanReportForm(None)
-        KonovaCode,
+        context = {
-        id=id
+            "form": form
-    )
+        }
-    # Try to resolve the date parameters into Date objects -> redirect if this fails
+        context = BaseContext(request, context).context
-    try:
+        return render(request, template, context)
-        df = request.GET.get("df", None)
+
-        dt = request.GET.get("dt", None)
+    @method_decorator(conservation_office_group_required)
-        date_from = timezone.make_aware(timezone.datetime.fromisoformat(df))
+    def post(self, request: HttpRequest) -> HttpResponse:
-        date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt))
+
-    except ValueError:
+        """
-        messages.error(
+
-            request,
+        Args:
-            PARAMS_INVALID,
+            request (HttpRequest): The incoming request
-            extra_tags="danger",
+
+        Returns:
+
+        """
+        template = "analysis/reports/index.html"
+        form = TimespanReportForm(request.POST or None)
+        if form.is_valid():
+            redirect_url = form.save()
+            return redirect(redirect_url)
+        else:
+            messages.error(
+                request,
+                FORM_INVALID,
+                extra_tags="danger",
+            )
+        context = {
+            "form": form
+        }
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+
+class ReportDetailView(LoginRequiredMixin, DetailView):
+
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest, id: str):
+        """ Renders the detailed report for a conservation office
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The conservation_office KonovaCode id
+
+        Returns:
+
+        """
+        # Try to resolve the requested office id
+        cons_office = get_object_or_404(
+            KonovaCode,
+            id=id
         )
-        return redirect("analysis:reports")
+        # Try to resolve the date parameters into Date objects -> redirect if this fails
+        try:
+            df = request.GET.get("df", None)
+            dt = request.GET.get("dt", None)
+            date_from = timezone.make_aware(timezone.datetime.fromisoformat(df))
+            date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt))
+        except ValueError:
+            messages.error(
+                request,
+                PARAMS_INVALID,
+                extra_tags="danger",
+            )
+            return redirect("analysis:reports")
 
-    # Check whether the html default rendering is requested or an alternative
+        # Check whether the html default rendering is requested or an alternative
-    format_param = request.GET.get("format", "html")
+        format_param = request.GET.get("format", "html")
-    report = TimespanReport(id, date_from, date_to)
+        report = TimespanReport(id, date_from, date_to)
 
-    if format_param == "html":
+        if format_param == "html":
+            return self.__handle_html_format(request, report, cons_office)
+        elif format_param == "excel":
+            return self.__handle_excel_format(report, cons_office, df, dt)
+        else:
+            raise NotImplementedError
+
+    def __handle_html_format(self, request, report: TimespanReport, office: KonovaCode):
         template = "analysis/reports/detail.html"
         context = {
-            "office": cons_office,
+            "office": office,
             "report": report,
         }
         context = BaseContext(request, context).context
         return render(request, template, context)
-    elif format_param == "excel":
+
+    def __handle_excel_format(self, report: TimespanReport, office: KonovaCode, df: str, dt: str):
         file = TempExcelFile(report.excel_template_path, report.excel_map)
         response = HttpResponse(
             content=file.stream,
             content_type="application/ms-excel",
         )
-        response['Content-Disposition'] = f'attachment; filename={cons_office.long_name}_{df}_{dt}.xlsx'
+        response['Content-Disposition'] = f'attachment; filename={office.long_name}_{df}_{dt}.xlsx'
         return response
-    else:
-        raise NotImplementedError

api/tests/v1/create/test_api_create.py

@@ -71,7 +71,7 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         # Expect this first request to fail, since user has no shared access on the intervention, we want to create
         # a compensation for
         response = self._run_create_request(url, post_body)
-        self.assertEqual(response.status_code, 500, msg=response.content)
+        self.assertEqual(response.status_code, 400, msg=response.content)
         content = json.loads(response.content)
         self.assertGreater(len(content.get("errors", [])), 0, msg=response.content)
 

api/urls/urls.py

@@ -7,11 +7,8 @@ Created on: 21.01.22
 """
 from django.urls import path, include
 
-from api.views.method_views import generate_new_token_view
-
 app_name = "api"
 
 urlpatterns = [
     path("v1/", include("api.urls.v1.urls", namespace="v1")),
-    path("token/generate", generate_new_token_view, name="generate-new-token"),
 ]

api/views/method_views.py

@@ -1,35 +0,0 @@
-"""
-Author: Michel Peltriaux
-Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
-Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 27.01.22
-
-"""
-from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest, JsonResponse
-
-from api.models import APIUserToken
-
-
-@login_required
-def generate_new_token_view(request: HttpRequest):
-    """ Handles request for fetching
-
-    Args:
-        request (HttpRequest): The incoming request
-
-    Returns:
-
-    """
-
-    if request.method == "GET":
-        token = APIUserToken()
-        while APIUserToken.objects.filter(token=token.token).exists():
-            token = APIUserToken()
-        return JsonResponse(
-            data={
-                "gen_data": token.token
-            }
-        )
-    else:
-        raise NotImplementedError

api/views/v1/views.py

@@ -6,7 +6,9 @@ Created on: 21.01.22
 
 """
 import json
+from json import JSONDecodeError
 
+from django.core.exceptions import ObjectDoesNotExist
 from django.http import JsonResponse, HttpRequest
 
 from api.utils.serializer.v1.compensation import CompensationAPISerializerV1
@@ -66,8 +68,12 @@ class AbstractAPIViewV1(AbstractAPIView):
             body = request.body.decode("utf-8")
             body = json.loads(body)
             created_id = self.serializer.create_model_from_json(body, self.user)
-        except Exception as e:
+        except (JSONDecodeError,
-            return self._return_error_response(e, 500)
+                AssertionError,
+                ValueError,
+                PermissionError,
+                ObjectDoesNotExist) as e:
+            return self._return_error_response(e, 400)
         return JsonResponse({"id": created_id})
 
     def put(self, request: HttpRequest, id=None):

api/views/views.py

@@ -81,9 +81,7 @@ class AbstractAPIView(View):
         Returns:
 
         """
-        content = [error.__str__()]
+        content = [f"{error.__class__.__name__}: {str(error)}"]
-        if hasattr(error, "messages"):
-            content = error.messages
         return JsonResponse(
             {
                 "errors": content

compensation/tables/compensation.py

@@ -124,7 +124,7 @@ class CompensationTable(BaseTable, TableRenderMixin, TableOrderMixin):
             html += self.render_previously_checked_star(
                 tooltip=tooltip,
             )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Compensation):
         """ Renders the registered column for a compensation
@@ -146,5 +146,5 @@ class CompensationTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=recorded,
         )
-        return format_html(html)
+        return format_html(html, None)
 

compensation/tables/eco_account.py

@@ -95,7 +95,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_av(self, value, record: EcoAccount):
         """ Renders the available column for an eco account
@@ -113,7 +113,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             value_relative = 0
         html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative})
         html += f"{number_format(record.deductable_rest, decimal_pos=2)} m²"
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: EcoAccount):
         """ Renders the recorded column for an eco account
@@ -135,4 +135,4 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=checked,
         )
-        return format_html(html)
+        return format_html(html, None)

compensation/urls/compensation.py

@@ -19,19 +19,19 @@ from compensation.views.compensation.action import NewCompensationActionView, Ed
     RemoveCompensationActionView
 from compensation.views.compensation.state import NewCompensationStateView, EditCompensationStateView, \
     RemoveCompensationStateView
-from compensation.views.compensation.compensation import new_view, edit_view, \
+from compensation.views.compensation.compensation import IndexCompensationView, CompensationIdentifierGeneratorView, \
-    IndexCompensationView, CompensationIdentifierGeneratorView
+    EditCompensationView, NewCompensationView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
     path("", IndexCompensationView.as_view(), name="index"),
     path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', new_view, name='new'),
+    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
-    path('new', new_view, name='new'),
+    path('new', NewCompensationView.as_view(), name='new'),
     path('<id>', DetailCompensationView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
     path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),

compensation/urls/eco_account.py

@@ -9,8 +9,8 @@ from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
 from compensation.views.eco_account.detail import DetailEcoAccountView
-from compensation.views.eco_account.eco_account import new_view, edit_view, \
+from compensation.views.eco_account.eco_account import IndexEcoAccountView, EcoAccountIdentifierGeneratorView, \
-    IndexEcoAccountView, EcoAccountIdentifierGeneratorView
+    NewEcoAccountView, EditEcoAccountView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
 from compensation.views.eco_account.remove import RemoveEcoAccountView
@@ -31,13 +31,13 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 app_name = "acc"
 urlpatterns = [
     path("", IndexEcoAccountView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewEcoAccountView.as_view(), name='new'),
     path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', DetailEcoAccountView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
     path('<id>/report', EcoAccountPublicReportView.as_view(), name='report'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
     path('<id>/remove', RemoveEcoAccountView.as_view(), name='remove'),
     path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 

compensation/urls/payment.py

@@ -10,7 +10,7 @@ from compensation.views.payment import *
 
 app_name = "pay"
 urlpatterns = [
-    path('<id>/new', new_payment_view, name='new'),
+    path('<id>/new', NewPaymentView.as_view(), name='new'),
-    path('<id>/remove/<payment_id>', payment_remove_view, name='remove'),
+    path('<id>/remove/<payment_id>', RemovePaymentView.as_view(), name='remove'),
-    path('<id>/edit/<payment_id>', payment_edit_view, name='edit'),
+    path('<id>/edit/<payment_id>', EditPaymentView.as_view(), name='edit'),
 ]

compensation/views/compensation/compensation.py

@@ -6,11 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render, redirect
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from compensation.forms.compensation import EditCompensationForm, NewCompensationForm
 from compensation.models import Compensation
@@ -54,36 +55,78 @@ class IndexCompensationView(AbstractIndexView):
         context = BaseContext(request, context).context
         return render(request, self._TEMPLATE, context)
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "intervention_id")
-def new_view(request: HttpRequest, intervention_id: str = None):
-    """
-    Renders a view for a new compensation creation
 
-    Args:
+class NewCompensationView(LoginRequiredMixin, View):
-        request (HttpRequest): The incoming request
+    _TEMPLATE = "compensation/form/view.html"
 
-    Returns:
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def get(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for new compensation
 
-    """
+        A compensation creation may be called directly from the parent-intervention object. If so - we may take
-    template = "compensation/form/view.html"
+        the intervention's id and directly link the compensation to it.
-    if intervention_id is not None:
+
-        try:
+        Args:
-            intervention = Intervention.objects.get(id=intervention_id)
+            request (HttpRequest): The incoming request
-        except ObjectDoesNotExist:
+            intervention_id (str): The intervention identifier
-            messages.error(request, PARAMS_INVALID)
+
-            return redirect("home")
+        Returns:
-        if intervention.is_recorded:
+
-            messages.info(
+        """
-                request,
+        if intervention_id:
-                RECORDED_BLOCKS_EDIT
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
-            )
+            # Not even adding new child elements like compensations!
-            return redirect("intervention:detail", id=intervention_id)
+            intervention = get_object_or_404(Intervention, id=intervention_id)
+            recording_state_blocks_actions = intervention.is_recorded
+            if recording_state_blocks_actions:
+                messages.info(
+                    request,
+                    RECORDED_BLOCKS_EDIT
+                )
+                return redirect("intervention:detail", id=intervention_id)
+
+        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def post(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new compensation creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        if intervention_id:
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
+            # Not even adding new child elements like compensations!
+            intervention = get_object_or_404(Intervention, id=intervention_id)
+            recording_state_blocks_actions = intervention.is_recorded
+            if recording_state_blocks_actions:
+                messages.info(
+                    request,
+                    RECORDED_BLOCKS_EDIT
+                )
+                return redirect("intervention:detail", id=intervention_id)
+
+        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
 
-    data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             comp = data_form.save(request.user, geom_form)
@@ -101,65 +144,97 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:detail", id=comp.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
+        context = {
-        pass
+            "form": data_form,
-    context = {
+            "geom_form": geom_form,
-        "form": data_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
-        "geom_form": geom_form,
+        }
-        TAB_TITLE_IDENTIFIER: _("New compensation"),
+        context = BaseContext(request, context).context
-    }
+
-    context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
-    return render(request, template, context)
 
 
 class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = Compensation
 
 
-@login_required
+class EditCompensationView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-@shared_access_required(Compensation, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
 
-    Args:
+    @method_decorator(default_group_required)
-        request (HttpRequest): The incoming request
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    Returns:
+        """
+        Renders a view for editing compensations
 
-    """
+        Args:
-    template = "compensation/form/view.html"
+            request (HttpRequest): The incoming request
-    # Get object from db
-    comp = get_object_or_404(Compensation, id=id)
-    if comp.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("compensation:detail", id=id)
 
-    # Create forms, initialize with values from db/from POST request
+        Returns:
-    data_form = EditCompensationForm(request.POST or None, instance=comp)
+
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+        """
-    if request.method == "POST":
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
         if data_form.is_valid() and geom_form.is_valid():
             # Preserve state of intervention checked to determine whether the user must be informed or not
             # about a change of the check state
             intervention_is_checked = comp.intervention.checked is not None
-
             # The data form takes the geom form for processing, as well as the performing user
             comp = data_form.save(request.user, geom_form)
             if intervention_is_checked:
@@ -170,24 +245,21 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:detail", id=comp.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
+        context = {
-        pass
+            "form": data_form,
-    context = {
+            "geom_form": geom_form,
-        "form": data_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
-        "geom_form": geom_form,
+        }
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        context = BaseContext(request, context).context
-    }
+
-    context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
-    return render(request, template, context)

compensation/views/compensation/remove.py

@@ -3,7 +3,7 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
 
 from compensation.models import Compensation
@@ -16,5 +16,5 @@ class RemoveCompensationView(AbstractRemoveView):
     _REDIRECT_URL = "compensation:index"
 
     @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request: HttpRequest, id: str, *args, **kwargs):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        return super().dispatch(request, id, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

compensation/views/eco_account/eco_account.py

@@ -6,10 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm
 from compensation.models import EcoAccount
@@ -52,22 +54,46 @@ class IndexEcoAccountView(AbstractIndexView):
         return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class NewEcoAccountView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new eco account creation
 
-    Args:
+    @method_decorator(default_group_required)
-        request (HttpRequest): The incoming request
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for a new eco account creation
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
 
-    """
+        Returns:
-    template = "compensation/form/view.html"
+
-    data_form = NewEcoAccountForm(request.POST or None)
+        """
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        data_form = NewEcoAccountForm(request.POST or None)
-    if request.method == "POST":
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new eco account creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewEcoAccountForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             acc = data_form.save(request.user, geom_form)
@@ -85,58 +111,92 @@ def new_view(request: HttpRequest):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:acc:detail", id=acc.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
+        context = {
-        pass
+            "form": data_form,
-    context = {
+            "geom_form": geom_form,
-        "form": data_form,
+            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
-        "geom_form": geom_form,
+        }
-        TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+        context = BaseContext(request, context).context
-    }
+
-    context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
-    return render(request, template, context)
 
 class EcoAccountIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = EcoAccount
 
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
 
-    Args:
+class EditEcoAccountView(LoginRequiredMixin, View):
-        request (HttpRequest): The incoming request
+    _TEMPLATE = "compensation/form/view.html"
 
-    Returns:
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    """
+        """
-    template = "compensation/form/view.html"
+        Renders a view for editing compensations
-    # Get object from db
+
-    acc = get_object_or_404(EcoAccount, id=id)
+        Args:
-    if acc.is_recorded:
+            request (HttpRequest): The incoming request
-        messages.info(
+
-            request,
+        Returns:
-            RECORDED_BLOCKS_EDIT
+
-        )
+        """
-        return redirect("compensation:acc:detail", id=id)
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEcoAccountForm(request.POST or None, instance=acc)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEcoAccountForm(request.POST or None, instance=acc)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
 
-    # Create forms, initialize with values from db/from POST request
-    data_form = EditEcoAccountForm(request.POST or None, instance=acc)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
-    if request.method == "POST":
         data_form_valid = data_form.is_valid()
         geom_form_valid = geom_form.is_valid()
         if data_form_valid and geom_form_valid:
@@ -148,24 +208,21 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:acc:detail", id=acc.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
+        context = {
-        pass
+            "form": data_form,
-    context = {
+            "geom_form": geom_form,
-        "form": data_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
-        "geom_form": geom_form,
+        }
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
+        context = BaseContext(request, context).context
-    }
+
-    context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
-    return render(request, template, context)

compensation/views/eco_account/remove.py

@@ -3,7 +3,7 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
 
 from compensation.forms.eco_account import RemoveEcoAccountModalForm
@@ -18,5 +18,5 @@ class RemoveEcoAccountView(AbstractRemoveView):
     _FORM = RemoveEcoAccountModalForm
 
     @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request: HttpRequest, id: str, *args, **kwargs):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        return super().dispatch(request, id, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

compensation/views/payment.py

@@ -5,10 +5,12 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.08.21
 
 """
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
-from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
 from django.shortcuts import get_object_or_404
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from compensation.forms.modals.payment import NewPaymentForm, RemovePaymentModalForm, EditPaymentModalForm
 from compensation.models import Payment
@@ -17,72 +19,97 @@ from konova.decorators import default_group_required, shared_access_required
 from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED, PAYMENT_EDITED
 
 
-@login_required
+class NewPaymentView(LoginRequiredMixin, View):
-@default_group_required
-@shared_access_required(Intervention, "id")
-def new_payment_view(request: HttpRequest, id: str):
-    """ Renders a modal view for adding new payments
 
-    Args:
+    def __process_request(self, request: HttpRequest, id: str):
-        request (HttpRequest): The incoming request
+        """ Renders a modal view for adding new payments
-        id (str): The intervention's id for which a new payment shall be added
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id for which a new payment shall be added
 
-    """
+        Returns:
-    intervention = get_object_or_404(Intervention, id=id)
+
-    form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
+        """
-    return form.process_request(
+        intervention = get_object_or_404(Intervention, id=id)
-        request,
+        form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
-        msg_success=PAYMENT_ADDED,
+        return form.process_request(
-        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
+            request,
-    )
+            msg_success=PAYMENT_ADDED,
+            redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
+        )
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str):
+        return self.__process_request(request, id=id)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str):
+        return self.__process_request(request, id=id)
 
 
-@login_required
+class RemovePaymentView(LoginRequiredMixin, View):
-@default_group_required
-@shared_access_required(Intervention, "id")
-def payment_remove_view(request: HttpRequest, id: str, payment_id: str):
-    """ Renders a modal view for removing payments
 
-    Args:
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
-        request (HttpRequest): The incoming request
+        """ Renders a modal view for removing payments
-        id (str): The intervention's id
-        payment_id (str): The payment's id
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id
+            payment_id (str): The payment's id
 
-    """
+        Returns:
-    intervention = get_object_or_404(Intervention, id=id)
+
-    payment = get_object_or_404(Payment, id=payment_id)
+        """
-    form = RemovePaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
+        intervention = get_object_or_404(Intervention, id=id)
-    return form.process_request(
+        payment = get_object_or_404(Payment, id=payment_id)
-        request=request,
+        form = RemovePaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
-        msg_success=PAYMENT_REMOVED,
+        return form.process_request(
-        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
+            request=request,
-    )
+            msg_success=PAYMENT_REMOVED,
+            redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
+        )
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
 
 
-@login_required
+class EditPaymentView(LoginRequiredMixin, View):
-@default_group_required
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
-@shared_access_required(Intervention, "id")
+        """ Renders a modal view for editing payments
-def payment_edit_view(request: HttpRequest, id: str, payment_id: str):
-    """ Renders a modal view for editing payments
 
-    Args:
+        Args:
-        request (HttpRequest): The incoming request
+            request (HttpRequest): The incoming request
-        id (str): The intervention's id
+            id (str): The intervention's id
-        payment_id (str): The payment's id
+            payment_id (str): The payment's id
 
-    Returns:
+        Returns:
 
-    """
+        """
-    intervention = get_object_or_404(Intervention, id=id)
+        intervention = get_object_or_404(Intervention, id=id)
-    payment = get_object_or_404(Payment, id=payment_id)
+        payment = get_object_or_404(Payment, id=payment_id)
-    form = EditPaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
+        form = EditPaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
-    return form.process_request(
+        return form.process_request(
-        request=request,
+            request=request,
-        msg_success=PAYMENT_EDITED,
+            msg_success=PAYMENT_EDITED,
-        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
+            redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
-    )
+        )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)

ema/tables.py

@@ -88,7 +88,7 @@ class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Ema):
         """ Renders the registered column for a EMA
@@ -110,4 +110,4 @@ class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=recorded,
         )
-        return format_html(html)
+        return format_html(html, None)

ema/templates/ema/detail/includes/controls.html

@@ -15,10 +15,10 @@
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'ema:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>
-        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'ema:share-form' obj.id %}">
-            {% fa5_icon 'share-alt' %}
-        </button>
         {% if is_ets_member %}
+            <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'ema:share-form' obj.id %}">
+                {% fa5_icon 'share-alt' %}
+            </button>
             {% if obj.recorded %}
                 <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'ema:record' obj.id %}">
                     {% fa5_icon 'bookmark' 'far' %}
@@ -28,19 +28,21 @@
                     {% fa5_icon 'bookmark' %}
                 </button>
             {% endif %}
+            <a href="{% url 'ema:edit' obj.id %}" class="mr-2">
+                <button class="btn btn-default" title="{% trans 'Edit' %}">
+                    {% fa5_icon 'edit' %}
+                </button>
+            </a>
         {% endif %}
         {% if is_default_member %}
-        <a href="{% url 'ema:edit' obj.id %}" class="mr-2">
+            <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'ema:log' obj.id %}" title="{% trans 'Show log' %}">
-            <button class="btn btn-default" title="{% trans 'Edit' %}">
+                {% fa5_icon 'history' %}
-                {% fa5_icon 'edit' %}
+            </button>
+        {% endif %}
+        {% if is_ets_member %}
+            <button class="btn btn-default btn-modal" data-form-url="{% url 'ema:remove' obj.id %}" title="{% trans 'Delete' %}">
+                {% fa5_icon 'trash' %}
             </button>
-        </a>
-        <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'ema:log' obj.id %}" title="{% trans 'Show log' %}">
-            {% fa5_icon 'history' %}
-        </button>
-        <button class="btn btn-default btn-modal" data-form-url="{% url 'ema:remove' obj.id %}" title="{% trans 'Delete' %}">
-            {% fa5_icon 'trash' %}
-        </button>
         {% endif %}
     {% endif %}
 </div>

ema/tests/test_views.py

@@ -118,6 +118,7 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.index_url,
             self.detail_url,
             self.report_url,
+            self.log_url,
         ]
         fail_urls = [
             self.new_url,
@@ -133,7 +134,6 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.action_remove_url,
             self.action_new_url,
             self.new_doc_url,
-            self.log_url,
             self.remove_url,
         ]
         self.assert_url_fail(client, fail_urls)

ema/urls.py

@@ -11,7 +11,7 @@ from ema.views.action import NewEmaActionView, EditEmaActionView, RemoveEmaActio
 from ema.views.deadline import NewEmaDeadlineView, EditEmaDeadlineView, RemoveEmaDeadlineView
 from ema.views.detail import DetailEmaView
 from ema.views.document import NewEmaDocumentView, EditEmaDocumentView, RemoveEmaDocumentView, GetEmaDocumentView
-from ema.views.ema import new_view, edit_view, IndexEmaView, EmaIdentifierGeneratorView
+from ema.views.ema import IndexEmaView, EmaIdentifierGeneratorView, EditEmaView, NewEmaView
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
 from ema.views.remove import RemoveEmaView
@@ -23,11 +23,11 @@ from ema.views.state import NewEmaStateView, EditEmaStateView, RemoveEmaStateVie
 app_name = "ema"
 urlpatterns = [
     path("", IndexEmaView.as_view(), name="index"),
-    path("new/", new_view, name="new"),
+    path("new/", NewEmaView.as_view(), name="new"),
     path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
     path("<id>", DetailEmaView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEmaView.as_view(), name='edit'),
     path('<id>/remove', RemoveEmaView.as_view(), name='remove'),
     path('<id>/record', EmaRecordView.as_view(), name='record'),
     path('<id>/report', EmaPublicReportView.as_view(), name='report'),

ema/views/ema.py

@@ -7,19 +7,19 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest, JsonResponse, HttpResponse
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views.generic.base import View
 
 from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
+from konova.decorators import shared_access_required, conservation_office_group_required
 from konova.forms import SimpleGeomForm
-from konova.forms.modals import RemoveModalForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
     GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
@@ -54,23 +54,49 @@ class IndexEmaView(AbstractIndexView):
         context = BaseContext(request, context).context
         return render(request, self._TEMPLATE, context)
 
+class NewEmaView(LoginRequiredMixin, View):
+    _TEMPLATE = "ema/form/view.html"
 
-@login_required
+    @method_decorator(conservation_office_group_required)
-@conservation_office_group_required
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-def new_view(request: HttpRequest):
+        """ GET endpoint
-    """
-    Renders a view for a new eco account creation
 
-    Args:
+        Renders form for new EMA
-        request (HttpRequest): The incoming request
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            *args ():
+            **kwargs ():
 
-    """
+        Returns:
-    template = "ema/form/view.html"
+
-    data_form = NewEmaForm(request.POST or None)
+        """
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        data_form = NewEmaForm(request.POST or None)
-    if request.method == "POST":
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New EMA"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(conservation_office_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """ POST endpoint
+
+        Processes submitted form
+
+        Args:
+            request (HttpRequest): The incoming request
+            *args ():
+            **kwargs ():
+
+        Returns:
+
+        """
+        data_form = NewEmaForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             ema = data_form.save(request.user, geom_form)
@@ -94,56 +120,91 @@ def new_view(request: HttpRequest):
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("ema:detail", id=ema.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
+        context = {
-        # For clarification: nothing in this case
+            "form": data_form,
-        pass
+            "geom_form": geom_form,
-    context = {
+            TAB_TITLE_IDENTIFIER: _("New EMA"),
-        "form": data_form,
+        }
-        "geom_form": geom_form,
+        context = BaseContext(request, context).context
-        TAB_TITLE_IDENTIFIER: _("New EMA"),
+        return render(request, self._TEMPLATE, context)
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
-
 
 class EmaIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = Ema
 
     @method_decorator(conservation_office_group_required)
-    def dispatch(self, request, *args, **kwargs):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        return super().dispatch(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
-@login_required
+class EditEmaView(LoginRequiredMixin, View):
-@conservation_office_group_required
+    _TEMPLATE = "compensation/form/view.html"
-@shared_access_required(Ema, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
 
-    Args:
+    @method_decorator(conservation_office_group_required)
-        request (HttpRequest): The incoming request
+    @method_decorator(shared_access_required(Ema, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ GET endpoint
 
-    Returns:
+        Renders form
 
-    """
+        Args:
-    template = "compensation/form/view.html"
+            request (HttpRequest): The incoming request
-    # Get object from db
+            id (str): The ema identifier
-    ema = get_object_or_404(Ema, id=id)
+            *args ():
-    if ema.is_recorded:
+            **kwargs ():
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("ema:detail", id=id)
 
-    # Create forms, initialize with values from db/from POST request
+        Returns:
-    data_form = EditEmaForm(request.POST or None, instance=ema)
+
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=ema)
+        """
-    if request.method == "POST":
+        # Get object from db
+        ema = get_object_or_404(Ema, id=id)
+        if ema.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("ema:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEmaForm(instance=ema)
+        geom_form = SimpleGeomForm(read_only=False, instance=ema)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(conservation_office_group_required)
+    @method_decorator(shared_access_required(Ema, "id"))
+    def post(self, request: HttpRequest, id:str, *args, **kwargs) -> HttpResponse:
+        """ POST endpoint
+
+        Process submitted forms
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the ema
+            *args ():
+            **kwargs ():
+
+        Returns:
+
+        """
+        # Get object from db
+        ema = get_object_or_404(Ema, id=id)
+        if ema.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("ema:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEmaForm(request.POST or None, instance=ema)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=ema)
         if data_form.is_valid() and geom_form.is_valid():
             # The data form takes the geom form for processing, as well as the performing user
             ema = data_form.save(request.user, geom_form)
@@ -153,24 +214,19 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("ema:detail", id=ema.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+        context = {
-        # For clarification: nothing in this case
+            "form": data_form,
-        pass
+            "geom_form": geom_form,
-    context = {
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
-        "form": data_form,
+        }
-        "geom_form": geom_form,
+        context = BaseContext(request, context).context
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+        return render(request, self._TEMPLATE, context)
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)

ema/views/log.py

@@ -18,7 +18,6 @@ class EmaLogView(AbstractLogView):
 
     @method_decorator(login_required_modal)
     @method_decorator(login_required)
-    @method_decorator(conservation_office_group_required)
     @method_decorator(shared_access_required(Ema, "id"))
     def dispatch(self, request, *args, **kwargs):
         return super().dispatch(request, *args, **kwargs)

ema/views/remove.py

@@ -3,6 +3,7 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
 
 from ema.models import Ema
@@ -16,5 +17,5 @@ class RemoveEmaView(AbstractRemoveView):
 
     @method_decorator(conservation_office_group_required)
     @method_decorator(shared_access_required(Ema, "id"))
-    def dispatch(self, request, *args, **kwargs):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        return super().dispatch(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

intervention/tables.py

@@ -127,7 +127,7 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
             html += self.render_previously_checked_star(
                 tooltip=tooltip,
             )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Intervention):
         """ Renders the recorded column for an intervention
@@ -149,5 +149,5 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=checked,
         )
-        return format_html(html)
+        return format_html(html, None)
 

intervention/urls.py

@@ -8,42 +8,42 @@ Created on: 30.11.20
 from django.urls import path
 
 from intervention.autocomplete.intervention import InterventionAutocomplete
-from intervention.views.check import check_view
+from intervention.views.check import InterventionCheckView
-from intervention.views.compensation import remove_compensation_view
+from intervention.views.compensation import RemoveCompensationFromInterventionView
 from intervention.views.deduction import NewInterventionDeductionView, EditInterventionDeductionView, \
     RemoveInterventionDeductionView
 from intervention.views.document import NewInterventionDocumentView, GetInterventionDocumentView, \
     RemoveInterventionDocumentView, EditInterventionDocumentView
-from intervention.views.intervention import new_view, edit_view, \
+from intervention.views.intervention import IndexInterventionView, InterventionIdentifierGeneratorView, \
-    IndexInterventionView, InterventionIdentifierGeneratorView
+    NewInterventionView, EditInterventionView
 from intervention.views.remove import RemoveInterventionView
 from intervention.views.detail import DetailInterventionView
 from intervention.views.log import InterventionLogView
 from intervention.views.record import InterventionRecordView
 from intervention.views.report import InterventionPublicReportView
 from intervention.views.resubmission import InterventionResubmissionView
-from intervention.views.revocation import new_revocation_view, edit_revocation_view, remove_revocation_view, \
+from intervention.views.revocation import NewInterventionRevocationView, GetInterventionRevocationView, \
-    get_revocation_view
+    EditInterventionRevocationView, RemoveInterventionRevocationView
 from intervention.views.share import InterventionShareFormView, InterventionShareByTokenView
 
 app_name = "intervention"
 urlpatterns = [
     path("", IndexInterventionView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewInterventionView.as_view(), name='new'),
     path('new/id', InterventionIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', DetailInterventionView.as_view(), name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditInterventionView.as_view(), name='edit'),
     path('<id>/remove', RemoveInterventionView.as_view(), name='remove'),
     path('<id>/share/<token>', InterventionShareByTokenView.as_view(), name='share-token'),
     path('<id>/share', InterventionShareFormView.as_view(), name='share-form'),
-    path('<id>/check', check_view, name='check'),
+    path('<id>/check', InterventionCheckView.as_view(), name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
     path('<id>/report', InterventionPublicReportView.as_view(), name='report'),
     path('<id>/resub', InterventionResubmissionView.as_view(), name='resubmission-create'),
 
     # Compensations
-    path('<id>/compensation/<comp_id>/remove', remove_compensation_view, name='remove-compensation'),
+    path('<id>/compensation/<comp_id>/remove', RemoveCompensationFromInterventionView.as_view(), name='remove-compensation'),
 
     # Documents
     path('<id>/document/new/', NewInterventionDocumentView.as_view(), name='new-doc'),
@@ -57,10 +57,10 @@ urlpatterns = [
     path('<id>/deduction/<deduction_id>/remove', RemoveInterventionDeductionView.as_view(), name='remove-deduction'),
 
     # Revocation routes
-    path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
+    path('<id>/revocation/new', NewInterventionRevocationView.as_view(), name='new-revocation'),
-    path('<id>/revocation/<revocation_id>/edit', edit_revocation_view, name='edit-revocation'),
+    path('<id>/revocation/<revocation_id>/edit', EditInterventionRevocationView.as_view(), name='edit-revocation'),
-    path('<id>/revocation/<revocation_id>/remove', remove_revocation_view, name='remove-revocation'),
+    path('<id>/revocation/<revocation_id>/remove', RemoveInterventionRevocationView.as_view(), name='remove-revocation'),
-    path('revocation/<doc_id>', get_revocation_view, name='get-doc-revocation'),
+    path('revocation/<doc_id>', GetInterventionRevocationView.as_view(), name='get-doc-revocation'),
 
     # Autocomplete
     path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="autocomplete"),

intervention/views/check.py

@@ -5,35 +5,44 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from intervention.forms.modals.check import CheckModalForm
 from intervention.models import Intervention
 from konova.decorators import registration_office_group_required, shared_access_required
 from konova.utils.message_templates import INTERVENTION_INVALID
 
+class InterventionCheckView(LoginRequiredMixin, View):
 
-@login_required
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-@registration_office_group_required
+        """ Renders check form for an intervention
-@shared_access_required(Intervention, "id")
-def check_view(request: HttpRequest, id: str):
-    """ Renders check form for an intervention
 
-    Args:
+        Args:
-        request (HttpRequest): The incoming request
+            request (HttpRequest): The incoming request
-        id (str): Intervention's id
+            id (str): Intervention's id
 
-    Returns:
+        Returns:
 
-    """
+        """
-    intervention = get_object_or_404(Intervention, id=id)
+        intervention = get_object_or_404(Intervention, id=id)
-    form = CheckModalForm(request.POST or None, instance=intervention, request=request)
+        form = CheckModalForm(request.POST or None, instance=intervention, request=request)
-    return form.process_request(
+        return form.process_request(
-        request,
+            request,
-        msg_success=_("Check performed"),
+            msg_success=_("Check performed"),
-        msg_error=INTERVENTION_INVALID
+            msg_error=INTERVENTION_INVALID
-    )
+        )
 
+    @method_decorator(registration_office_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
+
+    @method_decorator(registration_office_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)

intervention/views/compensation.py

@@ -5,42 +5,50 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpRequest, Http404
+from django.http import HttpRequest, Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from intervention.models import Intervention
-from konova.decorators import shared_access_required, login_required_modal
+from konova.decorators import shared_access_required
 from konova.forms.modals import RemoveModalForm
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
 
 
-@login_required_modal
+class RemoveCompensationFromInterventionView(LoginRequiredMixin, View):
-@login_required
-@shared_access_required(Intervention, "id")
-def remove_compensation_view(request: HttpRequest, id: str, comp_id: str):
-    """ Renders a modal view for removing the compensation
 
-    Args:
+    def __process_request(self, request: HttpRequest, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
-        request (HttpRequest): The incoming request
+        """ Renders a modal view for removing the compensation
-        id (str): The compensation's id
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The compensation's id
 
-    """
+        Returns:
-    intervention = get_object_or_404(Intervention, id=id)
+
-    try:
+        """
-        comp = intervention.compensations.get(
+        intervention = get_object_or_404(Intervention, id=id)
-            id=comp_id
+        try:
+            comp = intervention.compensations.get(
+                id=comp_id
+            )
+        except ObjectDoesNotExist:
+            raise Http404("Unknown compensation")
+        form = RemoveModalForm(request.POST or None, instance=comp, request=request)
+        return form.process_request(
+            request=request,
+            msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
+            redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
         )
-    except ObjectDoesNotExist:
-        raise Http404("Unknown compensation")
-    form = RemoveModalForm(request.POST or None, instance=comp, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
-        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
-    )
 
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, comp_id, *args, **kwargs)
+
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, comp_id, *args, **kwargs)

intervention/views/intervention.py

@@ -7,9 +7,12 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render, redirect
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from intervention.forms.intervention import EditInterventionForm, NewInterventionForm
 from intervention.models import Intervention
@@ -56,22 +59,46 @@ class IndexInterventionView(AbstractIndexView):
         return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class NewInterventionView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "intervention/form/view.html"
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new intervention creation
 
-    Args:
+    @method_decorator(default_group_required)
-        request (HttpRequest): The incoming request
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
 
-    Returns:
+        """
+        Renders a view for a new intervention creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewInterventionForm()
+        geom_form = SimpleGeomForm(read_only=False)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New intervention"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new intervention creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewInterventionForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
 
-    """
-    template = "intervention/form/view.html"
-    data_form = NewInterventionForm(request.POST or None)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             intervention = data_form.save(request.user, geom_form)
@@ -83,6 +110,7 @@ def new_view(request: HttpRequest):
                         intervention.identifier
                     )
                 )
+
             messages.success(request, _("Intervention {} added").format(intervention.identifier))
             if geom_form.has_geometry_simplified():
                 messages.info(
@@ -96,52 +124,86 @@ def new_view(request: HttpRequest):
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("intervention:detail", id=intervention.id)
+
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+        context = {
-        # For clarification: nothing in this case
+            "form": data_form,
-        pass
+            "geom_form": geom_form,
-    context = {
+            TAB_TITLE_IDENTIFIER: _("New intervention"),
-        "form": data_form,
+        }
-        "geom_form": geom_form,
+        context = BaseContext(request, context).context
-        TAB_TITLE_IDENTIFIER: _("New intervention"),
+        return render(request, self._TEMPLATE, context)
-    }
+
-    context = BaseContext(request, context).context
-    return render(request, template, context)
 
 class InterventionIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = Intervention
 
 
-@login_required
+class EditInterventionView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "intervention/form/view.html"
-@shared_access_required(Intervention, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing interventions
 
-    Args:
+    @method_decorator(default_group_required)
-        request (HttpRequest): The incoming request
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for editing interventions
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention identifier
 
-    """
+        Returns:
-    template = "intervention/form/view.html"
+            HttpResponse: The rendered view
-    # Get object from db
+        """
-    intervention = get_object_or_404(Intervention, id=id)
-    if intervention.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("intervention:detail", id=id)
 
-    # Create forms, initialize with values from db/from POST request
+        # Get object from db
-    data_form = EditInterventionForm(request.POST or None, instance=intervention)
+        intervention = get_object_or_404(Intervention, id=id)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention)
+        if intervention.is_recorded:
-    if request.method == "POST":
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("intervention:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditInterventionForm(request.POST or None, instance=intervention)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """
+        Process saved form content
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention id
+
+        Returns:
+            HttpResponse:
+        """
+        # Get object from db
+        intervention = get_object_or_404(Intervention, id=id)
+        if intervention.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("intervention:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditInterventionForm(request.POST or None, instance=intervention)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention)
         if data_form.is_valid() and geom_form.is_valid():
             # The data form takes the geom form for processing, as well as the performing user
             # Save the current state of recorded|checked to inform the user in case of a status reset due to editing
@@ -155,25 +217,17 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("intervention:detail", id=intervention.id)
-        else:
+        context = {
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
+            "form": data_form,
-    else:
+            "geom_form": geom_form,
-        # For clarification: nothing in this case
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
-        pass
+        }
-    context = {
+        context = BaseContext(request, context).context
-        "form": data_form,
+        return render(request, self._TEMPLATE, context)
-        "geom_form": geom_form,
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
-

intervention/views/remove.py

@@ -3,6 +3,7 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
 
 from intervention.models import Intervention
@@ -15,5 +16,5 @@ class RemoveInterventionView(AbstractRemoveView):
     _REDIRECT_URL = "intervention:index"
 
     @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        return super().dispatch(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

intervention/views/revocation.py

@@ -6,10 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from intervention.forms.modals.revocation import NewRevocationModalForm, EditRevocationModalForm, \
     RemoveRevocationModalForm
@@ -19,100 +21,125 @@ from konova.utils.documents import get_document
 from konova.utils.message_templates import REVOCATION_ADDED, DATA_UNSHARED, REVOCATION_EDITED, REVOCATION_REMOVED
 
 
-@login_required
+class NewInterventionRevocationView(LoginRequiredMixin, View):
-@default_group_required
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-@shared_access_required(Intervention, "id")
+        """ Renders sharing form for an intervention
-def new_revocation_view(request: HttpRequest, id: str):
-    """ Renders sharing form for an intervention
 
-    Args:
+        Args:
-        request (HttpRequest): The incoming request
+            request (HttpRequest): The incoming request
-        id (str): Intervention's id
+            id (str): Intervention's id
 
-    Returns:
+        Returns:
 
-    """
+        """
-    intervention = get_object_or_404(Intervention, id=id)
+        intervention = get_object_or_404(Intervention, id=id)
-    form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
+        form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention,
-    return form.process_request(
+                                      request=request)
-        request,
+        return form.process_request(
-        msg_success=REVOCATION_ADDED,
-        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
-    )
-
-
-@login_required
-@default_group_required
-def get_revocation_view(request: HttpRequest, doc_id: str):
-    """ Returns the revocation document as downloadable file
-
-    Wraps the generic document fetcher function from konova.utils.
-
-    Args:
-        request (HttpRequest): The incoming request
-        doc_id (str): The document id
-
-    Returns:
-
-    """
-    doc = get_object_or_404(RevocationDocument, id=doc_id)
-    # File download only possible if related instance is shared with user
-    if not doc.instance.legal.intervention.users.filter(id=request.user.id):
-        messages.info(
             request,
-            DATA_UNSHARED
+            msg_success=REVOCATION_ADDED,
+            redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
         )
-        return redirect("intervention:detail", id=doc.instance.id)
+
-    return get_document(doc)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
 
 
-@login_required
+class GetInterventionRevocationView(LoginRequiredMixin, View):
-@default_group_required
+    @method_decorator(default_group_required)
-@shared_access_required(Intervention, "id")
+    def get(self, request: HttpRequest, doc_id: str, *args, **kwargs) -> HttpResponse:
-def edit_revocation_view(request: HttpRequest, id: str, revocation_id: str):
+        """ Returns the revocation document as downloadable file
-    """ Renders a edit view for a revocation
 
-    Args:
+        Wraps the generic document fetcher function from konova.utils.
-        request (HttpRequest): The incoming request
-        id (str): The intervention's id as string
-        revocation_id (str): The revocation's id as string
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            doc_id (str): The document id
 
-    """
+        Returns:
-    intervention = get_object_or_404(Intervention, id=id)
-    revocation = get_object_or_404(Revocation, id=revocation_id)
 
-    form = EditRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, revocation=revocation, request=request)
+        """
-    return form.process_request(
+        doc = get_object_or_404(RevocationDocument, id=doc_id)
-        request,
+        # File download only possible if related instance is shared with user
-        REVOCATION_EDITED,
+        if not doc.instance.legal.intervention.users.filter(id=request.user.id):
-        redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+            messages.info(
-    )
+                request,
+                DATA_UNSHARED
+            )
+            return redirect("intervention:detail", id=doc.instance.id)
+        return get_document(doc)
 
 
-@login_required_modal
+class EditInterventionRevocationView(LoginRequiredMixin, View):
-@login_required
+    def __process_request(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
-@default_group_required
+        """ Renders a edit view for a revocation
-@shared_access_required(Intervention, "id")
-def remove_revocation_view(request: HttpRequest, id: str, revocation_id: str):
-    """ Renders a remove view for a revocation
 
-    Args:
+        Args:
-        request (HttpRequest): The incoming request
+            request (HttpRequest): The incoming request
-        id (str): The intervention's id as string
+            id (str): The intervention's id as string
-        revocation_id (str): The revocation's id as string
+            revocation_id (str): The revocation's id as string
 
-    Returns:
+        Returns:
 
-    """
+        """
-    intervention = get_object_or_404(Intervention, id=id)
+        intervention = get_object_or_404(Intervention, id=id)
-    revocation = get_object_or_404(Revocation, id=revocation_id)
+        revocation = get_object_or_404(Revocation, id=revocation_id)
 
-    form = RemoveRevocationModalForm(request.POST or None, instance=intervention, revocation=revocation, request=request)
+        form = EditRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention,
-    return form.process_request(
+                                       revocation=revocation, request=request)
-        request,
+        return form.process_request(
-        REVOCATION_REMOVED,
+            request,
-        redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+            REVOCATION_EDITED,
-    )
+            redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+        )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
+
+
+class RemoveInterventionRevocationView(LoginRequiredMixin, View):
+    def __process_request(self, request, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders a remove view for a revocation
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id as string
+            revocation_id (str): The revocation's id as string
+
+        Returns:
+
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        revocation = get_object_or_404(Revocation, id=revocation_id)
+
+        form = RemoveRevocationModalForm(request.POST or None, instance=intervention, revocation=revocation,
+                                         request=request)
+        return form.process_request(
+            request,
+            REVOCATION_REMOVED,
+            redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+        )
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)

konova/models/geometry.py

@@ -103,9 +103,12 @@ class Geometry(BaseResource):
         resolved_conflicts = all_conflicted_by_conflicts.exclude(id__in=still_conflicting_conflicts)
         resolved_conflicts.delete()
 
-    def get_data_objects(self):
+    def get_data_objects(self, limit_to_attrs: list = None):
         """ Getter for all objects which are related to this geometry
 
+        Using the limit_to_attrs we can limit the amount of returned data directly onto the data object attributes
+        we want to have. Reduces memory consumption and runtime.
+
         Returns:
             objs (list): The list of objects
         """
@@ -121,15 +124,20 @@ class Geometry(BaseResource):
             set_objs = _set.filter(
                 deleted=None
             )
-            objs += set_objs
+            if limit_to_attrs:
+                objs += set_objs.values_list(*limit_to_attrs, flat=True)
+            else:
+                objs += set_objs
 
         # ... but we need a special treatment for compensations, since they can be deleted directly OR inherit their
         # de-facto-deleted status from their deleted parent intervention
         comp_objs = self.compensation_set.filter(
             Q(deleted=None) & Q(intervention__deleted=None)
         )
-        objs += comp_objs
+        if limit_to_attrs:
-
+            objs += comp_objs.values_list(*limit_to_attrs, flat=True)
+        else:
+            objs += comp_objs
         return objs
 
     def get_data_object(self):
@@ -407,7 +415,10 @@ class Geometry(BaseResource):
         """
         output_geom = input_geom
         if not isinstance(input_geom, MultiPolygon):
-            output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
+            try:
+                output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
+            except TypeError as e:
+                raise AssertionError(f"Only (Multi)Polygon allowed! Could not convert {input_geom.geom_type} to MultiPolygon")
         return output_geom
 
     @staticmethod

konova/models/object.py

@@ -677,19 +677,23 @@ class GeoReferencedMixin(models.Model):
             return request
 
         instance_objs = []
+        needed_data_object_attrs = [
+            "identifier"
+        ]
         conflicts = self.geometry.conflicts_geometries.iterator()
 
         for conflict in conflicts:
-            instance_objs += conflict.affected_geometry.get_data_objects()
+            # Only check the affected geometry of this conflict, since we know the conflicting geometry is self.geometry
+            instance_objs += conflict.affected_geometry.get_data_objects(needed_data_object_attrs)
 
         conflicts = self.geometry.conflicted_by_geometries.iterator()
         for conflict in conflicts:
-            instance_objs += conflict.conflicting_geometry.get_data_objects()
+            # Only check the conflicting geometry of this conflict, since we know the affected geometry is self.geometry
+            instance_objs += conflict.conflicting_geometry.get_data_objects(needed_data_object_attrs)
 
         add_message = len(instance_objs) > 0
         if add_message:
-            instance_identifiers = [x.identifier for x in instance_objs]
+            instance_identifiers = ", ".join(instance_objs)
-            instance_identifiers = ", ".join(instance_identifiers)
             message_str = GEOMETRY_CONFLICT_WITH_TEMPLATE.format(instance_identifiers)
             messages.info(request, message_str)
         return request

konova/utils/exception_reporter.py

@@ -5,6 +5,9 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 11.12.23
 
 """
+import json
+from json import JSONDecodeError
+
 from django.views.debug import ExceptionReporter
 
 
@@ -30,7 +33,7 @@ class KonovaExceptionReporter(ExceptionReporter):
         """
         whitelist = [
             "is_email",
-            "unicdoe_hint",
+            "unicode_hint",
             "frames",
             "request",
             "user_str",
@@ -39,6 +42,8 @@ class KonovaExceptionReporter(ExceptionReporter):
             "raising_view_name",
             "exception_type",
             "exception_value",
+            "filtered_GET_items",
+            "filtered_POST_items",
         ]
         clean_data = dict()
         for entry in whitelist:
@@ -56,7 +61,28 @@ class KonovaExceptionReporter(ExceptionReporter):
         """
         tb_data = super().get_traceback_data()
 
+        return_data = tb_data
         if self.is_email:
-            tb_data = self._filter_traceback_data(tb_data)
+            filtered_data = dict()
+            filtered_data.update(self._filter_traceback_data(tb_data))
+            filtered_data.update(self._filter_POST_body(tb_data))
+            return_data = filtered_data
+        return return_data
 
-        return tb_data
+    def _filter_POST_body(self, tb_data: dict):
+        """ Filters POST body from traceback data
+
+        """
+        post_data = tb_data.get("request", None)
+        if post_data:
+            post_data = post_data.body
+            try:
+                post_data = json.loads(post_data)
+            except JSONDecodeError:
+                pass
+        post_data = {
+            "filtered_POST_items": [
+                ("body", post_data),
+            ]
+        }
+        return post_data

konova/utils/mailer.py

@@ -5,7 +5,7 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.11.20
 
 """
-from django.core.mail import send_mail
+from django.core.mail import send_mail, EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy as _
 
@@ -45,6 +45,19 @@ class Mailer:
             auth_password=self.auth_password
         )
 
+    def send_via_bcc(self, recipient_list: list, subject: str, msg: str):
+        """
+        Sends a mail with subject and message where recipients will be masked via bcc
+        """
+        email_obj = EmailMultiAlternatives(
+            subject,
+            msg,
+            self.from_mail,
+            bcc=recipient_list,
+        )
+        email_obj.attach_alternative(msg, "text/html")
+        return email_obj.send(fail_silently=self.fail_silently)
+
     def send_mail_shared_access_removed(self, obj, user, municipals_names):
         """ Send a mail if user has no access to the object anymore
 
@@ -115,7 +128,7 @@ class Mailer:
         }
         msg = render_to_string("email/sharing/shared_access_given_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared access given").format(obj.identifier),
             msg
@@ -141,7 +154,7 @@ class Mailer:
         }
         msg = render_to_string("email/sharing/shared_access_removed_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared access removed").format(obj.identifier),
             msg
@@ -167,7 +180,7 @@ class Mailer:
         }
         msg = render_to_string("email/recording/shared_data_unrecorded_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data unrecorded").format(obj.identifier),
             msg
@@ -193,7 +206,7 @@ class Mailer:
         }
         msg = render_to_string("email/recording/shared_data_recorded_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data recorded").format(obj.identifier),
             msg
@@ -219,7 +232,7 @@ class Mailer:
         }
         msg = render_to_string("email/checking/shared_data_checked_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data checked").format(obj.identifier),
             msg
@@ -244,7 +257,7 @@ class Mailer:
         }
         msg = render_to_string("email/other/deduction_changed_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Deduction changed").format(obj.identifier),
             msg
@@ -270,7 +283,7 @@ class Mailer:
         }
         msg = render_to_string("email/deleting/shared_data_deleted_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data deleted").format(obj.identifier),
             msg

konova/utils/tables.py

@@ -178,7 +178,9 @@ class TableRenderMixin:
         if len(value) > max_length:
             value = f"{value[:max_length]}..."
         value = format_html(
-            f'<div title="{value_orig}">{value}</div>'
+            '<div title="{}">{}</div>',
+            value_orig,
+            value
         )
         return value
 
@@ -222,7 +224,7 @@ class TableRenderMixin:
             tooltip=_("Full access granted") if is_entry_shared else _("Access not granted"),
             icn_class="fas fa-edit rlp-r-inv" if is_entry_shared else "far fa-edit",
         )
-        return format_html(html)
+        return format_html(html, None)
 
 
 class TableOrderMixin:

konova/views/detail.py

@@ -3,6 +3,8 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from abc import ABC
+
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
@@ -11,16 +13,13 @@ from django.views import View
 from konova.decorators import uuid_required, any_group_check
 
 
-class AbstractDetailView(LoginRequiredMixin, View):
+class AbstractDetailView(LoginRequiredMixin, View, ABC):
     _TEMPLATE = None
 
-    class Meta:
-        abstract = True
-
     @method_decorator(uuid_required)
-    @method_decorator(any_group_check)
     def dispatch(self, request, *args, **kwargs):
         return super().dispatch(request, *args, **kwargs)
 
+    @method_decorator(any_group_check)
     def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         raise NotImplementedError()

konova/views/home.py

@@ -53,6 +53,7 @@ class HomeView(LoginRequiredMixin, View):
         # Repeat for other objects
         comps = Compensation.objects.filter(
             deleted=None,
+            intervention__deleted=None,
         )
         user_comps = comps.filter(
             Q(intervention__users__in=[user]) | Q(intervention__teams__in=user_teams)

konova/views/identifier.py

@@ -3,6 +3,8 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from abc import ABC
+
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, JsonResponse
 from django.utils.decorators import method_decorator
@@ -12,16 +14,10 @@ from konova.decorators import default_group_required
 from konova.utils.generators import IdentifierGenerator
 
 
-class AbstractIdentifierGeneratorView(LoginRequiredMixin, View):
+class AbstractIdentifierGeneratorView(LoginRequiredMixin, View, ABC):
     _MODEL = None
 
-    class Meta:
-        abstract = True
-
     @method_decorator(default_group_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
     def get(self, request: HttpRequest, *args, **kwargs):
         generator = IdentifierGenerator(model=self._MODEL)
         identifier = generator.generate_id()

konova/views/index.py

@@ -3,6 +3,8 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from abc import ABC
+
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
@@ -11,15 +13,9 @@ from django.views import View
 from konova.decorators import any_group_check
 
 
-class AbstractIndexView(LoginRequiredMixin, View):
+class AbstractIndexView(LoginRequiredMixin, View, ABC):
     _TEMPLATE = "generic_index.html"
 
-    class Meta:
-        abstract = True
-
     @method_decorator(any_group_check)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
     def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         raise NotImplementedError()

konova/views/remove.py

@@ -3,8 +3,10 @@ Author: Michel Peltriaux
 Created on: 14.12.25
 
 """
+from abc import ABC
+
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -14,19 +16,16 @@ from konova.decorators import default_group_required
 from konova.forms.modals import RemoveModalForm
 
 
-class AbstractRemoveView(LoginRequiredMixin, View):
+class AbstractRemoveView(LoginRequiredMixin, View, ABC):
     _MODEL = None
     _REDIRECT_URL = None
     _FORM = RemoveModalForm
 
-    class Meta:
-        abstract = True
-
-    @method_decorator(default_group_required)
     def dispatch(self, request, *args, **kwargs):
         return super().dispatch(request, *args, **kwargs)
 
-    def __process_request(self, request: HttpRequest, id: str):
+    @method_decorator(default_group_required)
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         obj = self._MODEL.objects.get(id=id)
         identifier = obj.identifier
         form = self._FORM(request.POST or None, instance=obj, request=request)
@@ -36,7 +35,7 @@ class AbstractRemoveView(LoginRequiredMixin, View):
             redirect_url=reverse(self._REDIRECT_URL)
         )
 
-    def get(self, request: HttpRequest, id: str):
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """ GET endpoint for removing via modal form
 
         Due to the legacy logic of the form (which processes get and post requests directly), we simply need to pipe
@@ -48,9 +47,9 @@ class AbstractRemoveView(LoginRequiredMixin, View):
 
         Returns:
         """
-        return self.__process_request(request, id)
+        return self.__process_request(request, id, *args, **kwargs)
 
-    def post(self, request: HttpRequest, id: str):
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """  POST endpoint for removing via modal form
 
         Due to the legacy logic of the form (which processes get and post requests directly), we simply need to pipe
@@ -62,4 +61,4 @@ class AbstractRemoveView(LoginRequiredMixin, View):
 
         Returns:
         """
-        return self.__process_request(request, id)
+        return self.__process_request(request, id, *args, **kwargs)

requirements.txt

@@ -1,63 +1,65 @@
 amqp==5.3.1
-asgiref==3.8.1
+asgiref==3.11.1
 async-timeout==5.0.1
-beautifulsoup4==4.13.0b2
+beautifulsoup4==4.14.3
-billiard==4.2.1
+billiard==4.2.4
 cached-property==2.0.1
-celery==5.4.0
+celery==5.6.2
-certifi==2024.12.14
+certifi==2026.2.25
-cffi==1.17.1
+cffi==2.0.0
-chardet==5.2.0
+chardet==6.0.0.post1
-charset-normalizer==3.4.0
+charset-normalizer==3.4.4
-click==8.1.8
+click==8.3.1
 click-didyoumean==0.3.1
-click-plugins==1.1.1
+click-plugins==1.1.1.2
 click-repl==0.3.0
-coverage==7.6.9
+coverage==7.13.4
-cryptography==44.0.0
+cryptography==46.0.5
-Deprecated==1.2.15
+Deprecated==1.3.1
-Django==5.1.4
+Django==6.0.2
-django-autocomplete-light==3.11.0
+django-autocomplete-light==3.12.1
 django-bootstrap-modal-forms==3.0.5
-django-bootstrap4==24.4
+django-bootstrap4==26.1
-django-environ==0.11.2
+django-environ==0.13.0
-django-filter==24.3
+django-filter==25.2
 django-fontawesome-5==1.0.18
-django-oauth-toolkit==3.0.1
+django-oauth-toolkit==3.2.0
-django-tables2==2.7.1
+django-tables2==2.8.0
 et_xmlfile==2.0.0
-gunicorn==23.0.0
+gunicorn==25.1.0
-idna==3.10
+idna==3.11
-importlib_metadata==8.5.0
+importlib_metadata==8.7.1
+itsdangerous==2.2.0
 jwcrypto==1.5.6
-kombu==5.4.0rc1
+kombu==5.6.2
-oauthlib==3.2.2
+oauthlib==3.3.1
 openpyxl==3.2.0b1
-packaging==24.2
+packaging==26.0
 pika==1.3.2
-pillow==11.0.0
+pillow==12.1.1
-prompt_toolkit==3.0.48
+prompt_toolkit==3.0.52
-psycopg==3.2.3
+psycopg==3.3.3
-psycopg-binary==3.2.3
+psycopg-binary==3.3.3
-pycparser==2.22
+pycparser==3.0
-pyparsing==3.2.0
+pyparsing==3.3.2
 pypng==0.20220715.0
-pyproj==3.7.0
+pyproj==3.7.2
 python-dateutil==2.9.0.post0
-pytz==2024.2
+pytz==2025.2
-PyYAML==6.0.2
+PyYAML==6.0.3
-qrcode==7.3.1
+qrcode==8.2
-redis==5.1.0b6
+redis==7.2.1
-requests==2.32.3
+requests==2.32.5
-six==1.16.0
+six==1.17.0
-soupsieve==2.5
+soupsieve==2.8.3
-sqlparse==0.5.1
+sqlparse==0.5.5
-typing_extensions==4.12.2
+typing_extensions==4.15.0
-tzdata==2024.2
+tzdata==2025.3
-urllib3==2.3.0
+tzlocal==5.3.1
+urllib3==2.6.3
 vine==5.1.0
-wcwidth==0.2.13
+wcwidth==0.6.0
 webservices==0.7
-wrapt==1.16.0
+wrapt==2.1.1
-xmltodict==0.14.2
+xmltodict==1.0.4
-zipp==3.21.0
+zipp==3.23.0

templates/400.html

@@ -5,7 +5,7 @@
     <div class="jumbotron">
         <div class="row">
             <div class="col-auto">
-                <img src="{% static 'images/error_imgs/croc_technician_400.png' %}" style="max-width: 150px">
+                <img src="{% static 'images/error_imgs/croc_technician_400_sm.png' %}" style="max-width: 150px">
             </div>
             <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
                 <h1 class="display-4">{% fa5_icon 'question-circle' %}400</h1>

templates/500.html

@@ -5,7 +5,7 @@
     <div class="jumbotron">
         <div class="row">
             <div class="col-auto">
-                <img src="{% static 'images/error_imgs/croc_technician_500.png' %}" style="max-width: 150px">
+                <img src="{% static 'images/error_imgs/croc_technician_500_sm.png' %}" style="max-width: 150px">
             </div>
             <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
                 <h1 class="display-4">{% fa5_icon 'fire-alt' %} 500</h1>

templates/map/client/dist/netgis.min.js

@@ -69,10 +69,10 @@ netgis.Controls.prototype.onParentPointerDown=function(a){netgis.util.insideElem
 netgis.Controls.prototype.onGeolocToggleActive=function(a){a.target!==this.inputGeolocActive&&(this.inputGeolocActive.checked=a.detail.on)};netgis.Controls.prototype.onGeolocToggleCenter=function(a){a.target!==this.inputGeolocCenter&&(this.inputGeolocCenter.checked=a.detail.on)};netgis=netgis||{};
 netgis.Events={CLIENT_CONTEXT_RESPONSE:"client-context-response",CLIENT_SET_MODE:"client-set-mode",PLUGIN_TOGGLE:"plugin-toggle",CONTROLS_BUTTON_CLICK:"controls-button-click",MAP_ZOOM:"map-zoom",MAP_ZOOM_HOME:"map-zoom-home",MAP_ZOOM_LONLAT:"map-zoom-lonlat",MAP_ZOOM_SCALE:"map-zoom-scale",MAP_ZOOM_LAYER:"map-zoom-layer",MAP_ZOOM_LEVEL:"map-zoom-level",MAP_LAYER_CREATE:"map-layer-create",MAP_LAYER_TOGGLE:"map-layer-toggle",MAP_LAYER_TRANSPARENCY:"map-layer-transparency",MAP_LAYER_ORDER:"map-layer-order",MAP_LAYER_DELETE:"map-layer-delete",
 MAP_VIEW_CHANGE:"map-view-change",MAP_VIEW_NEXT:"map-view-next",MAP_VIEW_PREV:"map-view-prev",MAP_CLICK:"map-click",MAP_FEATURE_ENTER:"map-feature-enter",MAP_FEATURE_CLICK:"map-feature-click",MAP_FEATURE_LEAVE:"map-feature-leave",MAP_SNAP_TOGGLE:"map-snap-toggle",MAP_EDIT_LAYER_CHANGE:"map-edit-layer-change",MAP_EDIT_LAYER_LOADED:"map-edit-layer-loaded",MAP_COPY_FEATURE_TO_EDIT:"map-copy-feature-to-edit",PANEL_TOGGLE:"panel-toggle",PANEL_RESIZE:"panel-resize",WINDOW_TOGGLE:"window-toggle",WINDOW_RESIZE:"window-resize",
-TREE_ITEM_CHANGE:"tree-item-change",TREE_ITEM_SLIDER_CHANGE:"tree-item-slider-change",TREE_ITEM_ORDER_CHANGE:"tree-item-order-change",TREE_BUTTON_CLICK:"tree-button-click",LAYERTREE_TOGGLE:"layertree-toggle",LEGEND_TOGGLE:"legend-toggle",GEOLOCATION_SHOW_OPTIONS:"geolocation-show-options",GEOLOCATION_TOGGLE_ACTIVE:"geolocation-toggle-active",GEOLOCATION_TOGGLE_CENTER:"geolocation-toggle-center",GEOLOCATION_CHANGE:"geolocation-change",TOOLBOX_TOGGLE:"toolbox-toggle",TOOLBOX_BUTTON_CLICK:"toolbox-button-click",
+TABS_CHANGE:"tabs-change",TREE_ITEM_CHANGE:"tree-item-change",TREE_ITEM_SLIDER_CHANGE:"tree-item-slider-change",TREE_ITEM_ORDER_CHANGE:"tree-item-order-change",TREE_ITEM_REMOVE:"tree-item-remove",TREE_BUTTON_CLICK:"tree-button-click",LAYERTREE_TOGGLE:"layertree-toggle",LEGEND_TOGGLE:"legend-toggle",GEOLOCATION_SHOW_OPTIONS:"geolocation-show-options",GEOLOCATION_TOGGLE_ACTIVE:"geolocation-toggle-active",GEOLOCATION_TOGGLE_CENTER:"geolocation-toggle-center",GEOLOCATION_CHANGE:"geolocation-change",TOOLBOX_TOGGLE:"toolbox-toggle",
-MENU_BUTTON_CLICK:"menu-button-click",MENU_CHECKBOX_CHANGE:"menu-checkbox-change",MENU_SELECT_CHANGE:"menu-select-change",CONTEXTMENU_SHOW:"contextmenu-show",CONTEXTMENU_BUTTON_CLICK:"contextmenu-button-click",CONTEXTMENU_CHECKBOX_CHANGE:"contextmenu-checkbox-change",CONTEXTMENU_SLIDER_CHANGE:"contextmenu-slider-change",SEARCH_CHANGE:"search-change",SEARCH_SELECT:"search-select",SEARCH_CLEAR:"search-clear",SEARCHPLACE_TOGGLE:"searchplace-toggle",SEARCHPARCEL_TOGGLE:"searchparcel-toggle",SEARCHPARCEL_RESET:"searchparcel-reset",
+TOOLBOX_BUTTON_CLICK:"toolbox-button-click",MENU_BUTTON_CLICK:"menu-button-click",MENU_CHECKBOX_CHANGE:"menu-checkbox-change",MENU_SELECT_CHANGE:"menu-select-change",CONTEXTMENU_SHOW:"contextmenu-show",CONTEXTMENU_BUTTON_CLICK:"contextmenu-button-click",CONTEXTMENU_CHECKBOX_CHANGE:"contextmenu-checkbox-change",CONTEXTMENU_SLIDER_CHANGE:"contextmenu-slider-change",SEARCH_CHANGE:"search-change",SEARCH_SELECT:"search-select",SEARCH_CLEAR:"search-clear",SEARCHPLACE_TOGGLE:"searchplace-toggle",SEARCHPARCEL_TOGGLE:"searchparcel-toggle",
-SEARCHPARCEL_PARCELS_RESPONSE:"searchparcel-parcels-response",SEARCHPARCEL_ITEM_ENTER:"searchparcel-item-enter",SEARCHPARCEL_ITEM_LEAVE:"searchparcel-item-leave",SEARCHPARCEL_ITEM_CLICK:"searchparcel-item-click",SEARCHPARCEL_ITEM_IMPORT:"searchparcel-item-import",MEASURE_CLEAR:"measure-clear",SELECT_MULTI_TOGGLE:"select-multi-toggle",DRAW_BUFFER_TOGGLE:"draw-buffer-toggle",DRAW_BUFFER_CHANGE:"draw-buffer-change",BUFFER_CHANGE:"buffer-change",BUFFER_ACCEPT:"buffer-accept",IMPORT_LAYER_SHOW:"import-layer-show",
+SEARCHPARCEL_RESET:"searchparcel-reset",SEARCHPARCEL_PARCELS_RESPONSE:"searchparcel-parcels-response",SEARCHPARCEL_ITEM_ENTER:"searchparcel-item-enter",SEARCHPARCEL_ITEM_LEAVE:"searchparcel-item-leave",SEARCHPARCEL_ITEM_CLICK:"searchparcel-item-click",SEARCHPARCEL_ITEM_IMPORT:"searchparcel-item-import",MEASURE_CLEAR:"measure-clear",SELECT_MULTI_TOGGLE:"select-multi-toggle",DRAW_BUFFER_TOGGLE:"draw-buffer-toggle",DRAW_BUFFER_CHANGE:"draw-buffer-change",BUFFER_CHANGE:"buffer-change",BUFFER_ACCEPT:"buffer-accept",
-IMPORT_LAYER_ACCEPT:"import-layer-accept",IMPORT_LAYER_PREVIEW:"import-layer-preview",IMPORT_LAYER_PREVIEW_FEATURES:"import-layer-preview-features",IMPORT_GEOPORTAL_SUBMIT:"import-geoportal-submit",EXPORT_SHOW:"export-show",EXPORT_BEGIN:"export-begin",EXPORT_END:"export-end",TIMESLIDER_SHOW:"timeslider-show",TIMESLIDER_HIDE:"timeslider-hide",TIMESLIDER_SELECT:"timeslider-select"};netgis=netgis||{};netgis.Export=function(a){this.config=a;this.initElements(a);this.initSections()};netgis.Export.Config={title:"Export",logo:"",gif_worker:"/libs/gifjs/0.2.0/gif.worker.js",default_filename:"Export",default_margin:10};
+IMPORT_LAYER_SHOW:"import-layer-show",IMPORT_LAYER_ACCEPT:"import-layer-accept",IMPORT_LAYER_PREVIEW:"import-layer-preview",IMPORT_LAYER_PREVIEW_FEATURES:"import-layer-preview-features",IMPORT_GEOPORTAL_SUBMIT:"import-geoportal-submit",EXPORT_SHOW:"export-show",EXPORT_BEGIN:"export-begin",EXPORT_END:"export-end",TIMESLIDER_SHOW:"timeslider-show",TIMESLIDER_HIDE:"timeslider-hide",TIMESLIDER_SELECT:"timeslider-select"};netgis=netgis||{};netgis.Export=function(a){this.config=a;this.initElements(a);this.initSections()};netgis.Export.Config={title:"Export",logo:"",gif_worker:"/libs/gifjs/0.2.0/gif.worker.js",default_filename:"Export",default_margin:10};
 netgis.Export.prototype.initElements=function(a){a=a["export"];this.modal=new netgis.Modal(a.title?a.title:"Export");this.modal.container.classList.add("netgis-export");this.tabs=new netgis.Tabs(["PDF","JPEG","PNG","GIF","GeoJSON"]);this.tabs.container.style.position="absolute";this.tabs.container.style.left="0mm";this.tabs.container.style.right="0mm";this.tabs.container.style.top="12mm";this.tabs.container.style.bottom="0mm";this.tabs.attachTo(this.modal.content)};
 netgis.Export.prototype.initSections=function(){this.sections={};var a=0;this.sections.pdf=this.tabs.getContentSection(a);a+=1;this.addInputNumber(this.sections.pdf,"Breite (Pixel):",1600,0);this.addInputNumber(this.sections.pdf,"H\u00f6he (Pixel):",900,0);this.addInputNumber(this.sections.pdf,"Seitenr\u00e4nder (Millimeter):",10,0);this.addCheckbox(this.sections.pdf,"Querformat",!0);this.addButton(this.sections.pdf,"<i class='netgis-icon fas fa-save'></i><span>Exportieren</span>",this.onExportClickPDF.bind(this));
 this.sections.jpeg=this.tabs.getContentSection(a);a+=1;this.addInputNumber(this.sections.jpeg,"Breite (Pixel):",1600,0);this.addInputNumber(this.sections.jpeg,"H\u00f6he (Pixel):",900,0);this.addCheckbox(this.sections.jpeg,"Querformat",!0);this.addButton(this.sections.jpeg,"<i class='netgis-icon fas fa-save'></i><span>Exportieren</span>",this.onExportClickJPEG.bind(this));this.sections.png=this.tabs.getContentSection(a);a+=1;this.addInputNumber(this.sections.png,"Breite (Pixel):",1600,0);this.addInputNumber(this.sections.png,
@@ -93,17 +93,18 @@ null),b||netgis.util.invoke(this.container,netgis.Events.GEOLOCATION_TOGGLE_ACTI
 netgis.Geolocation.prototype.onCenterChange=function(a){};netgis.Geolocation.prototype.onPositionChange=function(a){netgis.util.invoke(this.container,netgis.Events.GEOLOCATION_CHANGE,{lon:a.coords.longitude,lat:a.coords.latitude,center:this.center})};netgis.Geolocation.prototype.onPositionError=function(a){this.error("Geolocation: "+a.message+" ("+a.code+")")};netgis.Geolocation.prototype.onGeolocToggleActive=function(a){a.target!==this.container&&this.setActive(a.detail.on)};
 netgis.Geolocation.prototype.onGeolocToggleCenter=function(a){a.target!==this.container&&(this.center=a.detail.on)};netgis=netgis||{};netgis.Import=function(a){this.config=a;this.initElements(a);this.initSections(a);this.initPreview()};netgis.Import.Config={title:"Import Layer",preview:!0,editable:!0,wms_options:[],wfs_options:[],wfs_proxy:"",geopackage_lib:"/libs/geopackage/4.2.3/",geoportal_tab:!0,geoportal_search_url:"",geoportal_autocomplete:!0};
 netgis.Import.prototype.initElements=function(a){a=a["import"];this.modal=new netgis.Modal(a.title?a.title:"Import");this.modal.container.classList.add("netgis-import");var b="WMS WFS GeoJSON GML GeoPackage Spatialite Shapefile".split(" ");a.geoportal_tab&&b.unshift("Geoportal");this.tabs=new netgis.Tabs(b);this.tabs.container.style.position="absolute";this.tabs.container.style.left="0mm";this.tabs.container.style.right="0mm";this.tabs.container.style.top="12mm";this.tabs.container.style.bottom="0mm";
-this.tabs.attachTo(this.modal.content)};
+this.tabs.container.addEventListener(netgis.Events.TABS_CHANGE,this.onTabsChange.bind(this));this.tabs.attachTo(this.modal.content)};
 netgis.Import.prototype.initSections=function(a){this.sections={};var b=0;a["import"]&&!0===a["import"].geoportal_tab&&(this.sections.geoportal=this.tabs.getContentSection(b),b+=1,this.sections.geoportal.classList.add("netgis-geoportal"),this.geoportalSearch=new netgis.Search("Thema, Schlagwort..."),this.geoportalSearch.autocomplete=a["import"].geoportal_autocomplete,this.geoportalSearch.container.addEventListener(netgis.Events.SEARCH_CHANGE,this.onGeoportalSearchChange.bind(this)),this.geoportalSearch.container.addEventListener(netgis.Events.SEARCH_CLEAR,
 this.onGeoportalSearchClear.bind(this)),this.geoportalSearch.attachTo(this.sections.geoportal),a=document.createElement("span"),a.innerHTML="Suche im Datenkatalog:",this.geoportalSearch.label.insertBefore(a,this.geoportalSearch.label.firstChild),a=document.createElement("button"),a.innerHTML="Suchen",a.className="netgis-color-a netgis-hover-c netgis-round netgis-shadow",a.setAttribute("type","button"),a.addEventListener("click",this.onGeoportalSearchButtonClick.bind(this)),this.geoportalSearch.label.appendChild(a),
-this.geoportalLoader=document.createElement("div"),this.geoportalLoader.className="netgis-loader netgis-text-a netgis-hide",this.geoportalLoader.innerHTML="<i class='fas fa-cog'></i>",this.sections.geoportal.appendChild(this.geoportalLoader),this.geoportalResults=new netgis.Tree,this.geoportalResults.container.addEventListener(netgis.Events.TREE_ITEM_CHANGE,this.onGeoportalTreeItemChange.bind(this)),this.geoportalResults.attachTo(this.sections.geoportal),this.geoportalSubmit=this.addButton(this.sections.geoportal,
+this.geoportalLoader=document.createElement("div"),this.geoportalLoader.className="netgis-loader netgis-text-a netgis-hide",this.geoportalLoader.innerHTML="<i class='fas fa-cog'></i>",this.sections.geoportal.appendChild(this.geoportalLoader),this.geoportalResults=new netgis.Tree,this.geoportalResults.container.addEventListener(netgis.Events.TREE_ITEM_CHANGE,this.onGeoportalTreeItemChange.bind(this)),this.geoportalResults.attachTo(this.sections.geoportal),a=document.createElement("div"),a.style.position=
-"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen<span class='netgis-count'></span></span>",this.onGeoportalSubmit.bind(this)));this.sections.wms=this.tabs.getContentSection(b);b+=1;this.addInputText(this.sections.wms,"WMS-URL:",this.config["import"].wms_options);this.addButton(this.sections.wms,"<i class='netgis-icon fas fa-cloud-download-alt'></i><span>Dienst laden</span>",this.onWMSLoadClick.bind(this));this.addInputText(this.sections.wms,"Bezeichnung:");this.addInputSelect(this.sections.wms,
+"absolute",a.style.left="0mm",a.style.right="0mm",a.style.bottom="0mm",a.style.padding="8mm",a.style.paddingTop="0mm",this.sections.geoportal.appendChild(a),this.geoportalSubmit=this.addButton(a,"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen<span class='netgis-count'></span></span>",this.onGeoportalSubmit.bind(this)));this.sections.wms=this.tabs.getContentSection(b);b+=1;a=document.createElement("div");a.className="netgis-search";this.sections.wms.appendChild(a);this.addInputText(a,
-"Ebene:");this.addInputSelect(this.sections.wms,"Format:");this.addButton(this.sections.wms,"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen</span>",this.onWMSAcceptClick.bind(this));this.showDetailsWMS(!1);this.sections.wfs=this.tabs.getContentSection(b);b+=1;this.addInputText(this.sections.wfs,"WFS-URL:",this.config["import"].wfs_options);this.addButton(this.sections.wfs,"<i class='netgis-icon fas fa-cloud-download-alt'></i><span>Dienst laden</span>",this.onWFSLoadClick.bind(this));
+"WMS-URL:",this.config["import"].wms_options).classList.add("netgis-round","netgis-shadow");this.addButton(this.sections.wms,"<i class='netgis-icon fas fa-cloud-download-alt'></i><span>Dienst laden</span>",this.onWMSLoadClick.bind(this));a=document.createElement("input");a.setAttribute("type","hidden");this.sections.wms.appendChild(a);console.info("WMS INPUT:",a);this.addInputText(this.sections.wms,"Bezeichnung:");this.addInputSelect(this.sections.wms,"Ebene:");this.addInputSelect(this.sections.wms,
-this.addInputText(this.sections.wfs,"Bezeichnung:");this.addInputSelect(this.sections.wfs,"Ebene:");this.addInputSelect(this.sections.wfs,"Format:");this.addButton(this.sections.wfs,"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen</span>",this.onWFSAcceptClick.bind(this));this.showDetailsWFS(!1);this.sections.geojson=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.geojson,"GeoJSON-Datei:",".geojson,.json");this.addText(this.sections.geojson,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");
+"Format:");this.addButton(this.sections.wms,"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen</span>",this.onWMSAcceptClick.bind(this));this.showDetailsWMS(!1);this.sections.wfs=this.tabs.getContentSection(b);b+=1;a=document.createElement("div");a.className="netgis-search";this.sections.wfs.appendChild(a);this.addInputText(a,"WFS-URL:",this.config["import"].wfs_options).classList.add("netgis-round","netgis-shadow");this.addButton(this.sections.wfs,"<i class='netgis-icon fas fa-cloud-download-alt'></i><span>Dienst laden</span>",
-this.addButton(this.sections.geojson,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onGeoJSONAcceptClick.bind(this));this.sections.gml=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.gml,"GML-Datei:",".gml,.xml");this.addText(this.sections.gml,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.gml,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",
+this.onWFSLoadClick.bind(this));this.addInputText(this.sections.wfs,"Bezeichnung:");this.addInputSelect(this.sections.wfs,"Ebene:");this.addInputSelect(this.sections.wfs,"Format:");this.addButton(this.sections.wfs,"<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen</span>",this.onWFSAcceptClick.bind(this));this.showDetailsWFS(!1);this.sections.geojson=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.geojson,"GeoJSON-Datei:",".geojson,.json");this.addText(this.sections.geojson,
-this.onGMLAcceptClick.bind(this));this.sections.geopackage=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.geopackage,"GeoPackage-Datei:",".gpkg");this.addText(this.sections.geopackage,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.geopackage,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onGeoPackageAcceptClick.bind(this));
+"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.geojson,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onGeoJSONAcceptClick.bind(this));this.sections.gml=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.gml,"GML-Datei:",".gml,.xml");this.addText(this.sections.gml,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");
-this.sections.spatialite=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.spatialite,"Spatialite-Datei:",".sqlite");this.addText(this.sections.spatialite,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.spatialite,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onSpatialiteAcceptClick.bind(this));this.sections.shapefile=
+this.addButton(this.sections.gml,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onGMLAcceptClick.bind(this));this.sections.geopackage=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.geopackage,"GeoPackage-Datei:",".gpkg");this.addText(this.sections.geopackage,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.geopackage,
-this.tabs.getContentSection(b);this.addInputFile(this.sections.shapefile,"Shapefile-Zip-Datei:",".zip");this.addText(this.sections.shapefile,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.shapefile,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onShapefileAcceptClick.bind(this))};
+"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onGeoPackageAcceptClick.bind(this));this.sections.spatialite=this.tabs.getContentSection(b);b+=1;this.addInputFile(this.sections.spatialite,"Spatialite-Datei:",".sqlite");this.addText(this.sections.spatialite,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.spatialite,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",
+this.onSpatialiteAcceptClick.bind(this));this.sections.shapefile=this.tabs.getContentSection(b);this.addInputFile(this.sections.shapefile,"Shapefile-Zip-Datei:",".zip");this.addText(this.sections.shapefile,"<h3>Unterst\u00fctzte Koordinatensysteme:</h3><ul><li>Web Mercator (EPSG:3857)</li><li>WGS84 / Lon-Lat (EPSG:4326)</li><li>ETRS89 / UTM Zone 32N (EPSG:25832)</li></ul>");this.addButton(this.sections.shapefile,"<i class='netgis-icon fas fa-check'></i><span>Datei laden</span>",this.onShapefileAcceptClick.bind(this))};
 netgis.Import.prototype.initPreview=function(){this.preview=new netgis.Modal("Vorschau");this.preview.attachTo(this.modal.content);this.previewMapContainer=document.createElement("div");this.previewMapContainer.className="netgis-preview-map";this.preview.content.appendChild(this.previewMapContainer);if(ol){var a=this.config.map;a={projection:a.projection,center:a.centerLonLat?ol.proj.fromLonLat(a.centerLonLat):a.center,zoom:a.zoom};this.previewMap=new ol.Map({target:this.previewMapContainer,view:new ol.View(a),
 pixelRatio:1,moveTolerance:3,controls:[]});this.previewMap.getView().padding=[10,10,10,10];this.previewMap.addLayer(new ol.layer.Tile({source:new ol.source.OSM}))}this.previewTree=new netgis.Tree;this.previewTree.container.classList.add("netgis-preview-tree");this.previewTree.attachTo(this.preview.content);this.previewTree.container.addEventListener(netgis.Events.TREE_ITEM_CHANGE,this.onPreviewTreeItemChange.bind(this));this.previewSubmit=document.createElement("button");this.previewSubmit.setAttribute("type",
 "button");this.previewSubmit.className="netgis-import-submit netgis-button netgis-center netgis-color-a netgis-hover-c netgis-shadow";this.previewSubmit.innerHTML="<i class='netgis-icon fas fa-check'></i><span>Hinzuf\u00fcgen</span>";this.previewSubmit.addEventListener("click",this.onPreviewSubmitClick.bind(this));this.preview.content.appendChild(this.previewSubmit)};
@@ -113,13 +114,13 @@ netgis.Import.prototype.addInputText=function(a,b,c){var d=document.createElemen
 netgis.Import.prototype.addInputSelect=function(a,b,c){c=document.createElement("label");c.innerHTML=b;b=document.createElement("select");c.appendChild(b);a.appendChild(c);return b};netgis.Import.prototype.addInputFile=function(a,b,c){var d=document.createElement("label");d.innerHTML=b;b=document.createElement("input");b.setAttribute("type","file");b.setAttribute("accept",c);d.appendChild(b);a.appendChild(d);return b};netgis.Import.prototype.getLayerOrder=function(){return 1E4};
 netgis.Import.prototype.showDetailsWMS=function(a){var b=this.sections.wms,c=b.getElementsByTagName("label");b=b.getElementsByTagName("button");a?(c[1].classList.remove("netgis-hide"),c[2].classList.remove("netgis-hide"),c[3].classList.remove("netgis-hide"),b[1].classList.remove("netgis-hide")):(c[1].classList.add("netgis-hide"),c[2].classList.add("netgis-hide"),c[3].classList.add("netgis-hide"),b[1].classList.add("netgis-hide"))};
 netgis.Import.prototype.showDetailsWFS=function(a){var b=this.sections.wfs,c=b.getElementsByTagName("label");b=b.getElementsByTagName("button");a?(c[1].classList.remove("netgis-hide"),c[2].classList.remove("netgis-hide"),c[3].classList.remove("netgis-hide"),b[1].classList.remove("netgis-hide")):(c[1].classList.add("netgis-hide"),c[2].classList.add("netgis-hide"),c[3].classList.add("netgis-hide"),b[1].classList.add("netgis-hide"))};
-netgis.Import.prototype.submitImportLayer=function(a){!0===this.config["import"].preview?netgis.util.invoke(this.modal.container,netgis.Events.IMPORT_LAYER_PREVIEW,a):(this.config.layers.push(a),netgis.util.invoke(this.modal.container,netgis.Events.IMPORT_LAYER_ACCEPT,a),this.modal.hide())};netgis.Import.prototype.onImportShow=function(a){this.modal.show();this.tabs.updateHeaderScroll()};
+netgis.Import.prototype.submitImportLayer=function(a){!0===this.config["import"].preview?netgis.util.invoke(this.modal.container,netgis.Events.IMPORT_LAYER_PREVIEW,a):(this.config.layers.push(a),netgis.util.invoke(this.modal.container,netgis.Events.IMPORT_LAYER_ACCEPT,a),this.modal.hide())};netgis.Import.prototype.onImportShow=function(a){this.modal.show();this.tabs.updateHeaderScroll();this.onTabsChange({detail:{section:this.tabs.activeSection}})};
-netgis.Import.prototype.onWMSLoadClick=function(a){this.showDetailsWMS(!1);a=this.sections.wms.getElementsByTagName("input")[0].value;a=a.trim();if(!(1>a.length)){var b=netgis.util.parseURL(a);a=b.base;b=b.parameters;b.push("request=GetCapabilities");b=b.join("&");-1===b.search("service=")&&(b+="&service=WMS");netgis.util.request(a+"?"+b,this.onWMSCapsResponse.bind(this))}};
+netgis.Import.prototype.onTabsChange=function(a){switch(a.detail.section){case this.sections.geoportal:this.geoportalSearch.focus();break;case this.sections.wms:this.sections.wms.getElementsByTagName("input")[0].focus();break;case this.sections.wfs:this.sections.wfs.getElementsByTagName("input")[0].focus()}};
-netgis.Import.prototype.onWMSCapsResponse=function(a){var b=(new DOMParser).parseFromString(a,"text/xml"),c=b.documentElement;b=b.getElementsByTagName("parsererror");for(var d=0;d<b.length;d++)console.error("WMS caps parser error:",b[d].textContent);0<b.length&&alert(0<a.length?a:b[0].textContent);a=this.sections.wms;var e=a.getElementsByTagName("input");a=a.getElementsByTagName("select");b=a[0];a=a[1];for(d=b.options.length-1;0<=d;d--)b.options.remove(d);for(d=a.options.length-1;0<=d;d--)a.options.remove(d);
+netgis.Import.prototype.onWMSLoadClick=function(a){this.showDetailsWMS(!1);a=this.sections.wms.getElementsByTagName("input")[0].value;a=a.trim();1>a.length||(a=netgis.WMS.buildRequestURL(a,"GetCapabilities"),netgis.util.request(a,this.onWMSCapsResponse.bind(this)))};
-switch(c.nodeName){default:case "HTML":console.warn("could not detect WMS service",c);break;case "WMS_Capabilities":case "WMT_MS_Capabilities":c.getAttribute("version");d=c.getElementsByTagName("Service")[0].getElementsByTagName("Title")[0].textContent;e[1].value=d;d=c.getElementsByTagName("Layer");for(var f=[],g=0;g<d.length;g++){e=d[g];var h=e.getElementsByTagName("Name")[0].textContent,k=e.getElementsByTagName("Title")[0].textContent;f.push({name:h,title:k});e=document.createElement("option");
+netgis.Import.prototype.onWMSCapsResponse=function(a){var b=(new DOMParser).parseFromString(a,"text/xml"),c=b.documentElement;b=b.getElementsByTagName("parsererror");for(var d=0;d<b.length;d++)console.error("WMS caps parser error:",b[d].textContent);0<b.length&&alert(0<a.length?a:b[0].textContent);b=this.sections.wms;var e=b.getElementsByTagName("input");b=b.getElementsByTagName("select");var f=b[0];b=b[1];for(d=f.options.length-1;0<=d;d--)f.options.remove(d);for(d=b.options.length-1;0<=d;d--)b.options.remove(d);
-e.text=k;e.value=h;b.options.add(e)}c=c.getElementsByTagName("GetMap")[0].getElementsByTagName("Format");b=[];for(d=0;d<c.length;d++)e=c[d],f=e.textContent,-1!==f.search("image")&&(b.push(f),e=document.createElement("option"),e.text=f,e.value=f,a.options.add(e))}this.showDetailsWMS(!0)};
+switch(c.nodeName){default:case "HTML":console.warn("could not detect WMS service",c);break;case "WMS_Capabilities":case "WMT_MS_Capabilities":a=netgis.WMS.parseCapabilities(a);console.info("WMS PARSED:",a);c.getAttribute("version");a=c.getElementsByTagName("Service")[0].getElementsByTagName("Title")[0].textContent;e[2].value=a;d=c.getElementsByTagName("Layer");var g=[];console.info("WMS LAYERS:",d.length,"->",d);for(var h=0;h<d.length;h++){a=d[h];var k=a.getElementsByTagName("Name")[0].textContent,
-netgis.Import.prototype.onWMSAcceptClick=function(a){a=this.sections.wms;var b=a.getElementsByTagName("input"),c=a.getElementsByTagName("select"),d="import_"+netgis.util.getTimeStamp(!0),e=b[0].value;b=c[0].selectedOptions[0].innerText;var f=c[0].value;c=c[1].value;e=netgis.util.replace(e,"request=","oldrequest=");e=netgis.util.replace(e,"Request=","oldrequest=");var g=netgis.util.parseURL(e);e=g.base;g=g.parameters;g=g.join("&");-1===g.search("service=")&&(g+="&service=WMS");e=e+"?"+g;g={id:d,folder:null,
+l=a.getElementsByTagName("Title")[0].textContent;g.push({name:k,title:l});a=document.createElement("option");a.text=l;a.value=k;f.options.add(a)}c=c.getElementsByTagName("GetMap")[0];e[1].value=c.getElementsByTagName("Get")[0].getElementsByTagName("OnlineResource")[0].getAttribute("xlink:href");c=c.getElementsByTagName("Format");e=[];for(f=0;f<c.length;f++)a=c[f],d=a.textContent,-1!==d.search("image")&&(e.push(d),a=document.createElement("option"),a.text=d,a.value=d,b.options.add(a))}this.showDetailsWMS(!0)};
-active:!0,query:!0,order:this.getLayerOrder(),type:netgis.LayerTypes.WMS,url:e,title:b,name:f,format:c,tiled:!0};this.config.layers.push(g);netgis.util.invoke(a,netgis.Events.IMPORT_LAYER_ACCEPT,g);this.modal.hide()};
+netgis.Import.prototype.onWMSAcceptClick=function(a){a=this.sections.wms;var b=a.getElementsByTagName("input"),c=a.getElementsByTagName("select"),d="import_"+netgis.util.getTimeStamp(!0);b=b[1].value;var e=c[0].selectedOptions[0].innerText,f=c[0].value;c=c[1].value;d={id:d,folder:null,active:!0,query:!0,order:this.getLayerOrder(),type:netgis.LayerTypes.WMS,url:b,title:e,name:f,format:c,tiled:!0};this.config.layers.push(d);netgis.util.invoke(a,netgis.Events.IMPORT_LAYER_ACCEPT,d);this.modal.hide()};
 netgis.Import.prototype.onWFSLoadClick=function(a){this.showDetailsWFS(!1);var b=this.sections.wfs.getElementsByTagName("input")[0].value;b=b.trim();if(!(1>b.length)){var c=b.indexOf("?");a=-1<c?b.substr(0,c):b;var d=["request=GetCapabilities"];if(-1<c)for(b=b.substr(c+1),b=b.split("&"),c=0;c<b.length;c++){var e=b[c];e=e.toLowerCase();-1<e.search("service")?d.push(e):-1<e.search("version")?d.push(e):-1<e.search("request")||d.push(e)}d=d.join("&");-1===d.search("service=")&&(d+="&service=WFS");a=a+
 "?"+d;this.config["import"].wfs_proxy&&(a=this.config["import"].wfs_proxy+a);netgis.util.request(a,this.onWFSCapsResponse.bind(this))}};
 netgis.Import.prototype.onWFSCapsResponse=function(a){var b=(new DOMParser).parseFromString(a,"text/xml"),c=b.documentElement;b=b.getElementsByTagName("parsererror");for(var d=0;d<b.length;d++)console.error("WFS caps parser error:",b[d].textContent);0<b.length&&alert(0<a.length?a:b[0].textContent);a=this.sections.wfs;var e=a.getElementsByTagName("input");a=a.getElementsByTagName("select");b=a[0];a=a[1];for(d=b.options.length-1;0<=d;d--)b.options.remove(d);for(d=a.options.length-1;0<=d;d--)a.options.remove(d);
@@ -127,26 +128,35 @@ switch(c.nodeName){default:case "HTML":console.error("could not detect WFS servi
 e.text=k;e.value=h;b.options.add(e)}c=c.getElementsByTagName("ows:Operation");b=null;for(e=0;e<c.length;e++)if("GetFeature"===c[e].getAttribute("name")){b=c[e];break}c=null;if(b)for(b=b.getElementsByTagName("ows:Parameter"),e=0;e<b.length;e++)if(d=b[e],"outputFormat"===d.getAttribute("name")){b=d.getElementsByTagName("ows:Value");for(d=0;d<b.length;d++)e=b[d],f=e.textContent,e=document.createElement("option"),e.text=f,e.value=f,a.options.add(e),-1<f.search("json")&&(c=f);break}c&&(a.value=c)}this.showDetailsWFS(!0)};
 netgis.Import.prototype.onWFSAcceptClick=function(a){a=this.sections.wfs;var b=a.getElementsByTagName("input"),c=a.getElementsByTagName("select"),d="import_"+netgis.util.getTimeStamp(!0);b=b[0].value;var e=c[0].selectedOptions[0].innerText,f=c[0].value;c=c[1].value;b=netgis.util.replace(b,"request=","oldrequest=");b=netgis.util.replace(b,"Request=","oldrequest=");this.config["import"].wfs_proxy&&(b=this.config["import"].wfs_proxy+b);d={id:d,folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],
 title:e,type:netgis.LayerTypes.WFS,url:b,name:f,format:c};this.config.layers.push(d);netgis.util.invoke(a,netgis.Events.IMPORT_LAYER_ACCEPT,d);this.modal.hide()};netgis.Import.prototype.onGeoJSONAcceptClick=function(a){if(a=this.sections.geojson.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onGeoJSONLoad.bind(this);b.readAsText(a)}else alert("No file selected!")};
-netgis.Import.prototype.onGeoJSONLoad=function(a){var b=a.target;a=b.title;b=b.result;a={id:"import_"+netgis.util.getTimeStamp(!0),folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],title:a,type:netgis.LayerTypes.GEOJSON,data:b};this.submitImportLayer(a)};netgis.Import.prototype.onGMLAcceptClick=function(a){if(a=this.sections.gml.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onGMLLoad.bind(this);b.readAsText(a)}else alert("No file selected!")};
+netgis.Import.prototype.onGeoJSONLoad=function(a){var b=a.target;a=b.title;b=b.result;a={id:"import_"+netgis.util.getTimeStamp(!0),folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles&&this.config.styles["import"]?this.config.styles["import"]:null,title:a,type:netgis.LayerTypes.GEOJSON,data:b};this.submitImportLayer(a)};
+netgis.Import.prototype.onGMLAcceptClick=function(a){if(a=this.sections.gml.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onGMLLoad.bind(this);b.readAsText(a)}else alert("No file selected!")};
 netgis.Import.prototype.onGMLLoad=function(a){var b=a.target;a=b.result;var c="import_"+netgis.util.getTimeStamp(!0);b=b.title;a={id:c,folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],title:b,type:netgis.LayerTypes.GML,data:a};this.submitImportLayer(a)};netgis.Import.prototype.onGeoPackageAcceptClick=function(a){if(a=this.sections.geopackage.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onGeoPackageLoad.bind(this);b.readAsArrayBuffer(a)}else alert("No file selected!")};
 netgis.Import.prototype.onGeoPackageLoad=function(a){var b=a.target;a=b.result;var c="import_"+netgis.util.getTimeStamp(!0);b=b.title;a={id:c,folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],title:b,type:netgis.LayerTypes.GEOPACKAGE,data:a};this.submitImportLayer(a)};
 netgis.Import.prototype.onSpatialiteAcceptClick=function(a){if(a=this.sections.spatialite.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onSpatialiteLoad.bind(this);b.readAsArrayBuffer(a)}else alert("No file selected!")};
 netgis.Import.prototype.onSpatialiteLoad=function(a){var b=a.target;a=b.result;var c="import_"+netgis.util.getTimeStamp(!0);b=b.title;a={id:c,folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],title:b,type:netgis.LayerTypes.SPATIALITE,data:a};this.submitImportLayer(a)};
 netgis.Import.prototype.onShapefileAcceptClick=function(a){if(a=this.sections.shapefile.getElementsByTagName("input")[0].files[0]){var b=new FileReader;b.title=a.name;b.onload=this.onShapefileLoad.bind(this);b.readAsArrayBuffer(a)}else alert("No file selected!")};
 netgis.Import.prototype.onShapefileLoad=function(a){var b=a.target;a=b.result;var c="import_"+netgis.util.getTimeStamp(!0);b=b.title;a={id:c,folder:null,active:!0,order:this.getLayerOrder(),style:this.config.styles["import"],title:b,type:netgis.LayerTypes.SHAPEFILE,data:a};this.submitImportLayer(a)};
-netgis.Import.prototype.onImportPreviewFeatures=function(a){var b=a.detail,c=b.layer;this.previewTree.clear();a=this.previewMap.getLayers().getArray();for(var d=1;d<a.length;d++)this.previewMap.removeLayer(a[d]);if(ol){a=this.config.styles["import"];a=new ol.style.Style({fill:new ol.style.Fill({color:a.fill}),stroke:new ol.style.Stroke({color:a.stroke,width:a.width})});c.setStyle(a);this.previewMap.addLayer(c);var e=this.previewTree.addFolder(null,b.id,b.title);a=c.getSource().getFeatures();if(0===
+netgis.Import.prototype.onImportPreviewFeatures=function(a){var b=a.detail,c=b.layer;this.previewTree.clear();a=this.previewMap.getLayers().getArray();for(var d=1;d<a.length;d++)this.previewMap.removeLayer(a[d]);if(ol){this.config.styles&&this.config.styles["import"]&&(a=this.config.styles["import"],a=new ol.style.Style({fill:new ol.style.Fill({color:a.fill}),stroke:new ol.style.Stroke({color:a.stroke,width:a.width})}),c.setStyle(a));this.previewMap.addLayer(c);var e=this.previewTree.addFolder(null,
-a.length){var f=this;c.getSource().on("addfeature",function(a){f.featureLoadTimeout&&window.clearTimeout(f.featureLoadTimeout);f.featureLoadTimeout=window.setTimeout(function(){var a=c.getSource().getFeatures();f.updatePreviewFeatures(a,e,c,b);f.featureLoadTimeout=null},100)})}else this.updatePreviewFeatures(a,e,c,b)}else console.error("import preview only supported with OL map renderer",c)};
+b.id,b.title);a=c.getSource().getFeatures();if(0===a.length){var f=this;c.getSource().on("addfeature",function(a){f.featureLoadTimeout&&window.clearTimeout(f.featureLoadTimeout);f.featureLoadTimeout=window.setTimeout(function(){var a=c.getSource().getFeatures();f.updatePreviewFeatures(a,e,c,b);f.featureLoadTimeout=null},100)})}else this.updatePreviewFeatures(a,e,c,b)}else console.error("import preview only supported with OL map renderer",c)};
 netgis.Import.prototype.updatePreviewFeatures=function(a,b,c,d){for(var e=0;e<a.length;e++){var f=a[e],g=f.getId(),h=f.getProperties();g||(g=e+1,f.setId(g));var k=null,l;for(l in h)switch(l.toLowerCase()){case "name":k=h[l];break;case "title":k=h[l];break;case "id":k=h[l];break;case "gid":k=h[l];break;case "oid":k=h[l];break;case "objectid":k=h[l]}k||(k=g);h=f.getGeometry();if(h instanceof ol.geom.Polygon||h instanceof ol.geom.MultiPolygon)k+=" ("+netgis.util.formatArea(h.getArea())+")";else if(h instanceof
-ol.geom.LineString)k+=" ("+netgis.util.formatArea(h.getLength())+")";else if(h instanceof ol.geom.MultiLineString){f=0;h=h.getLineStrings();for(var m=0;m<h.length;m++)f+=h[m].getLength();k+=" ("+netgis.util.formatArea(f)+")"}this.previewTree.addCheckbox(b,g,"Feature "+k,!0)}this.previewTree.setFolderOpen(d.id,!0);this.previewTree.updateFolderChecks();this.preview.show();this.previewMap.updateSize();this.previewMap.getView().fit(c.getSource().getExtent())};
+ol.geom.LineString)k+=" ("+netgis.util.formatArea(h.getLength())+")";else if(h instanceof ol.geom.MultiLineString){f=0;h=h.getLineStrings();for(var n=0;n<h.length;n++)f+=h[n].getLength();k+=" ("+netgis.util.formatArea(f)+")"}this.previewTree.addCheckbox(b,g,"Feature "+k,!0)}this.previewTree.setFolderOpen(d.id,!0);this.previewTree.updateFolderChecks();this.preview.show();this.previewMap.updateSize();this.previewMap.getView().fit(c.getSource().getExtent())};
 netgis.Import.prototype.onPreviewSubmitClick=function(a){var b=this.previewTree.container.getElementsByClassName("netgis-folder")[0];a=b.getAttribute("data-id");b=b.getElementsByTagName("span")[0].innerText;for(var c=this.previewTree.container.getElementsByTagName("input"),d=this.previewMap.getLayers().getArray()[1].getSource(),e=[],f=1;f<c.length;f++){var g=c[f];g.checked&&(g=g.getAttribute("data-id"),g=d.getFeatureById(g),e.push(g))}c=(new ol.format.GeoJSON).writeFeaturesObject(e);d=this.previewMap.getView().getProjection().getCode();
-c.crs={type:"name",properties:{name:"urn:ogc:def:crs:"+d.replace(":","::")}};a={id:a,folder:null,active:!0,editable:this.config["import"]&&!0===this.config["import"].editable,order:this.getLayerOrder(),style:this.config.styles["import"],title:b,type:netgis.LayerTypes.GEOJSON,data:c};this.config.layers.push(a);netgis.util.invoke(this.preview.container,netgis.Events.IMPORT_LAYER_ACCEPT,a);this.preview.hide();this.modal.hide()};
+c.crs={type:"name",properties:{name:"urn:ogc:def:crs:"+d.replace(":","::")}};a={id:a,folder:null,active:!0,editable:this.config["import"]&&!0===this.config["import"].editable,order:this.getLayerOrder(),style:this.config.styles&&this.config.styles["import"]?this.config.styles["import"]:null,title:b,type:netgis.LayerTypes.GEOJSON,data:c};this.config.layers.push(a);netgis.util.invoke(this.preview.container,netgis.Events.IMPORT_LAYER_ACCEPT,a);this.preview.hide();this.modal.hide()};
 netgis.Import.prototype.onPreviewTreeItemChange=function(a){a=a.detail;var b=this.previewMap.getLayers().getArray()[1].getSource().getFeatureById(a.id);a.checked?b.setStyle(null):b.setStyle(new ol.style.Style({}))};netgis.Import.prototype.onGeoportalSearchKeyUp=function(a){switch(a.keyCode){case 13:break;case 27:break;default:this.onGeoportalSearchChange()}};
-netgis.Import.prototype.onGeoportalSearchChange=function(a){a=a.detail.query;if(0<a.length){this.geoportalLoader.classList.remove("netgis-hide");a=netgis.util.replace(a," ",",");var b=this.config["import"].geoportal_search_url;b=netgis.util.replace(b,"{query}",window.encodeURIComponent(a));netgis.util.request(b,this.onGeoportalSearchResponse.bind(this));this.geoportalSearch.showClearButton(!0)}};netgis.Import.prototype.onGeoportalSearchClear=function(a){this.geoportalResults.clear()};
+netgis.Import.prototype.onGeoportalSearchChange=function(a){a=a.detail.query;if(0<a.length){this.geoportalLoader.classList.remove("netgis-hide");this.geoportalResults.clear();a=netgis.util.replace(a," ",",");var b=this.config["import"].geoportal_search_url;b=netgis.util.replace(b,"{query}",window.encodeURIComponent(a));netgis.util.request(b,this.onGeoportalSearchResponse.bind(this));this.geoportalSearch.showClearButton(!0)}};netgis.Import.prototype.onGeoportalSearchClear=function(a){this.geoportalResults.clear()};
-netgis.Import.prototype.onGeoportalSearchResponse=function(a){function b(a){if(a&&a.layer)for(var c=0;c<a.layer.length;c++)b(a.layer[c]);else a&&e.push(a);return e.length}a=JSON.parse(a);this.geoportalResults.clear();this.geoportalDataRaw=a=a.wms.srv;this.geoportalData=[];for(var c=0;c<a.length;c++){var d=a[c];var e=[];var f=b(d);f=this.geoportalResults.addFolder(null,c,d.title+" ("+f+")");f.setAttribute("title",d["abstract"]);for(var g=0;g<e.length;g++)this.geoportalResults.addCheckbox(f,g,e[g].title);
+netgis.Import.prototype.onGeoportalSearchResponse=function(a){function b(a,c){if(a&&a.layer)for(var d=0;d<a.layer.length;d++)b(a.layer[d],c);else a&&c.push(a);return c.length}a=JSON.parse(a);if(this.config["import"].geoportal_search_dynamic)this.updateGeoportalResults(a,!0);else{this.geoportalDataRaw=a=a.wms.srv;this.geoportalData=[];for(var c={},d=0;d<a.length;d++){var e=a[d];var f=[];var g=b(e,f),h=e.title;e.wmsRootLayerId&&(h=e.wmsRootLayerId);if(c[h]){var k=c[h];l=k.getElementsByTagName("summary")[0];
-d.children=e;this.geoportalData.push(d)}this.geoportalLoader.classList.add("netgis-hide")};netgis.Import.prototype.onGeoportalSearchButtonClick=function(a){this.geoportalSearch.onInputTimeout()};
+h=l.getElementsByClassName("netgis-count")[0];h.innerHTML=Number.parseInt(h.innerText)+g}else{var l=e.title+" (<span class='netgis-count'>"+g+"</span>)";k=this.geoportalResults.addFolder(null,d,l);k.setAttribute("title",e["abstract"]);c[h]=k}for(g=0;g<f.length;g++)this.geoportalResults.addCheckbox(k,g,f[g].title);e.children=f;this.geoportalData.push(e)}this.geoportalLoader.classList.add("netgis-hide")}};
-netgis.Import.prototype.onGeoportalTreeItemChange=function(a){a=this.geoportalResults.container.getElementsByClassName("netgis-item");for(var b=0,c=0;c<a.length;c++)a[c].getElementsByTagName("input")[0].checked&&(b+=1);this.geoportalSubmit.getElementsByClassName("netgis-count")[0].innerHTML=0===b?"":" ("+b+")"};
+netgis.Import.prototype.updateGeoportalResults=function(a,b){this.geoportalData={data:a,folders:{}};a=a.wms.srv;if(b){b={};for(var c=0;c<a.length;c++){var d=a[c],e=d.title;d.wmsRootLayerId&&(e=d.wmsRootLayerId);if(b[e]){var f=b[e];f.getElementsByTagName("summary")}else f=this.geoportalResults.addFolder(null,e,d.title,!1,!1),f.setAttribute("title",d["abstract"]),f.setAttribute("data-url",d.wmsGetCapabilitiesUrl),f.setAttribute("data-title",d.title),f.getElementsByTagName("details")[0].addEventListener("toggle",
-netgis.Import.prototype.onGeoportalSubmit=function(a){a=this.geoportalResults.container.getElementsByClassName("netgis-item");for(var b=0,c=0;c<a.length;c++){var d=a[c],e=d.getElementsByTagName("input")[0];if(e.checked){b+=1;e=e.getAttribute("data-id");d=d.parentNode.parentNode.parentNode.getAttribute("data-id");var f=this.geoportalData[d],g=f.children[e],h=f.title;f=f.getMapUrl;var k=g.name;g=g.title;d="geoportal_"+d;e=d+"_"+e;netgis.util.invoke(this.sections.geoportal,netgis.Events.IMPORT_GEOPORTAL_SUBMIT,
+this.onGeoportalFolderToggle.bind(this)),b[e]=f}this.geoportalData.folders=b}this.geoportalResults.container.scrollTop=0;this.geoportalLoader.classList.add("netgis-hide")};
-{folder:{id:d,title:h},layer:{id:e,url:f,name:k,title:g}})}}0<b&&this.modal.hide()};netgis=netgis||{};netgis.Info=function(a){this.config=a;this.queryLayers={};this.popup=new netgis.Popup;this.popup.setHeader("Abfrage");this.initConfig(a)};netgis.Info.Config={default_format:"text/plain",proxy:""};netgis.Info.prototype.initConfig=function(a){a=a.layers;for(var b=a.length-1;0<=b;b--){var c=a[b];!0===c.active&&this.isLayerQueryable(c)?this.queryLayers[c.id]=c:this.queryLayers[c.id]&&delete this.queryLayers[c.id]}};
+netgis.Import.prototype.onGeoportalFolderToggle=function(a){a=a.currentTarget;var b=a.parentNode,c=a.getElementsByTagName("netgis-item");!a.open||0<c||(a=b.getAttribute("data-url"),netgis.util.request(a,function(a){this.onGeoportalFolderResponse(b,a)}.bind(this)),b.getElementsByTagName("ul")[0].innerHTML="",0===b.getElementsByClassName("netgis-loader").length&&this.geoportalResults.addButton(b,0,"<span class='netgis-loader netgis-color-e netgis-text-a'><i class='fas fa-spinner'></i></span>",null))};
+netgis.Import.prototype.onGeoportalFolderResponse=function(a,b){a.getElementsByTagName("ul")[0].innerHTML="";b=netgis.WMS.parseCapabilities(b);this.createGeoportalLayers(a,b,b.layers,!0)};
+netgis.Import.prototype.createGeoportalLayers=function(a,b,c,d){var e=a.getAttribute("data-id"),f=b.requests.map.url,g=b.requests.info.url,h=null;-1<b.requests.map.format.indexOf("image/jpeg")&&(h="image/jpeg");-1<b.requests.map.format.indexOf("image/png")&&(h="image/png");var k=null;-1<b.requests.info.format.indexOf("text/plain")&&(k="text/plain");-1<b.requests.info.format.indexOf("text/html")&&(k="text/html");for(var l=0;l<c.length;l++){var n=c[l],m=e+"_"+n.name;n.id=m;0===n.children.length?(m=
+this.geoportalResults.addCheckbox(a,m,n.title),m.setAttribute("title",n.abstract),m=m.getElementsByTagName("input")[0],m.setAttribute("data-map-url",f),m.setAttribute("data-info-url",g),m.setAttribute("data-map-format",h),m.setAttribute("data-info-format",k),m.setAttribute("data-name",n.name),m.setAttribute("data-title",n.title),m.setAttribute("data-queryable",n.queryable)):(m=this.geoportalResults.addFolder(a,m,n.title),m.setAttribute("title",n.abstract),m.setAttribute("data-title",n.title),d&&this.createGeoportalLayers(m,
+b,n.children,!0))}};netgis.Import.prototype.onGeoportalSearchButtonClick=function(a){this.geoportalSearch.onInputTimeout()};netgis.Import.prototype.onGeoportalTreeItemChange=function(a){a=this.geoportalResults.container.getElementsByClassName("netgis-item");for(var b=0,c=0;c<a.length;c++)a[c].getElementsByTagName("input")[0].checked&&(b+=1);this.geoportalSubmit.getElementsByClassName("netgis-count")[0].innerHTML=0===b?"":" ("+b+")"};
+netgis.Import.prototype.onGeoportalSubmitDynamic=function(a){var b=this.geoportalResults.container.getElementsByClassName("netgis-item"),c=0;for(a=0;a<b.length;a++){var d=b[a],e=d.getElementsByTagName("input")[0];if(e.checked){c+=1;var f=d.parentNode.parentNode.parentNode;d=e.getAttribute("data-id");var g=f.getAttribute("data-id");d="geoportal_"+d;g="geoportal_"+g;f=f.getAttribute("data-title");var h=e.getAttribute("data-title"),k=e.getAttribute("data-map-url");e=e.getAttribute("data-name");netgis.util.invoke(this.sections.geoportal,
+netgis.Events.IMPORT_GEOPORTAL_SUBMIT,{folder:{id:g,title:f},layer:{id:d,url:k,name:e,title:h}})}}if(0<c){this.modal.hide();b=this.geoportalResults.container.getElementsByTagName("input");for(a=0;a<b.length;a++)b[a].checked=!1;this.geoportalResults.updateFolderChecks();this.onGeoportalTreeItemChange()}};
+netgis.Import.prototype.onGeoportalSubmit=function(a){if(this.config["import"].geoportal_search_dynamic)this.onGeoportalSubmitDynamic(a);else{a=this.geoportalResults.container.getElementsByClassName("netgis-item");for(var b=0,c=0;c<a.length;c++){var d=a[c],e=d.getElementsByTagName("input")[0];if(e.checked){b+=1;e=e.getAttribute("data-id");d=d.parentNode.parentNode.parentNode.getAttribute("data-id");var f=this.geoportalData[d],g=f.children[e],h=f.title;f=f.getMapUrl;var k=g.name;g=g.title;d="geoportal_"+
+d;e=d+"_"+e;netgis.util.invoke(this.sections.geoportal,netgis.Events.IMPORT_GEOPORTAL_SUBMIT,{folder:{id:d,title:h},layer:{id:e,url:f,name:k,title:g}})}}0<b&&this.modal.hide()}};netgis=netgis||{};netgis.Info=function(a){this.config=a;this.queryLayers={};this.popup=new netgis.Popup;this.popup.setHeader("Abfrage");this.initConfig(a)};netgis.Info.Config={default_format:"text/plain",proxy:""};netgis.Info.prototype.initConfig=function(a){a=a.layers;for(var b=a.length-1;0<=b;b--){var c=a[b];!0===c.active&&this.isLayerQueryable(c)?this.queryLayers[c.id]=c:this.queryLayers[c.id]&&delete this.queryLayers[c.id]}};
 netgis.Info.prototype.attachTo=function(a){this.popup.attachTo(a);a.addEventListener(netgis.Events.CLIENT_CONTEXT_RESPONSE,this.onClientContextResponse.bind(this));a.addEventListener(netgis.Events.CLIENT_SET_MODE,this.onClientSetMode.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_TOGGLE,this.onMapLayerToggle.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_CREATE,this.onMapLayerCreate.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_DELETE,this.onMapLayerDelete.bind(this));a.addEventListener(netgis.Events.IMPORT_LAYER_ACCEPT,
 this.onImportLayerAccept.bind(this));a.addEventListener(netgis.Events.IMPORT_GEOPORTAL_SUBMIT,this.onImportGeoportalSubmit.bind(this));a.addEventListener(netgis.Events.MAP_CLICK,this.onMapClick.bind(this));a.addEventListener(netgis.Events.MAP_FEATURE_CLICK,this.onMapFeatureClick.bind(this))};netgis.Info.prototype.isLayerQueryable=function(a){var b=!1;if(!0===a.query)b=!0;else if(!1!==a.query)switch(a.type){case netgis.LayerTypes.WMS:case netgis.LayerTypes.WMST:b=!0}return b};
 netgis.Info.prototype.addSection=function(a,b,c){this.popup.addContent([!0===c?"<details open='open'>":"<details>","<summary class='netgis-button netgis-noselect netgis-clip-text netgis-color-d netgis-hover-text-a netgis-hover-d'>",a,"</summary><div class='netgis-border-d'>",b,"</div></details>"].join(""))};netgis.Info.prototype.onClientContextResponse=function(a){this.initConfig(a.detail.context.config)};netgis.Info.prototype.onClientSetMode=function(a){this.popup.hide()};
@@ -160,22 +170,22 @@ netgis.Info.prototype.onMapFeatureClick=function(a){var b=a.detail,c=b.propertie
 ""!==a||(a="Geolocation"),d.push(["L\u00e4ngengrad (Lon.)",b.lon]),d.push(["Breitengrad (Lat.)",b.lat]));b=[];if(0<d.length){b.push("<table>");for(c=0;c<d.length;c++){f=d[c];var g=f[0];f=f[1];b.push("<tr class='netgis-hover-d'>");b.push("<th>"+g+"</th>");b.push("<td>"+f+"</td>");b.push("</tr>")}b.push("</table>")}else b.push("<i>Keine Eigenschaften vorhanden...</i>");b=b.join("");this.addSection(a,b,!1);!this.popup.isVisible()&&this.popup.show()}};
 netgis.Info.prototype.onLayerResponseWMS=function(a,b,c){b=b.title;if(c=c.getResponseHeader("Content-Type"))switch(c.split(";")[0]){case "text/plain":a="<pre>"+a+"</pre>"}this.popup.hideLoader();this.addSection(b,a,!1)};netgis=netgis||{};netgis.LayerID={EDITABLE:"editable-layer",NON_EDITABLE:"non-editable-layer"};netgis=netgis||{};netgis.LayerTree=function(a){this.config=a;this.importFolder=null;this.initElements(a);this.initFolders();this.initConfig(a)};netgis.LayerTree.Config={open:!1,title:"Layers",draggable:!1,buttons:[]};netgis.LayerTree.Folders=[];
 netgis.LayerTree.prototype.initElements=function(a){a=a.layertree;this.panel=new netgis.Panel("Layers");this.tree=new netgis.Tree(a.draggable);this.tree.attachTo(this.panel.content);this.tree.container.addEventListener(netgis.Events.TREE_ITEM_CHANGE,this.onTreeItemChange.bind(this));this.tree.container.addEventListener(netgis.Events.TREE_ITEM_SLIDER_CHANGE,this.onTreeItemSliderChange.bind(this));this.tree.container.addEventListener(netgis.Events.TREE_ITEM_ORDER_CHANGE,this.onTreeItemOrderChange.bind(this));
-!0===a.draggable&&(this.panel.content.addEventListener("dragover",this.onDragOver.bind(this)),this.panel.content.addEventListener("drop",this.onDragDrop.bind(this)))};
+this.tree.container.addEventListener(netgis.Events.TREE_ITEM_REMOVE,this.onTreeItemRemove.bind(this));!0===a.draggable&&(this.panel.content.addEventListener("dragover",this.onDragOver.bind(this)),this.panel.content.addEventListener("drop",this.onDragDrop.bind(this)))};
 netgis.LayerTree.prototype.initFolders=function(){this.editFolder=this.tree.addFolder(null,"edit-folder","Zeichnung",!0,!0);this.tree.addCheckbox(this.editFolder,netgis.LayerID.EDITABLE,"Editierbar");this.tree.setItemChecked(netgis.LayerID.EDITABLE,!0);this.tree.addCheckbox(this.editFolder,netgis.LayerID.NON_EDITABLE,"Nicht-Editierbar");this.tree.setItemChecked(netgis.LayerID.NON_EDITABLE,!0);this.editFolder.classList.add("netgis-hide")};
-netgis.LayerTree.prototype.initConfig=function(a,b){var c=a.layertree;c&&c.title&&this.panel.setTitle(c.title);var d=a.folders,e={};if(d){for(var f=0;f<d.length;f++){var g=d[f],h=this.tree.addFolder(null,g.id,g.title,b,!1,g.draggable);e[g.id]=h;!0===g.open&&this.tree.setFolderOpen(g.id,!0)}for(f=0;f<d.length;f++)g=d[f],h=g.id,g=g.parent,-1===g&&(g=null),""===g&&(g=null),g&&this.tree.setFolderParent(e[h],e[g])}if(b=a.layers)for(f=0;f<b.length;f++){var k=b[f];g=e[k.folder]?e[k.folder]:null;h=k.id?k.id:
+netgis.LayerTree.prototype.initConfig=function(a,b){var c=a.layertree;c&&c.title&&this.panel.setTitle(c.title);var d=a.folders,e={};if(d){for(var f=0;f<d.length;f++){var g=d[f],h=this.tree.addFolder(null,g.id,g.title,b,!1,g.draggable,g.removable);e[g.id]=h;!0===g.open&&this.tree.setFolderOpen(g.id,!0)}for(f=0;f<d.length;f++)g=d[f],h=g.id,g=g.parent,-1===g&&(g=null),""===g&&(g=null),g&&this.tree.setFolderParent(e[h],e[g])}if(b=a.layers)for(f=0;f<b.length;f++){var k=b[f];g=e[k.folder]?e[k.folder]:null;
-f.toString();var l=!1;if(g)for(var m=0;m<d.length;m++){var n=d[m];n.id===k.folder&&(l=n.radio)}m=k.title;n='<i class="fas fa-mouse-pointer" title="Ebene ist abfragbar"></i>';a.layertree&&a.layertree.query_icon&&(n=a.layertree.query_icon);(!0===k.query||k.query_url&&""!==k.query_url)&&n&&""!==n&&(m+='<span class="netgis-right">'+n+"</span>");n=k.removable;h=!0===l?this.tree.addRadioButton(g,h,m,k.active,this.createDefaultDetails(k,!0,n)):this.tree.addCheckbox(g,h,m,k.active,!1,this.createDefaultDetails(k,
+h=k.id?k.id:f.toString();var l=!1;if(g)for(var n=0;n<d.length;n++){var m=d[n];m.id===k.folder&&(l=m.radio)}n=k.title;m='<i class="fas fa-mouse-pointer" title="Ebene ist abfragbar"></i>';a.layertree&&a.layertree.query_icon&&(m=a.layertree.query_icon);(!0===k.query||k.query_url&&""!==k.query_url)&&m&&""!==m&&(n+='<span class="netgis-right">'+m+"</span>");m=k.removable;h=!0===l?this.tree.addRadioButton(g,h,n,k.active,this.createDefaultDetails(k,!0,m)):this.tree.addCheckbox(g,h,n,k.active,!1,this.createDefaultDetails(k,
-!0,n));h.addEventListener("contextmenu",this.onTreeItemMenu.bind(this));!0===k.hidden&&h.classList.add("netgis-hide")}this.tree.updateFolderChecks();if(c&&c.buttons)for(a=a.layertree.buttons,f=0;f<a.length;f++)d=a[f],this.tree.addButton(null,d.id,d.title,this.onTreeButtonClick.bind(this));c&&!0===c.open&&this.panel.show()};
+!0,m));h.addEventListener("contextmenu",this.onTreeItemMenu.bind(this));!0===k.hidden&&h.classList.add("netgis-hide")}this.tree.updateFolderChecks();if(c&&c.buttons)for(a=a.layertree.buttons,f=0;f<a.length;f++)d=a[f],this.tree.addButton(null,d.id,d.title,this.onTreeButtonClick.bind(this));c&&!0===c.open&&this.panel.show()};
 netgis.LayerTree.prototype.attachTo=function(a){this.panel.attachTo(a);a.addEventListener(netgis.Events.CLIENT_CONTEXT_RESPONSE,this.onClientContextResponse.bind(this));a.addEventListener(netgis.Events.LAYERTREE_TOGGLE,this.onLayerTreeToggle.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_CREATE,this.onMapLayerCreate.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_TOGGLE,this.onMapLayerToggle.bind(this));a.addEventListener(netgis.Events.IMPORT_LAYER_ACCEPT,this.onImportLayerAccept.bind(this));
 a.addEventListener(netgis.Events.IMPORT_GEOPORTAL_SUBMIT,this.onImportGeoportalSubmit.bind(this));a.addEventListener(netgis.Events.CONTEXTMENU_SLIDER_CHANGE,this.onContextMenuSliderChange.bind(this));a.addEventListener(netgis.Events.MAP_EDIT_LAYER_LOADED,this.onMapEditLayerChange.bind(this));a.addEventListener(netgis.Events.MAP_EDIT_LAYER_CHANGE,this.onMapEditLayerChange.bind(this))};
 netgis.LayerTree.prototype.createDefaultDetails=function(a,b,c){var d=[];!0===b&&d.push({title:"<i class='netgis-icon fas fa-eye-slash'></i> Transparenz:",type:"slider",val:a.transparency?Math.round(100*a.transparency):0});!0===c&&d.push({title:"<i class='netgis-icon fas fa-times'></i> Entfernen",type:"button",callback:this.onTreeItemDeleteClick.bind(this)});return d};
 netgis.LayerTree.prototype.onTreeItemChange=function(a){var b=a.detail;netgis.util.invoke(a.target,netgis.Events.MAP_LAYER_TOGGLE,{id:b.id,on:b.checked})};netgis.LayerTree.prototype.onClientContextResponse=function(a){this.initConfig(a.detail.context.config,!0)};netgis.LayerTree.prototype.onLayerTreeToggle=function(a){this.panel.toggle()};netgis.LayerTree.prototype.onTreeButtonClick=function(a){a=a.currentTarget;var b=a.getAttribute("data-id");netgis.Client.handleCommand(a,b)};
 netgis.LayerTree.prototype.onMapLayerCreate=function(a){this.addLayerItem(a.detail,null)};netgis.LayerTree.prototype.onMapLayerToggle=function(a){a=a.detail;this.tree.setItemChecked(a.id,a.on,!0);this.tree.updateFolderChecks()};netgis.LayerTree.prototype.onImportLayerAccept=function(a){a=a.detail;!0!==a.editable&&(this.importFolder||(this.importFolder=this.tree.addFolder(null,"_import","Import",!0,!1)),this.addLayerItem(a,this.importFolder),this.tree.updateFolderChecks())};
 netgis.LayerTree.prototype.addLayerItem=function(a,b){var c=a.title,d='<i class="fas fa-mouse-pointer" title="Ebene ist abfragbar"></i>';config.layertree&&config.layertree.query_icon&&(d=config.layertree.query_icon);(!0===a.query||a.query_url&&""!==a.query_url)&&d&&""!==d&&(c+='<span class="netgis-right">'+d+"</span>");this.tree.addCheckbox(b,a.id,c,!0,!0,this.createDefaultDetails(a,!0,!0)).addEventListener("contextmenu",this.onTreeItemMenu.bind(this))};
-netgis.LayerTree.prototype.onImportGeoportalSubmit=function(a){a=a.detail;var b=a.folder.id,c=this.tree.getFolder(b);c||(c=this.tree.addFolder(null,b,a.folder.title,!0,!1));var d=a.layer.id;b={id:d,folder:b,title:a.layer.title,active:!0,type:netgis.LayerTypes.WMS,url:a.layer.url,name:a.layer.name,order:1E4,transparency:0};this.config.layers.push(b);this.tree.addCheckbox(c,d,a.layer.title,!1,!1,this.createDefaultDetails(b,!0,!0));this.tree.setItemChecked(d,!0,!1)};
+netgis.LayerTree.prototype.onImportGeoportalSubmit=function(a){a=a.detail;var b=a.folder.id,c=this.tree.getFolder(b);c||(c=this.tree.addFolder(null,b,a.folder.title,!0,!1,!0,!0));var d=a.layer.id;b={id:d,folder:b,title:a.layer.title,active:!0,type:netgis.LayerTypes.WMS,url:a.layer.url,name:a.layer.name,order:1E4,transparency:0};this.config.layers.push(b);this.tree.addCheckbox(c,d,a.layer.title,!1,!1,this.createDefaultDetails(b,!0,!0));this.tree.setItemChecked(d,!0,!1)};
 netgis.LayerTree.prototype.onTreeItemMenu=function(a){a.preventDefault();return!1};netgis.LayerTree.prototype.onContextMenuSliderChange=function(a){var b=a.detail;a=.01*b.val;var c=null;0===b.id.indexOf("layer_trans_")&&(c=b.id.split("layer_trans_")[1]);b=this.config.layers;for(var d=0;d<b.length;d++){var e=b[d];if(e.id===c){e.transparency=a;break}}netgis.util.invoke(this.tree.container,netgis.Events.MAP_LAYER_TRANSPARENCY,{id:c,transparency:a})};
 netgis.LayerTree.prototype.onTreeItemSliderChange=function(a){var b=a.detail;a=b.id;b=.01*b.val;for(var c=this.config.layers,d=0;d<c.length;d++){var e=c[d];if(e.id===a){e.transparency=b;break}}netgis.util.invoke(this.tree.container,netgis.Events.MAP_LAYER_TRANSPARENCY,{id:a,transparency:b})};
 netgis.LayerTree.prototype.onTreeItemOrderChange=function(a){a=a.detail.items;for(var b=this.config.layers,c=a.length,d=0;d<a.length;d++){for(var e=a[d].getElementsByTagName("input")[0].getAttribute("data-id"),f=0;f<b.length;f++){var g=b[f];g.id===e&&(g.order=c,netgis.util.invoke(this.tree.container,netgis.Events.MAP_LAYER_ORDER,{id:e,order:c}))}c--}};
-netgis.LayerTree.prototype.onTreeItemDeleteClick=function(a){a=a.currentTarget.parentNode.parentNode.parentNode.parentNode.getElementsByTagName("input")[0].getAttribute("data-id");netgis.util.invoke(this.tree.container,netgis.Events.MAP_LAYER_DELETE,{id:a});this.tree.removeItem(a)};netgis.LayerTree.prototype.onMapEditLayerChange=function(a){this.editFolder.classList.remove("netgis-hide")};netgis.LayerTree.prototype.onDragOver=function(a){a.preventDefault()};
+netgis.LayerTree.prototype.onTreeItemDeleteClick=function(a){a=a.currentTarget.parentNode.parentNode.parentNode.parentNode.getElementsByTagName("input")[0].getAttribute("data-id");this.tree.removeItem(a)};netgis.LayerTree.prototype.onTreeItemRemove=function(a){netgis.util.invoke(this.tree.container,netgis.Events.MAP_LAYER_DELETE,{id:a.detail.id})};netgis.LayerTree.prototype.onMapEditLayerChange=function(a){this.editFolder.classList.remove("netgis-hide")};netgis.LayerTree.prototype.onDragOver=function(a){a.preventDefault()};
 netgis.LayerTree.prototype.onDragDrop=function(a){a=this.tree.dragElement;"summary"===a.nodeName.toLowerCase()&&(a=a.parentNode.parentNode);a.parentNode.removeChild(a);0<this.tree.container.childNodes.length?this.tree.container.insertBefore(a,this.tree.container.childNodes[0]):this.tree.container.appendChild(a);netgis.util.invoke(this.tree.container,netgis.Events.TREE_ITEM_ORDER_CHANGE,{items:this.tree.container.getElementsByClassName("netgis-item")})};netgis=netgis||{};netgis.LayerTypes={TMS:"TMS",XYZ:"XYZ",OSM:"OSM",WMTS:"WMTS",WMS:"WMS",WMST:"WMST",GEOJSON:"GEOJSON",VTILES:"VTILES",WFS:"WFS",GML:"GML",KML:"KML",GEOPACKAGE:"GEOPACKAGE",SPATIALITE:"SPATIALITE",SHAPEFILE:"SHAPEFILE",WKT:"WKT",HIDDEN:"HIDDEN"};netgis=netgis||{};netgis.Legend=function(a){this.config=a;this.initElements();this.initConfig(a)};netgis.Legend.Config={open:!1};netgis.Legend.prototype.initElements=function(){this.panel=new netgis.Panel("<i class='netgis-icon fas fa-bars'></i><span>Legende</span>");this.panel.content.classList.add("netgis-legend")};netgis.Legend.prototype.initConfig=function(a){var b=a.legend;b&&!0===b.open&&this.show();a=a.layers;for(b=0;b<a.length;b++){var c=a[b];!0===c.active?this.addLayerLegend(c.id):this.removeLayerLegend(c.id)}};
 netgis.Legend.prototype.attachTo=function(a){this.panel.attachTo(a);a.addEventListener(netgis.Events.CLIENT_CONTEXT_RESPONSE,this.onClientContextResponse.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_TOGGLE,this.onMapLayerToggle.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_CREATE,this.onMapLayerCreate.bind(this));a.addEventListener(netgis.Events.MAP_LAYER_DELETE,this.onMapLayerDelete.bind(this));a.addEventListener(netgis.Events.LEGEND_TOGGLE,this.onLegendToggle.bind(this))};
 netgis.Legend.prototype.show=function(){this.panel.show()};netgis.Legend.prototype.hide=function(){this.panel.hide()};netgis.Legend.prototype.addSection=function(a,b,c,d){this.panel.content.innerHTML=[!0===d?"<details data-id='"+a+"' open='open'>":"<details data-id='"+a+"'>","<summary class='netgis-button netgis-noselect netgis-clip-text netgis-color-d netgis-hover-text-a netgis-hover-d'>",b,"</summary><div class='netgis-border-d'>",c,"</div></details>"].join("")+this.panel.content.innerHTML};
@@ -246,8 +256,9 @@ netgis.Map.prototype.setSnapping=function(a){var b=this.config.tools.snapping;a?
 netgis.Map.prototype.removeSnapLayer=function(a){a=a.getSource().getFeatures();for(var b=0;b<a.length;b++)this.snapFeatures.remove(a[b])};netgis.Map.prototype.setDrawBuffer=function(a,b,c){if(a){var d=this.createBufferFeature(new ol.geom.Point(this.view.getCenter()),b,c);this.previewLayer.getSource().addFeature(d);this.drawBufferRadius=b;this.drawBufferSegments=c}else this.previewLayer.getSource().clear();this.drawBufferOn=a};
 netgis.Map.prototype.createLayerTMS=function(a,b,c,d,e){"map"===d&&(this.config.map&&this.config.map.scales?d=this.config.map.scales:(console.error("TMS layer references map scales, but none given in config,",a),d=void 0));"map"===c&&(this.config.map&&this.config.map.extent?c=this.config.map.extent:(console.error("TMS layer references map 'extent', but none given in config 'map',",a),c=void 0));if(b&&c&&(d||e)){if(d)for(e=[],b=0;b<d.length;b++)e.unshift(this.getResolutionFromScale(d[b]));c=new ol.source.TileImage({crossOrigin:null,
 projection:this.view.getProjection(),tileGrid:new ol.tilegrid.TileGrid({extent:c,origin:c?[c[0],c[1]]:[0,0],resolutions:e}),tileUrlFunction:function(b){if(null!==b){var c=a;c=netgis.util.replace(c,"{z}",b[0]);c=netgis.util.replace(c,"{x}",b[1]);c=netgis.util.replace(c,"{y}",b[2]);return c=netgis.util.replace(c,"{-y}",-b[2]-1)}}});c=new ol.layer.Tile({source:c})}else c=new ol.layer.Tile({source:new ol.source.XYZ({url:a,crossOrigin:"anonymous"})});return c};
-netgis.Map.prototype.createLayerWMS=function(a,b,c,d,e,f){"image/tiff"===c&&(console.error("WMS layer format 'image/tiff' detected but not supported in OL, reverting to 'image/png' for '"+a+"'"),c="image/png");a={url:a,params:{LAYERS:b,FORMAT:c?c:"image/png",TRANSPARENT:"true"},hidpi:!1};e&&f&&(a.imageLoadFunction=function(a,b){var c=new XMLHttpRequest;c.open("GET",b);c.setRequestHeader("Authorization","Basic "+window.btoa(e+":"+f));c.onload=function(){a.getImage().src=b};c.send()});d?(d=new ol.source.TileWMS(a),
+netgis.Map.prototype.createLayerWMS=function(a,b,c,d,e,f){"image/tiff"===c&&(console.error("WMS layer format 'image/tiff' detected but not supported in OL, reverting to 'image/png' for '"+a+"'"),c="image/png");var g=netgis.util.parseURL(a,!0);console.info("MAP WMS URL:",a,g);a=g.base;var h=[],k;for(k in g.parameters)"service"!==k.toLowerCase()&&"version"!==k.toLowerCase()&&"request"!==k.toLowerCase()&&h.push(k+"="+g.parameters[k]);a=-1<a.search("\\?")?a+("&"+h.join("&")):a+("?"+h.join("&"));a={url:a,
-d=new ol.layer.Tile({source:d})):(d=new ol.source.ImageWMS(a),d=new ol.layer.Image({source:d}));return d};
+params:{LAYERS:b,FORMAT:c?c:"image/png",TRANSPARENT:"true"},hidpi:!1};for(k in g.parameters)"service"===k.toLowerCase()&&(a.params.SERVICE=g.parameters[k]),"version"===k.toLowerCase()&&(a.params.VERSION=g.parameters[k]);console.info("MAP WMS PARAMS:",a);e&&f&&(a.imageLoadFunction=function(a,b){var c=new XMLHttpRequest;c.open("GET",b);c.setRequestHeader("Authorization","Basic "+window.btoa(e+":"+f));c.onload=function(){a.getImage().src=b};c.send()});d?(d=new ol.source.TileWMS(a),d=new ol.layer.Tile({source:d})):
+(d=new ol.source.ImageWMS(a),d=new ol.layer.Image({source:d}));return d};
 netgis.Map.prototype.createLayerWMST=function(a,b,c,d,e,f){"image/tiff"===c&&(console.error("WMST layer format 'image/tiff' detected but not supported in OL, reverting to 'image/png' for '"+a+"'"),c="image/png");a={url:a,params:{LAYERS:b,FORMAT:c?c:"image/png",TRANSPARENT:"true",VERSION:"1.1.1"},hidpi:!1};e&&f&&(a.imageLoadFunction=function(a,b){var c=new XMLHttpRequest;c.open("GET",b);c.setRequestHeader("Authorization","Basic "+window.btoa(e+":"+f));c.onload=function(){a.getImage().src=b};c.send()});
 d?(d=new ol.source.TileWMS(a),d=new ol.layer.Tile({source:d})):(d=new ol.source.ImageWMS(a),d=new ol.layer.Image({source:d}));return d};
 netgis.Map.prototype.createLayerWMTS=function(a){for(var b=[],c=this.client.config.map.scales,d=this.client.config.map.extent,e=0;e<c.length;e++)b.unshift(this.getResolutionFromScale(c[e]));b=new ol.source.TileImage({crossOrigin:null,projection:this.view.getProjection(),tileGrid:new ol.tilegrid.TileGrid({extent:d,origin:[d[0],d[1]],resolutions:b}),tileUrlFunction:function(b){if(null!==b){var c=a;c=netgis.util.replace(c,"{z}",b[0]);c=netgis.util.replace(c,"{x}",b[1]);c=netgis.util.replace(c,"{y}",
@@ -259,13 +270,13 @@ netgis.Map.prototype.createLayerGML=function(a){console.warn("GML support is exp
 (f=e.getAttribute("srsName"))&&"EPSG:4326"!==f&&f!==this.projection&&console.warn("unsupported import projection:",f);switch(e.nodeName){case "gml:Polygon":d.geometry=this.gmlParsePolygon(e,f);break;case "gml:MultiPolygon":d.geometry=this.gmlParseMultiPolygon(e,f)}d=new ol.Feature(d);b.push(d)}return new ol.layer.Vector({source:new ol.source.Vector({features:b})})};
 netgis.Map.prototype.gmlParsePolygon=function(a,b){var c=[];a=a.getElementsByTagName("gml:LinearRing");for(var d=0;d<a.length;d++){var e=a[d].getElementsByTagName("gml:coordinates")[0].innerHTML;c.push(this.gmlParseCoordinates(e,b))}return new ol.geom.Polygon(c)};netgis.Map.prototype.gmlParseMultiPolygon=function(a,b){var c=[];a=a.getElementsByTagName("gml:polygonMember");for(var d=0;d<a.length;d++){var e=a[d].getElementsByTagName("gml:Polygon")[0];c.push(this.gmlParsePolygon(e,b))}return new ol.geom.MultiPolygon(c)};
 netgis.Map.prototype.gmlParseCoordinates=function(a,b){a=a.split(" ");for(var c=0;c<a.length;c++){a[c]=a[c].split(",");for(var d=0;d<a[c].length;d++)a[c][d]=Number.parseFloat(a[c][d]);b&&(a[c]=ol.proj.transform(a[c],b,this.view.getProjection()))}return a};
-netgis.Map.prototype.createLayerGeoPackage=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;a=new Uint8Array(a);window.GeoPackage.setSqljsWasmLocateFile(function(a){return c.config["import"].geopackage_lib+a});window.GeoPackage.GeoPackageAPI.open(a).then(function(a){for(var d=[],f=new ol.format.GeoJSON,g=a.getFeatureTables(),h=0;h<g.length;h++)for(var k=a.queryForGeoJSONFeaturesInTable(g[h]),l=0;l<k.length;l++){var m=f.readGeometry(k[l].geometry,{featureProjection:c.view.getProjection()});
+netgis.Map.prototype.createLayerGeoPackage=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;a=new Uint8Array(a);window.GeoPackage.setSqljsWasmLocateFile(function(a){return c.config["import"].geopackage_lib+a});window.GeoPackage.GeoPackageAPI.open(a).then(function(a){for(var d=[],f=new ol.format.GeoJSON,g=a.getFeatureTables(),h=0;h<g.length;h++)for(var k=a.queryForGeoJSONFeaturesInTable(g[h]),l=0;l<k.length;l++){var n=f.readGeometry(k[l].geometry,{featureProjection:c.view.getProjection()});
-m=new ol.Feature({geometry:m});d.push(m)}b.getSource().addFeatures(d)});return b};
+n=new ol.Feature({geometry:n});d.push(n)}b.getSource().addFeatures(d)});return b};
 netgis.Map.prototype.createLayerSpatialite=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;window.initSqlJs().then(function(d){var e=[],f=new Uint8Array(a);d=new d.Database(f);var g=d.exec("SELECT name FROM sqlite_schema WHERE type = 'table' \n\t\t\t\t\tAND name NOT LIKE 'sqlite_%' \n\t\t\t\t\tAND name NOT LIKE 'sql_%' \n\t\t\t\t\tAND name NOT LIKE 'idx_%' \n\t\t\t\t\tAND name NOT LIKE 'spatial_ref_sys%' \n\t\t\t\t\tAND name NOT LIKE 'spatialite_%' \n\t\t\t\t\tAND name NOT LIKE 'geometry_columns%' \n\t\t\t\t\tAND name NOT LIKE 'views_%' \n\t\t\t\t\tAND name NOT LIKE 'virts_%' \n\t\t\t\t\tAND name NOT LIKE 'SpatialIndex' \n\t\t\t\t\tAND name NOT LIKE 'KNN%' \n\t\t\t\t\tAND name NOT LIKE 'ElementaryGeometries' \n\t\t\t\t;");f=
-g[0].values;for(var h=0;h<f.length;h++){g=d.exec("SELECT * FROM "+f[h][0]);var k=g[0];g=null;for(var l=0;l<k.columns.length;l++){if("geometry"===k.columns[l].toLowerCase()){g=l;break}if("geom"===k.columns[l].toLowerCase()){g=l;break}}if(null!==g)for(k=k.values,l=0;l<k.length;l++){var m=k[l][g],n=new Uint8Array(m.length-43-1+5);n[0]=m[1];n[1]=m[39];n[2]=m[40];n[3]=m[41];n[4]=m[42];for(var q=m.length-43-1,p=0;p<q;p++)n[5+p]=m[43+p];m=(new ol.format.WKB).readGeometry(n,{featureProjection:c.view.getProjection()});
+g[0].values;for(var h=0;h<f.length;h++){g=d.exec("SELECT * FROM "+f[h][0]);var k=g[0];g=null;for(var l=0;l<k.columns.length;l++){if("geometry"===k.columns[l].toLowerCase()){g=l;break}if("geom"===k.columns[l].toLowerCase()){g=l;break}}if(null!==g)for(k=k.values,l=0;l<k.length;l++){var n=k[l][g],m=new Uint8Array(n.length-43-1+5);m[0]=n[1];m[1]=n[39];m[2]=n[40];m[3]=n[41];m[4]=n[42];for(var q=n.length-43-1,p=0;p<q;p++)m[5+p]=n[43+p];n=(new ol.format.WKB).readGeometry(m,{featureProjection:c.view.getProjection()});
-e.push(new ol.Feature({geometry:m}))}}b.getSource().addFeatures(e)});return b};netgis.Map.prototype.createLayerShapefile=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;shp(a).then(function(a){var d=new ol.format.GeoJSON;d.readProjection(a);a=d.readFeatures(a,{featureProjection:c.view.getProjection()});b.getSource().addFeatures(a)});return b};
+e.push(new ol.Feature({geometry:n}))}}b.getSource().addFeatures(e)});return b};netgis.Map.prototype.createLayerShapefile=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;shp(a).then(function(a){var d=new ol.format.GeoJSON;d.readProjection(a);a=d.readFeatures(a,{featureProjection:c.view.getProjection()});b.getSource().addFeatures(a)});return b};
 netgis.Map.prototype.createLayerWKT=function(a){for(var b=new ol.format.WKT,c=[],d=0;d<a.length;d++){var e=a[d],f=b.readGeometry(e.geometry),g=e.properties;g.geometry=f;g.wkt=e.geometry;f=new ol.Feature(g);f.setId(e.id);c.push(f)}return new ol.layer.Vector({source:new ol.source.Vector({features:c})})};
-netgis.Map.prototype.createLayerWFS=function(a,b,c,d,e,f){"?"!==a[a.length-1]&&(a+="?");a+="service=WFS&version=1.1.0&request=GetFeature";c||(c=this.view.getProjection().getCode());d=d?netgis.util.replace(d," ","+"):"application/json";var g=new ol.source.Vector({format:new ol.format.GeoJSON,strategy:ol.loadingstrategy.bbox,loader:function(h,k,n,q,p){h=a+"&typename="+b+"&srsname="+c+"&bbox="+h.join(",")+","+c+"&outputFormat="+d;var l=new XMLHttpRequest;l.open("GET",h);e&&f&&l.setRequestHeader("Authorization",
+netgis.Map.prototype.createLayerWFS=function(a,b,c,d,e,f){"?"!==a[a.length-1]&&(a+="?");a+="service=WFS&version=1.1.0&request=GetFeature";c||(c=this.view.getProjection().getCode());d=d?netgis.util.replace(d," ","+"):"application/json";var g=new ol.source.Vector({format:new ol.format.GeoJSON,strategy:ol.loadingstrategy.bbox,loader:function(h,k,m,q,p){h=a+"&typename="+b+"&srsname="+c+"&bbox="+h.join(",")+","+c+"&outputFormat="+d;var l=new XMLHttpRequest;l.open("GET",h);e&&f&&l.setRequestHeader("Authorization",
 "Basic "+window.btoa(e+":"+f));l.onerror=function(){console.error("WFS request error");p()};l.onload=function(){if(200===l.status){g.clear();var a=g.getFormat().readFeatures(l.responseText);g.addFeatures(a);q(a)}else console.error("WFS request status",l.status),p()};l.send()}}),h=new ol.layer.Vector({source:g}),k=this;g.on("featuresloadstart",function(a){k.removeSnapLayer(h)});g.on("featuresloadend",function(a){window.setTimeout(function(){k.addSnapLayer(h)},10)});return h};
 netgis.Map.prototype.createLayerVectorTiles=function(a,b,c,d){return new ol.layer.VectorTile({extent:b,source:new ol.source.VectorTile({format:new ol.format.MVT,overlaps:!0,url:a,minZoom:c,maxZoom:d})})};
 netgis.Map.prototype.createLayerKML=function(a){var b=new ol.layer.Vector({source:new ol.source.Vector({features:[]})}),c=this;netgis.util.request(a,function(a){a=(new ol.format.KML).readFeatures(a,{featureProjection:c.view.getProjection()});for(var d=0;d<a.length;d++){var f=a[d],g=f.getProperties(),h={fill:"rgba( 127, 127, 127, 0.5 )",stroke:"rgba( 127, 127, 127, 1.0 )",radius:5,width:3},k;for(k in g){var l=g[k];switch(k){case "fill":h.fill=l;break;case "fill-opacity":h["fill-opacity"]=l;break;case "stroke":h.stroke=
@@ -284,11 +295,11 @@ netgis.Map.prototype.zoomExtentLonLat=function(a,b,c,d){a=ol.proj.fromLonLat([a,
 netgis.Map.prototype.zoomFeature=function(a,b){a=this.layers[a].getSource().getFeatureById(b);this.view.fit(a.getGeometry().getExtent(),{duration:500})};netgis.Map.prototype.zoomFeatures=function(a){if(a&&!(1>a.length)){for(var b=a[0].getGeometry().getExtent(),c=1;c<a.length;c++)b=ol.extent.extend(b,a[c].getGeometry().getExtent());this.view.fit(b,{duration:0,padding:this.view.padding})}};
 netgis.Map.prototype.addViewHistory=function(a,b){if(0<this.viewHistory.length){var c=this.viewHistory[this.viewHistory.length-1],d=!0;10<Math.abs(a[0]-c.center[0])&&(d=!1);10<Math.abs(a[1]-c.center[1])&&(d=!1);.1<Math.abs(b-c.zoom)&&(d=!1);if(!0===d)return}this.viewHistory.push({center:a,zoom:b});this.viewHistory.length>this.viewHistoryMax&&this.viewHistory.shift();this.viewIndex=this.viewHistory.length-1};
 netgis.Map.prototype.gotoViewHistory=function(a){if(!(1>this.viewHistory.length)){var b=this.viewHistory.length-1;0>a&&(a=b);a>b&&(a=0);a!==this.viewIndex&&(b=this.viewHistory[a],this.viewIndex=a,this.viewFromHistory=!0,this.view.setCenter(b.center),this.view.setZoom(b.zoom))}};netgis.Map.prototype.setPadding=function(a,b,c,d){var e=this.paddingBuffer;this.view.padding=[a+e,b+e,c+e,d+e]};
-netgis.Map.prototype.exportImage=function(a,b,c,d,e){var f=this,g=this.container,h=this.map,k=this.config["export"],l=new Image;l.onload=function(){var m=document.createElement("div");m.style.position="fixed";m.style.top="0px";m.style.left="0px";m.style.width=b+"px";m.style.height=c+"px";m.style.background="white";m.style.zIndex=-1;m.style.opacity=0;m.style.pointerEvents="none";g.appendChild(m);h.setTarget(m);h.once("rendercomplete",function(){var n=document.createElement("canvas");n.width=b;n.height=
+netgis.Map.prototype.exportImage=function(a,b,c,d,e){var f=this,g=this.container,h=this.map,k=this.config["export"],l=new Image;l.onload=function(){var n=document.createElement("div");n.style.position="fixed";n.style.top="0px";n.style.left="0px";n.style.width=b+"px";n.style.height=c+"px";n.style.background="white";n.style.zIndex=-1;n.style.opacity=0;n.style.pointerEvents="none";g.appendChild(n);h.setTarget(n);h.once("rendercomplete",function(){var m=document.createElement("canvas");m.width=b;m.height=
-c;var q=n.getContext("2d");q.webkitImageSmoothingEnabled=!1;q.mozImageSmoothingEnabled=!1;q.imageSmoothingEnabled=!1;Array.prototype.forEach.call(document.querySelectorAll(".ol-layer canvas"),function(a){if(0<a.width){var b=a.parentNode.style.opacity;q.globalAlpha=""===b?1:Number(b);b=a.style.transform.match(/^matrix\(([^\(]*)\)$/)[1].split(",").map(Number);CanvasRenderingContext2D.prototype.setTransform.apply(q,b);q.drawImage(a,0,0)}});q.drawImage(l,0,0);q.fillStyle="#fff";q.fillRect(0,n.height-
+c;var q=m.getContext("2d");q.webkitImageSmoothingEnabled=!1;q.mozImageSmoothingEnabled=!1;q.imageSmoothingEnabled=!1;Array.prototype.forEach.call(document.querySelectorAll(".ol-layer canvas"),function(a){if(0<a.width){var b=a.parentNode.style.opacity;q.globalAlpha=""===b?1:Number(b);b=a.style.transform.match(/^matrix\(([^\(]*)\)$/)[1].split(",").map(Number);CanvasRenderingContext2D.prototype.setTransform.apply(q,b);q.drawImage(a,0,0)}});q.drawImage(l,0,0);q.fillStyle="#fff";q.fillRect(0,m.height-
-30,140,30);q.fillStyle="#000";q.font="4mm sans-serif";q.fillText(netgis.util.getTimeStamp(),10,n.height-10);var p=document.createElement("a");switch(a){case "pdf":e=e?e:0;var r=297-e-e,v=210-e-e,t=n.width/n.height;if(!d){var w=r;r=v;v=w}if(n.height>n.width){var u=v;w=u*t;w>r&&(w=r,u=w/t)}else w=r,u=w/t,u>v&&(u=v,w=u*t);t=new jsPDF(d?"l":"p");var x=e;x+=(r-w)/2;r=e;r+=(v-u)/2;t.addImage(n.toDataURL("image/png,1.0",1),"PNG",x,r,w,u);t.setFillColor(255,255,255);t.rect(x,r+u-11,80,11,"F");t.setFontSize(8);
+30,140,30);q.fillStyle="#000";q.font="4mm sans-serif";q.fillText(netgis.util.getTimeStamp(),10,m.height-10);var p=document.createElement("a");switch(a){case "pdf":e=e?e:0;var r=297-e-e,v=210-e-e,t=m.width/m.height;if(!d){var w=r;r=v;v=w}if(m.height>m.width){var u=v;w=u*t;w>r&&(w=r,u=w/t)}else w=r,u=w/t,u>v&&(u=v,w=u*t);t=new jsPDF(d?"l":"p");var x=e;x+=(r-w)/2;r=e;r+=(v-u)/2;t.addImage(m.toDataURL("image/png,1.0",1),"PNG",x,r,w,u);t.setFillColor(255,255,255);t.rect(x,r+u-11,80,11,"F");t.setFontSize(8);
-t.text("Datum: "+netgis.util.getTimeStamp(),x+2,r+u-2-4);t.text("Quelle: "+window.location.href,x+2,r+u-2);n=t.output("bloburl",{filename:k.default_filename+".pdf"});window.open(n,"_blank");break;case "jpeg":window.navigator.msSaveBlob?window.navigator.msSaveBlob(n.msToBlob(),k.default_filename+".jpg"):(p.setAttribute("download",k.default_filename+".jpg"),p.setAttribute("href",n.toDataURL("image/jpeg",1)),p.click());break;case "png":window.navigator.msSaveBlob?window.navigator.msSaveBlob(n.msToBlob(),
+t.text("Datum: "+netgis.util.getTimeStamp(),x+2,r+u-2-4);t.text("Quelle: "+window.location.href,x+2,r+u-2);m=t.output("bloburl",{filename:k.default_filename+".pdf"});window.open(m,"_blank");break;case "jpeg":window.navigator.msSaveBlob?window.navigator.msSaveBlob(m.msToBlob(),k.default_filename+".jpg"):(p.setAttribute("download",k.default_filename+".jpg"),p.setAttribute("href",m.toDataURL("image/jpeg",1)),p.click());break;case "png":window.navigator.msSaveBlob?window.navigator.msSaveBlob(m.msToBlob(),
-k.default_filename+".png"):(p.setAttribute("download",k.default_filename+".png"),p.setAttribute("href",n.toDataURL("image/png",1)),p.click());break;case "gif":p.setAttribute("download",k.default_filename+".gif"),v=new GIF({workerScript:k.gif_worker,quality:1}),v.addFrame(n),v.on("finished",function(a){p.setAttribute("href",window.URL.createObjectURL(a));p.click()}),v.render()}h.setTarget(g);g.removeChild(m);netgis.util.invoke(f.container,netgis.Events.EXPORT_END,null)});h.renderSync()};l.src=k.logo};
+k.default_filename+".png"):(p.setAttribute("download",k.default_filename+".png"),p.setAttribute("href",m.toDataURL("image/png",1)),p.click());break;case "gif":p.setAttribute("download",k.default_filename+".gif"),v=new GIF({workerScript:k.gif_worker,quality:1}),v.addFrame(m),v.on("finished",function(a){p.setAttribute("href",window.URL.createObjectURL(a));p.click()}),v.render()}h.setTarget(g);g.removeChild(n);netgis.util.invoke(f.container,netgis.Events.EXPORT_END,null)});h.renderSync()};l.src=k.logo};
 netgis.Map.prototype.exportFeatures=function(a){var b=this.editLayer.getSource().getFeatures();!0===a&&(a=this.nonEditLayer.getSource().getFeatures(),b=b.concat(a));b=(new ol.format.GeoJSON).writeFeaturesObject(b,{featureProjection:this.view.getProjection(),dataProjection:"EPSG:4326"});a=this.config["export"].default_filename+".geojson";b.name=a;netgis.util.downloadJSON(b,a);netgis.util.invoke(this.container,netgis.Events.EXPORT_END,null)};netgis.Map.prototype.onClientContextResponse=function(a){this.initConfig(a.detail.context.config)};
 netgis.Map.prototype.onEditLayerLoaded=function(a){a=a.detail.geojson;var b=new ol.format.GeoJSON;b.readProjection(a);a=b.readFeatures(a,{featureProjection:this.view.getProjection().getCode()});var c=this,d=a.slice();window.setTimeout(function(){c.zoomFeatures(d)},10);b=[];for(var e=0;e<a.length;e++){var f=a[e];!0===f.getProperties().editable&&b.push(f)}for(e=0;e<b.length;e++)a.splice(a.indexOf(b[e]),1);this.editEventsSilent=!0;this.editLayer.getSource().addFeatures(b);this.nonEditLayer.getSource().addFeatures(a);
 this.editEventsSilent=!1};netgis.Map.prototype.onClientSetMode=function(a){this.setMode(a.detail.mode)};netgis.Map.prototype.onPanelResize=function(a){this.setPadding(0,0,0,a.detail.width);this.redrawVectorLayers()};
@@ -443,11 +454,11 @@ netgis.SearchPlace.prototype.onSearchResponse=function(a){a=JSON.parse(a);this.s
 this.search.addResult(d,JSON.stringify(c))};netgis.SearchPlace.prototype.onSearchSelect=function(a){a=JSON.parse(a.detail.data);netgis.util.invoke(this.container,netgis.Events.MAP_ZOOM_LONLAT,{lon:a.lon,lat:a.lat,zoom:this.config.searchplace.zoom});if("street"===a.type){var b=this.config.searchplace.url_detail;b&&(b=netgis.util.replace(b,"{id}",a.id),netgis.util.request(b,this.onSearchDetailResponse.bind(this)))}};
 netgis.SearchPlace.prototype.onSearchDetailResponse=function(a){a=JSON.parse(a);var b=a.hsnrarr;if(0!==b.length){this.search.clearResults();for(var c=0;c<b.length;c++){var d=b[c],e=a.strname+" "+d.hsnr;d={type:"address",lon:Number.parseFloat(d.wgs_x),lat:Number.parseFloat(d.wgs_y)};this.search.addResult(e,JSON.stringify(d))}}};netgis.SearchPlace.prototype.onSearchClear=function(a){};netgis=netgis||{};
 netgis.SLD=function(){return{read:function(a,b){var c={};a=(new DOMParser).parseFromString(a,"text/xml").getElementsByTagName("NamedLayer");for(var d=0;d<a.length;d++){var e=a[d],f=e.getElementsByTagName("se:Name")[0].innerHTML;console.info("Layer:",f);e=e.getElementsByTagName("se:FeatureTypeStyle");for(f=0;f<e.length;f++)for(var g=e[f].getElementsByTagName("se:Rule"),h=0;h<g.length;h++){var k=g[h],l=k.getElementsByTagName("se:Name")[0].innerHTML;console.info("Rule:",l);l=k.getElementsByTagName("se:PolygonSymbolizer")[0];k=
-l.getElementsByTagName("se:Fill")[0];l=l.getElementsByTagName("se:Stroke")[0];c.polygon={fill:k.querySelector("[name='fill']").innerHTML,stroke:l.querySelector("[name='stroke']").innerHTML,strokeWidth:Number.parseFloat(l.querySelector("[name='stroke-width']").innerHTML)}}}console.info("SLD:",c);b.invoke(netgis.Events.MAP_UPDATE_STYLE,c);return c}}}();netgis=netgis||{};netgis.Tabs=function(a){this.initElements(a);this.setActiveTab(0)};
+l.getElementsByTagName("se:Fill")[0];l=l.getElementsByTagName("se:Stroke")[0];c.polygon={fill:k.querySelector("[name='fill']").innerHTML,stroke:l.querySelector("[name='stroke']").innerHTML,strokeWidth:Number.parseFloat(l.querySelector("[name='stroke-width']").innerHTML)}}}console.info("SLD:",c);b.invoke(netgis.Events.MAP_UPDATE_STYLE,c);return c}}}();netgis=netgis||{};netgis.Tabs=function(a){this.activeSection=null;this.initElements(a);this.setActiveTab(0)};
 netgis.Tabs.prototype.initElements=function(a){this.container=document.createElement("div");this.container.className="netgis-tabs";this.header=document.createElement("div");this.header.className="netgis-header netgis-color-d";this.container.appendChild(this.header);this.content=document.createElement("div");this.content.className="netgis-content netgis-color-e";this.container.appendChild(this.content);for(var b=0;b<a.length;b++){var c=document.createElement("button");c.setAttribute("type","button");
 c.addEventListener("click",this.onHeaderButtonClick.bind(this));c.className="netgis-button netgis-color-d";c.innerHTML=a[b];this.header.appendChild(c);c=document.createElement("section");c.className="netgis-color-e netgis-form";this.content.appendChild(c)}};netgis.Tabs.prototype.attachTo=function(a){a.appendChild(this.container)};
-netgis.Tabs.prototype.setActiveTab=function(a){for(var b=this.header.getElementsByClassName("netgis-button"),c=this.content.getElementsByTagName("section"),d=0;d<b.length;d++){var e=b[d],f=c[d];d===a?(e.classList.add("netgis-color-e"),e.classList.add("netgis-text-a"),e.classList.add("netgis-bar-a"),e.classList.add("netgis-active"),e.scrollIntoView({behavior:"smooth"}),f.classList.remove("netgis-hide"),f.scrollTop=0):(e.classList.remove("netgis-color-e"),e.classList.remove("netgis-text-a"),e.classList.remove("netgis-bar-a"),
+netgis.Tabs.prototype.setActiveTab=function(a){var b=this.header.getElementsByClassName("netgis-button"),c=this.content.getElementsByTagName("section");this.activeSection=null;for(var d=0;d<b.length;d++){var e=b[d],f=c[d];d===a?(e.classList.add("netgis-color-e"),e.classList.add("netgis-text-a"),e.classList.add("netgis-bar-a"),e.classList.add("netgis-active"),e.scrollIntoView({behavior:"smooth"}),f.classList.remove("netgis-hide"),f.scrollTop=0,this.activeSection=f):(e.classList.remove("netgis-color-e"),
-e.classList.remove("netgis-active"),f.classList.add("netgis-hide"))}};netgis.Tabs.prototype.getContentSection=function(a){return this.content.getElementsByTagName("section")[a]};netgis.Tabs.prototype.appendContent=function(a,b){this.content.getElementsByTagName("section")[a].appendChild(b)};
+e.classList.remove("netgis-text-a"),e.classList.remove("netgis-bar-a"),e.classList.remove("netgis-active"),f.classList.add("netgis-hide"))}netgis.util.invoke(this.container,netgis.Events.TABS_CHANGE,{index:a,section:this.activeSection})};netgis.Tabs.prototype.getContentSection=function(a){return this.content.getElementsByTagName("section")[a]};netgis.Tabs.prototype.appendContent=function(a,b){this.content.getElementsByTagName("section")[a].appendChild(b)};
 netgis.Tabs.prototype.updateHeaderScroll=function(){for(var a=0,b=this.header.getElementsByTagName("button"),c=0;c<b.length;c++){var d=b[c];a+=d.getBoundingClientRect().width;d.classList.contains("netgis-active")&&d.scrollIntoView()}b=this.header.getBoundingClientRect().width;a>b?this.container.classList.add("netgis-scroll"):this.container.classList.remove("netgis-scroll")};
 netgis.Tabs.prototype.onHeaderButtonClick=function(a){a=a.currentTarget;for(var b=this.header.getElementsByClassName("netgis-button"),c=0,d=0;d<b.length;d++)if(b[d]===a){c=d;break}this.setActiveTab(c)};netgis=netgis||{};netgis.TimeSlider=function(a){this.config=a;this.insertTop=!0;this.initElements();var b=this;window.setTimeout(function(){b.container.scrollLeft=0},1)};netgis.TimeSlider.Config={};
 netgis.TimeSlider.prototype.initElements=function(){this.container=document.createElement("section");this.container.className="netgis-timeslider netgis-footer netgis-noselect netgis-color-e netgis-hide";document.addEventListener("pointermove",this.onPointerMove.bind(this));document.addEventListener("pointerup",this.onPointerUp.bind(this));this.header=document.createElement("button");this.header.className="netgis-header netgis-button netgis-clip-text netgis-color-a netgis-hover-c netgis-shadow";this.header.innerHTML=
@@ -496,8 +507,9 @@ netgis.Toolbox.prototype.onDrawBufferChange=function(a){a=a.currentTarget.parent
 c,b[2].value=d,b[3].value=e)};netgis.Toolbox.prototype.onBufferFeaturesChange=function(a){var b=this.bottomPanels.bufferFeatures.getElementsByTagName("input");a=Number.parseFloat(b[0].value);b=Number.parseInt(b[1].value);netgis.util.invoke(this.bottomPanels.bufferFeatures,netgis.Events.BUFFER_CHANGE,{radius:a,segments:b})};netgis.Toolbox.prototype.onSelectMultipleChange=function(a){netgis.util.invoke(this.bottomPanels.bufferFeatures,netgis.Events.SELECT_MULTI_TOGGLE,{on:a.currentTarget.checked})};
 netgis.Toolbox.prototype.onSelectMultiToggle=function(a){a=a.detail;this.bottomPanels.bufferFeatures.getElementsByTagName("input")[2].checked=a.on};
 netgis.Toolbox.prototype.onBufferFeaturesAccept=function(a){var b=this.bottomPanels.bufferFeatures.getElementsByTagName("input");a=Number.parseFloat(b[0].value);b=Number.parseInt(b[1].value);netgis.util.invoke(this.bottomPanels.bufferFeatures,netgis.Events.BUFFER_ACCEPT,{radius:a,segments:b});netgis.util.invoke(this.bottomPanels.bufferFeatures,netgis.Events.CLIENT_SET_MODE,{mode:netgis.Modes.VIEW})};netgis=netgis||{};netgis.Tree=function(a){this.draggable=a?a:!1;this.dragElement=null;this.initElements()};netgis.Tree.prototype.initElements=function(){var a=document.createElement("ul");a.className="netgis-tree";this.container=a};netgis.Tree.prototype.attachTo=function(a){a.appendChild(this.container)};netgis.Tree.prototype.clear=function(){this.container.innerHTML=""};
-netgis.Tree.prototype.addFolder=function(a,b,c,d,e,f){var g=document.createElement("li");g.className="netgis-folder";g.setAttribute("data-id",b);b=document.createElement("details");g.appendChild(b);var h=document.createElement("summary");h.className="netgis-button netgis-noselect netgis-clip-text netgis-color-e netgis-hover-d";h.innerHTML="<i class='netgis-icon netgis-hide-open fas fa-folder'></i><i class='netgis-icon netgis-show-open fas fa-folder-open'></i><span>"+c+"</span>";b.appendChild(h);!0===
+netgis.Tree.prototype.addFolder=function(a,b,c,d,e,f,g){var h=document.createElement("li");h.className="netgis-folder";h.setAttribute("data-id",b);h.setAttribute("data-removable",g?!0:!1);b=document.createElement("details");h.appendChild(b);var k=document.createElement("summary");k.className="netgis-button netgis-noselect netgis-clip-text netgis-color-e netgis-hover-d";k.innerHTML="<i class='netgis-icon netgis-hide-open fas fa-folder'></i><i class='netgis-icon netgis-show-open fas fa-folder-open'></i><span>"+
-this.draggable&&(netgis.util.isDefined(f)&&!0!==f||this.setItemDraggable(h));c=document.createElement("label");h.appendChild(c);f=document.createElement("input");f.setAttribute("type","checkbox");f.onchange=this.onFolderChange.bind(this);c.appendChild(f);!0===e&&g.classList.add("netgis-nocheck");e=document.createElement("ul");b.appendChild(e);a=a?a.getElementsByTagName("ul")[0]:this.container;d?a.insertBefore(g,a.firstChild):a.appendChild(g);return g};
+c+"</span>";b.appendChild(k);!0===this.draggable&&(netgis.util.isDefined(f)&&!0!==f||this.setItemDraggable(k));!0===g&&(c=document.createElement("button"),c.className="netgis-closer netgis-clickable netgis-color-d netgis-hover-d",c.innerHTML="<i class='fas fa-times'></i>",c.addEventListener("click",this.onFolderDeleteClick.bind(this)),k.appendChild(c));c=document.createElement("label");k.appendChild(c);k=document.createElement("input");k.setAttribute("type","checkbox");k.onchange=this.onFolderChange.bind(this);
+c.appendChild(k);!0===e&&h.classList.add("netgis-nocheck");e=document.createElement("ul");b.appendChild(e);a=a?a.getElementsByTagName("ul")[0]:this.container;d?a.insertBefore(h,a.firstChild):a.appendChild(h);return h};
 netgis.Tree.prototype.addCheckbox=function(a,b,c,d,e,f){var g=document.createElement("li");g.className="netgis-item";!0===this.draggable&&this.setItemDraggable(g);var h=document.createElement("label");h.className="netgis-button netgis-noselect netgis-clip-text netgis-color-e netgis-hover-d";h.innerHTML="<span>"+c+"</span>";g.appendChild(h);c=document.createElement("span");c.className="netgis-wrapper";h.insertBefore(c,h.firstChild);h=document.createElement("input");h.setAttribute("type","checkbox");
 h.setAttribute("data-id",b);d&&(h.checked=d);h.onchange=this.onItemChange.bind(this);c.appendChild(h);f&&this.addItemDetails(g,b,f);a=a?a.getElementsByTagName("ul")[0]:this.container;e?a.insertBefore(g,a.firstChild):a.appendChild(g);return g};
 netgis.Tree.prototype.addRadioButton=function(a,b,c,d,e){var f=document.createElement("li");f.className="netgis-item";var g=document.createElement("label");g.className="netgis-button netgis-noselect netgis-clip-text netgis-color-e netgis-hover-d";g.innerHTML="<span>"+c+"</span>";f.appendChild(g);c=document.createElement("span");c.className="netgis-wrapper";g.insertBefore(c,g.firstChild);g=a?"radio-"+a.getAttribute("data-id"):"radio-noname";var h=document.createElement("input");h.setAttribute("type",
@@ -509,12 +521,14 @@ netgis.Tree.prototype.addItemDetails=function(a,b,c){var d=document.createElemen
 b);l.addEventListener("change",this.onItemSliderChange.bind(this));l.addEventListener("input",this.onItemSliderChange.bind(this));this.draggable&&(l.setAttribute("draggable","true"),l.addEventListener("dragstart",function(a){a.preventDefault();a.stopImmediatePropagation()}));k.appendChild(l)}e.appendChild(h)}a.appendChild(d)};
 netgis.Tree.prototype.setItemDraggable=function(a){a.setAttribute("draggable","true");a.addEventListener("dragstart",this.onDragStart.bind(this));a.addEventListener("dragenter",this.onDragEnter.bind(this));a.addEventListener("dragover",this.onDragOver.bind(this));a.addEventListener("dragleave",this.onDragLeave.bind(this));a.addEventListener("drop",this.onDragDrop.bind(this));a.addEventListener("dragend",this.onDragEnd.bind(this))};
 netgis.Tree.prototype.getFolder=function(a){for(var b=this.container.getElementsByClassName("netgis-folder"),c=0;c<b.length;c++){var d=b[c];if(d.getAttribute("data-id")===a)return d}return null};netgis.Tree.prototype.getItem=function(a){for(var b=this.container.getElementsByTagName("input"),c=0;c<b.length;c++){var d=b[c];if(d.getAttribute("data-id")===a)return d}return null};
-netgis.Tree.prototype.removeItem=function(a){if(a=this.getItem(a))a=a.parentNode.parentNode.parentNode,a.parentNode.removeChild(a),this.removeEmptyFolders(),this.updateFolderChecks()};netgis.Tree.prototype.removeEmptyFolders=function(){for(var a=this.container.getElementsByClassName("netgis-folder"),b=0;b<a.length;b++)a[b].getElementsByTagName("ul")[0].getElementsByTagName("li")};
+netgis.Tree.prototype.removeItem=function(a){var b=this.getItem(a);b&&(b=b.parentNode.parentNode.parentNode,netgis.util.invoke(b,netgis.Events.TREE_ITEM_REMOVE,{id:a}),b.parentNode.removeChild(b),this.removeEmptyFolders(),this.updateFolderChecks())};netgis.Tree.prototype.removeFolder=function(a){"true"===a.getAttribute("data-removable")&&(a.parentNode.removeChild(a),this.removeEmptyFolders())};
+netgis.Tree.prototype.removeEmptyFolders=function(){for(var a=this.container.getElementsByClassName("netgis-folder"),b=0;b<a.length;b++){var c=a[b];0===c.getElementsByTagName("ul")[0].getElementsByTagName("li").length&&this.removeFolder(c)}};
 netgis.Tree.prototype.setFolderOpen=function(a,b){var c=this.container.getElementsByClassName("netgis-folder");a=a.toString();for(var d=0;d<c.length;d++){var e=c[d],f=e.getElementsByTagName("details")[0];e.getAttribute("data-id")===a&&(!0===b?f.setAttribute("open",""):f.removeAttribute("open"))}};
 netgis.Tree.prototype.setItemChecked=function(a,b,c){var d=this.container.getElementsByClassName("netgis-item");a=a.toString();for(var e=0;e<d.length;e++){var f=d[e],g=f.getElementsByTagName("input")[0];if(g.getAttribute("data-id")===a){if("radio"===g.getAttribute("type")){f=f.parentNode.getElementsByTagName("input");for(var h=0;h<f.length;h++){var k=f[h];k!==g&&"radio"===k.getAttribute("type")&&!1!==k.checked&&(k.checked=!1,netgis.util.invoke(g,netgis.Events.TREE_ITEM_CHANGE,{id:k.getAttribute("data-id"),
 checked:!1}))}}c?g.checked=b:g.checked!==b&&g.click()}}};netgis.Tree.prototype.setFolderParent=function(a,b){var c=a.parentNode;c&&c.removeChild(a);null!==b?b.getElementsByTagName("ul")[0].appendChild(a):this.container.appendChild(a)};netgis.Tree.prototype.updateFolderChecks=function(){for(var a=this.container.getElementsByClassName("netgis-folder"),b=0;b<a.length;b++)this.updateFolderCheck(a[b])};
 netgis.Tree.prototype.updateFolderCheck=function(a){a||(a=this.container);for(var b=a.getElementsByClassName("netgis-item"),c=0,d=0;d<b.length;d++){var e=b[d].getElementsByTagName("input")[0];e.checked&&c++}e=a.getElementsByTagName("input")[0];d=0;0<c&&(d=1);0<c&&c===b.length&&(d=2);switch(d){case 0:e.checked=!1;e.classList.remove("netgis-partial");break;case 1:e.checked=!0;e.classList.add("netgis-partial");break;case 2:e.checked=!0,e.classList.remove("netgis-partial")}(a=a.parentElement)&&a!==this.container&&
 (a=a.parentElement.parentElement)&&-1!==a.className.search("netgis-folder")&&this.updateFolderCheck(a)};netgis.Tree.prototype.onFolderChange=function(a){var b=a.currentTarget;a=b.checked;b=b.parentElement.parentElement.parentElement.parentElement.getElementsByTagName("input");for(var c=1;c<b.length;c++){var d=b[c];d.checked!==a&&d.click()}this.updateFolderChecks()};
+netgis.Tree.prototype.onFolderDeleteClick=function(a){a=a.currentTarget.parentNode.parentNode.parentNode.getElementsByClassName("netgis-item");for(var b=[],c=0;c<a.length;c++){var d=a[c].getElementsByTagName("input")[0].getAttribute("data-id");b.push(d)}for(c=0;c<b.length;c++)this.removeItem(b[c])};
 netgis.Tree.prototype.onItemChange=function(a){a=a.currentTarget;var b=a.checked,c=a.getAttribute("data-id");if("radio"===a.getAttribute("type"))for(var d=a.parentNode.parentNode.parentNode.parentNode.getElementsByTagName("input"),e=0;e<d.length;e++){var f=d[e].getAttribute("data-id");f&&f!==c&&netgis.util.invoke(a,netgis.Events.TREE_ITEM_CHANGE,{id:f,checked:!1})}netgis.util.invoke(a,netgis.Events.TREE_ITEM_CHANGE,{id:c,checked:b});this.updateFolderChecks()};
 netgis.Tree.prototype.onRadioChange=function(a){a=a.currentTarget;var b=a.checked,c=a.getAttribute("data-id"),d=Number.parseInt(c);Number.isNaN(d)||(c=d);d=a.parentElement.parentElement.parentElement.parentElement.parentElement;netgis.util.invoke(a,netgis.Events.TREE_ITEM_CHANGE,{id:c,checked:b});-1!==d.className.search("netgis-folder")&&this.updateFolderCheck(d)};
 netgis.Tree.prototype.onButtonClick=function(a){a=a.currentTarget;var b=a.getAttribute("data-id");netgis.util.invoke(a,netgis.Events.TREE_BUTTON_CLICK,{id:b})};netgis.Tree.prototype.onItemSliderChange=function(a){a=a.currentTarget;var b=a.getAttribute("data-id");netgis.util.invoke(a,netgis.Events.TREE_ITEM_SLIDER_CHANGE,{id:b,val:Number.parseFloat(a.value)})};
@@ -530,9 +544,9 @@ this.replace(a,":",b);a=this.replace(a,";",b);a=this.replace(a,'"',b);a=this.rep
 b){a=a.replace(new RegExp("^"+b+"+"),"");return a=a.replace(new RegExp(b+"+$"),"")},foreach:a,template:function(b,d){a(d,function(a,c){b=b.replace(new RegExp("{"+a+"}","g"),c)});return b},newlines:function(a){return a.replace(/\n/g,"<br />")},create:function(a){var b=document.createElement("tbody");b.innerHTML=a;return b.children[0]},insideElement:function(a,b,e){a=a.getBoundingClientRect();return b<a.left||e<a.top||b>a.right||e>a.bottom?!1:!0},size:function(a){a=(new TextEncoder).encode(JSON.stringify(a)).length;
 var b=a/1024;return{bytes:a,kilobytes:b,megabytes:b/1024}},request:function(a,b,e,f){f=new XMLHttpRequest;e&&(f._requestData=e);f.onload=function(){b(this.responseText,this._requestData,this)};f.withCredentials=!1;f.open("GET",a,!0);f.send();return f},downloadJSON:function(a,b){a="data:text/json;charset=utf-8,"+encodeURIComponent(JSON.stringify(a));var c=document.createElement("a");c.setAttribute("href",a);c.setAttribute("download",b);document.body.appendChild(c);c.click();c.remove()},padstr:function(a,
 b){for(a=a.toString();a.length<b;)a="0"+a;return a},merge:function(a,b){return Object.assign(a,b)},getTimeStamp:function(a){var b=new Date;if(!0===a){a=b.getFullYear();var c=b.getMonth()+1,f=b.getDate(),g=b.getHours(),h=b.getMinutes();b=b.getSeconds();10>c&&(c="0"+c);10>f&&(f="0"+f);10>g&&(g="0"+g);10>h&&(h="0"+h);10>b&&(b="0"+b);a=[a,c,f,"_",g,h,b].join("")}else a=b.getDate()+"."+(b.getMonth()+1)+"."+b.getFullYear(),a+=" "+b.getHours()+":"+b.getMinutes();return a},getUserLanguage:b,getFileExtension:function(a){a=
-a.split(".");return 1>=a.length?"":a[a.length-1]},parseURL:function(a){var b=a.indexOf("?"),c=-1<b?a.substr(0,b):a,f=[];if(-1<b)for(a=a.substr(b+1),a=a.split("&"),b=0;b<a.length;b++){var g=a[b];g=g.toLowerCase();-1<g.search("request")||f.push(g)}return{base:c,parameters:f}},formatDistance:function(a){return 100<a?Math.round(a/1E3*100)/100+" km":Math.round(100*a)/100+" m"},formatLength:function(a,b){var c=1E3<a;a=c?b?Math.round(a/1E3*1E3)/1E3:Math.round(a/1E3):b?Math.round(100*a)/100:Math.round(a);
+a.split(".");return 1>=a.length?"":a[a.length-1]},parseURL:function(a,b){var c=a.indexOf("?"),d=-1<c?a.substr(0,c):a,g=[];if(-1<c)if(a=a.substr(c+1),a=a.split("&"),b)for(g={},b=0;b<a.length;b++)c=a[b],c=c.split("="),0<c[0].length&&(g[c[0]]=1<c.length?c[1]:!0);else for(b=0;b<a.length;b++)c=a[b],g.push(c);return{base:d,parameters:g}},formatDistance:function(a){return 100<a?Math.round(a/1E3*100)/100+" km":Math.round(100*a)/100+" m"},formatLength:function(a,b){var c=1E3<a;a=c?b?Math.round(a/1E3*1E3)/
-0===a&&(c=!1);return a+(c?" km":" m")},formatArea:function(a,d,e,f){a=(e=a>(e||1E5))?d?Math.round(a/1E6*1E3)/1E3:Math.round(a/1E6):d?Math.round(100*a)/100:Math.round(a);0===a&&(e=!1);a=a.toLocaleString(b());return a+(e?" km\u00b2":" m\u00b2")},hexToRGB:function(a){"#"===a.charAt(0)&&(a=a.substr(1));a=Number.parseInt(a,16);return[a>>16&255,a>>8&255,a&255]},invoke:function(a,b,e){a.dispatchEvent(new CustomEvent(b,{bubbles:!0,detail:e}))},handler:function(a,b){return function(c){b||(b=c);netgis.util.invoke(this,
+1E3:Math.round(a/1E3):b?Math.round(100*a)/100:Math.round(a);0===a&&(c=!1);return a+(c?" km":" m")},formatArea:function(a,d,e,f){a=(e=a>(e||1E5))?d?Math.round(a/1E6*1E3)/1E3:Math.round(a/1E6):d?Math.round(100*a)/100:Math.round(a);0===a&&(e=!1);a=a.toLocaleString(b());return a+(e?" km\u00b2":" m\u00b2")},hexToRGB:function(a){"#"===a.charAt(0)&&(a=a.substr(1));a=Number.parseInt(a,16);return[a>>16&255,a>>8&255,a&255]},invoke:function(a,b,e){a.dispatchEvent(new CustomEvent(b,{bubbles:!0,detail:e}))},handler:function(a,
-a,b)}}}}();netgis=netgis||{};netgis.Window=function(a){this.resizing=this.dragging=!1;this.py=this.px=0;this.initElements(a);this.initEvents();var b=this;window.setTimeout(function(){var a=b.container.getBoundingClientRect();b.container.style.right="auto";b.container.style.bottom="auto";b.container.style.left=a.left+"px";b.container.style.top=a.top+"px"},100)};
+b){return function(c){b||(b=c);netgis.util.invoke(this,a,b)}}}}();netgis=netgis||{};netgis.Window=function(a){this.resizing=this.dragging=!1;this.py=this.px=0;this.initElements(a);this.initEvents();var b=this;window.setTimeout(function(){var a=b.container.getBoundingClientRect();b.container.style.right="auto";b.container.style.bottom="auto";b.container.style.left=a.left+"px";b.container.style.top=a.top+"px"},100)};
 netgis.Window.prototype.initElements=function(a){this.container=document.createElement("section");this.container.className="netgis-window netgis-shadow";this.header=document.createElement("button");this.header.setAttribute("type","button");this.header.className="netgis-mover netgis-button netgis-clip-text netgis-color-c netgis-gradient-a netgis-shadow";this.header.innerHTML=a;this.container.appendChild(this.header);this.closer=document.createElement("button");this.closer.className="netgis-closer netgis-button netgis-text-e";
 this.closer.innerHTML='<i class="netgis-icon fas fa-times"></i>';this.closer.setAttribute("type","button");this.container.appendChild(this.closer);this.content=document.createElement("div");this.content.className="netgis-content";this.container.appendChild(this.content)};
 netgis.Window.prototype.initEvents=function(){this.closer.addEventListener("click",this.onCloserClick.bind(this));this.header.addEventListener("pointerdown",this.onPointerDown.bind(this));document.addEventListener("pointermove",this.onDocPointerMove.bind(this));document.addEventListener("pointerup",this.onDocPointerUp.bind(this));this.observer=new ResizeObserver(this.onResizeObserve.bind(this));this.observer.observe(this.container,{attributes:!0})};netgis.Window.prototype.attachTo=function(a){a.appendChild(this.container)};
@@ -543,8 +557,13 @@ this.container.style.right="auto";this.container.style.bottom="auto"}};netgis.Wi
 netgis.WMC.prototype.requestLayers=function(a){var b=this.config.wmc;b?(b=b.layers_url,b=netgis.util.replace(b,"{ids}",a.join(",")),netgis.util.request(b,this.onLayersResponse.bind(this))):console.error("no config[ 'wmc' ] found, skipping WMC layer loading")};netgis.WMC.prototype.onLayersResponse=function(a){this.layers=a=JSON.parse(a);console.info("WMC Layers Response:",a);this.callback&&this.callback({config:this.toConfig()})};
 netgis.WMC.prototype.toConfig=function(){var a=this.data.wmc,b=this.data.layerList,c=this.layers.wms.srv,d={},e=a.bbox;e=e.split(",");for(var f=0;f<e.length;f++)e[f]=Number.parseFloat(e[f]);d.map={projection:a.crs,bbox:e};d.attribution||(d.attribution={});d.attribution.prefix=d.attribution.prefix?a.title+", "+d.attribution.prefix:a.title;a=d.folders=[];e=d.layers=[];this.parseServiceLayers(c,b,a,e);b=1E3;for(c=0;c<a.length;c++){f=a[c];for(var g=e.length-1;0<=g;g--){var h=e[g];h.folder===f.id&&(h.order=
 b,b+=1)}}return d};
-netgis.WMC.prototype.parseServiceLayers=function(a,b,c,d){c||(c=[]);d||(d=[]);for(var e=0;e<a.length;e++)for(var f=a[e],g=0;g<f.layer.length;g++){var h=f.layer[g];h.isRoot&&c.push({id:h.id,title:h.title,open:"1"===f.isopen});var k=h.layer;if(k){b&&k.sort(function(a,c){a=a.id;var d=c.id,e=null;c=null;for(var f=0;f<b.length;f++){var g=b[f];g.layerId.toString()===a&&(e=g);g.layerId.toString()===d&&(c=g)}a=e.layerPos;c=c.layerPos;return a<c?-1:a>c?1:0});for(var l=k.length-1;0<=l;l--){var m=k[l],n=m.id,
+netgis.WMC.prototype.parseServiceLayers=function(a,b,c,d){c||(c=[]);d||(d=[]);for(var e=0;e<a.length;e++)for(var f=a[e],g=0;g<f.layer.length;g++){var h=f.layer[g];h.isRoot&&c.push({id:h.id,title:h.title,open:"1"===f.isopen});var k=h.layer;if(k){b&&k.sort(function(a,c){a=a.id;var d=c.id,e=null;c=null;for(var f=0;f<b.length;f++){var g=b[f];g.layerId.toString()===a&&(e=g);g.layerId.toString()===d&&(c=g)}a=e.layerPos;c=c.layerPos;return a<c?-1:a>c?1:0});for(var l=k.length-1;0<=l;l--){var n=k[l],m=n.id,
-q=null;if(b)for(var p=0;p<b.length;p++)if(b[p].layerId.toString()===n){q=b[p];break}m=this.parseServiceLayer(n,f,h.id,m,q);d.push(m)}}}return{folders:c,layers:d}};netgis.WMC.prototype.parseServiceLayer=function(a,b,c,d,e){return{id:a,folder:c,title:d.title,active:e?e.active:!0,query:1===d.queryable,transparency:e?1-.01*e.opacity:0,order:1E3,type:netgis.LayerTypes.WMS,url:b.getMapUrl,name:d.name,format:e?e.currentFormat:"image/png"}};
+q=null;if(b)for(var p=0;p<b.length;p++)if(b[p].layerId.toString()===m){q=b[p];break}n=this.parseServiceLayer(m,f,h.id,n,q);d.push(n)}}}return{folders:c,layers:d}};netgis.WMC.prototype.parseServiceLayer=function(a,b,c,d,e){return{id:a,folder:c,title:d.title,active:e?e.active:!0,query:1===d.queryable,transparency:e?1-.01*e.opacity:0,order:1E3,type:netgis.LayerTypes.WMS,url:b.getMapUrl,name:d.name,format:e?e.currentFormat:"image/png"}};
 netgis.WMC.prototype.parseLayer=function(a,b,c){for(var d=null,e=0;e<c.length;e++)if(c[e].id===Number.parseInt(a.id)){d=c[e];break}d||(d={id:Number.parseInt(a.id),type:"layer"},c.push(d));d.title=a.title;d.name=a.name;d.parent=b;a.getLegendGraphicUrl&&a.getLegendGraphicUrlFormat&&(d.legendURL=a.getLegendGraphicUrl,d.legendFormat=a.getLegendGraphicUrlFormat);a.legendUrl&&(d.legendURL=window.decodeURIComponent(a.legendUrl),d.legendFormat=a.getLegendGraphicUrlFormat);d.queryable=1===a.layerQueryable||
-1===a.queryable?!0:!1;if(a.bbox){a=a.bbox.split(",");for(b=0;b<a.length;b++)a[b]=parseFloat(a[b]);d.bbox=[a[0],a[1],a[2],a[3]]}return d};
+1===a.queryable?!0:!1;if(a.bbox){a=a.bbox.split(",");for(b=0;b<a.length;b++)a[b]=parseFloat(a[b]);d.bbox=[a[0],a[1],a[2],a[3]]}return d};netgis=netgis||{};
-netgis.build="20251027"; 
+netgis.WMS={parseCapabilities:function(a){var b={layers:[],requests:{}};a=(new DOMParser).parseFromString(a,"text/xml").getElementsByTagName("Capability")[0];var c=a.getElementsByTagName("Request");if(0<c.length){c=c[0];var d=c.getElementsByTagName("GetMap");if(0<d.length){d=d[0];var e=null,f=d.getElementsByTagName("Get");0<f.length&&(e=f[0].getElementsByTagName("OnlineResource")[0].getAttribute("xlink:href"));f=[];d=d.getElementsByTagName("Format");for(var g=0;g<d.length;g++)f.push(d[g].innerHTML);b.requests.map=
+{url:e,format:f}}c=c.getElementsByTagName("GetFeatureInfo");if(0<c.length){c=c[0];e=null;f=c.getElementsByTagName("Get");0<f.length&&(e=f[0].getElementsByTagName("OnlineResource")[0].getAttribute("xlink:href"));f=[];d=c.getElementsByTagName("Format");for(g=0;g<d.length;g++)f.push(d[g].innerHTML);b.requests.info={url:e,format:f}}}e=a.getElementsByTagName("Layer");for(c=0;c<e.length;c++)f=e[c],f.parentNode===a&&b.layers.push(this.parseLayer(f,!0));return b},parseLayer:function(a,b){var c=this.getChildString(a,
+"Name"),d=this.getChildString(a,"Title"),e=this.getChildString(a,"Abstract"),f="1"===a.getAttribute("queryable"),g=this.getChild(a,"LatLonBoundingBox");g&&(g=[Number.parseFloat(g.getAttribute("minx")),Number.parseFloat(g.getAttribute("miny")),Number.parseFloat(g.getAttribute("maxx")),Number.parseFloat(g.getAttribute("maxy"))]);var h=a.getElementsByTagName("LegendURL");0<h.length?(h=h[0].getElementsByTagName("OnlineResource"),h=0<h.length?h[0].getAttribute("xlink:href"):null):h=null;c={name:c,title:d,
+abstract:e,queryable:f,bounds:g,legend:h,children:[]};if(b)for(b=a.getElementsByTagName("Layer"),d=0;d<b.length;d++)e=b[d],e.parentNode===a&&c.children.push(this.parseLayer(e,!0));return c},getChild:function(a,b){b=a.getElementsByTagName(b);if(0===b.length)return null;b=b[0];return b.parentNode!==a?null:b},getChildString:function(a,b){return(a=this.getChild(a,b))?a.innerHTML:null},buildRequestURL:function(a,b){var c=netgis.util.parseURL(a,!0);a=c.base;c=c.parameters;for(var d in c)"service"===d.toLowerCase()&&
+delete c[d],"request"===d.toLowerCase()&&delete c[d];console.info("CLEAN PARAMS:",c);c.service="WMS";c.request=b;b=[];for(d in c)b.push(d+"="+c[d]);return a+"?"+b.join("&")}};
+netgis.build="20251223";