# Issue #381
* adds another validity check to SimpleGeomForm (is_size_valid) to make sure the area of the entered geometry is somehow rational (>= 1m²) * optimizes performance of django command sanitize_db * extends Geometry model with two new attributes, holding timestamps when a parcel calculation has been started and ended * finally drops unused update_parcel_wfs in favor of update_parcels in Geometry model * refactors update_parcel method * adds geometry buffer fallback in schneider/fetcher.py to avoid emptying of geometries when parcels shall be fetched * finally removes utils/wfs/spatial.py * extends GeomParcelsView according to #381 * updates translations * removes redundant psycopg2-binary requirementpull/384/head
parent
4d215288b3
commit
5922d5ce06
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 5.0.1 on 2024-01-09 10:38
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('konova', '0014_resubmission'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='geometry',
|
||||||
|
name='parcel_update_end',
|
||||||
|
field=models.DateTimeField(blank=True, db_comment='When the last parcel calculation finished', help_text='When the last parcel calculation finished', null=True),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='geometry',
|
||||||
|
name='parcel_update_start',
|
||||||
|
field=models.DateTimeField(blank=True, db_comment='When the last parcel calculation started', help_text='When the last parcel calculation started', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -1,189 +0,0 @@
|
|||||||
"""
|
|
||||||
Author: Michel Peltriaux
|
|
||||||
Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
|
|
||||||
Contact: michel.peltriaux@sgdnord.rlp.de
|
|
||||||
Created on: 17.12.21
|
|
||||||
|
|
||||||
"""
|
|
||||||
import json
|
|
||||||
from abc import abstractmethod
|
|
||||||
from json import JSONDecodeError
|
|
||||||
from time import sleep
|
|
||||||
|
|
||||||
import requests
|
|
||||||
from django.contrib.gis.db.models.functions import AsGML, MakeValid
|
|
||||||
from django.db.models import Func, F
|
|
||||||
from requests.auth import HTTPDigestAuth
|
|
||||||
|
|
||||||
from konova.settings import PARCEL_WFS_USER, PARCEL_WFS_PW, PROXIES
|
|
||||||
|
|
||||||
|
|
||||||
class AbstractWFSFetcher:
|
|
||||||
""" Base class for fetching WFS data
|
|
||||||
|
|
||||||
"""
|
|
||||||
# base_url represents not the capabilities url but the parameter-free base url
|
|
||||||
base_url = None
|
|
||||||
version = None
|
|
||||||
auth_user = None
|
|
||||||
auth_pw = None
|
|
||||||
auth_digest_obj = None
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
abstract = True
|
|
||||||
|
|
||||||
def __init__(self, base_url: str, version: str = "1.1.0", auth_user: str = None, auth_pw: str = None, *args, **kwargs):
|
|
||||||
self.base_url = base_url
|
|
||||||
self.version = version
|
|
||||||
self.auth_pw = auth_pw
|
|
||||||
self.auth_user = auth_user
|
|
||||||
|
|
||||||
self._create_auth_obj()
|
|
||||||
|
|
||||||
def _create_auth_obj(self):
|
|
||||||
if self.auth_pw is not None and self.auth_user is not None:
|
|
||||||
self.auth_digest_obj = HTTPDigestAuth(
|
|
||||||
self.auth_user,
|
|
||||||
self.auth_pw
|
|
||||||
)
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def get_features(self, feature_identifier: str, filter_str: str):
|
|
||||||
raise NotImplementedError
|
|
||||||
|
|
||||||
|
|
||||||
class ParcelWFSFetcher(AbstractWFSFetcher):
|
|
||||||
""" Fetches features from a special parcel WFS
|
|
||||||
|
|
||||||
"""
|
|
||||||
geometry_id = None
|
|
||||||
geometry_property_name = None
|
|
||||||
count = 100
|
|
||||||
|
|
||||||
def __init__(self, geometry_id: str, geometry_property_name: str = "msGeometry", *args, **kwargs):
|
|
||||||
super().__init__(
|
|
||||||
version="2.0.0",
|
|
||||||
base_url="https://www.geoportal.rlp.de/registry/wfs/519",
|
|
||||||
auth_user=PARCEL_WFS_USER,
|
|
||||||
auth_pw=PARCEL_WFS_PW,
|
|
||||||
*args,
|
|
||||||
**kwargs
|
|
||||||
)
|
|
||||||
self.geometry_id = geometry_id
|
|
||||||
self.geometry_property_name = geometry_property_name
|
|
||||||
|
|
||||||
def _create_spatial_filter(self,
|
|
||||||
geometry_operation: str):
|
|
||||||
""" Creates a xml spatial filter according to the WFS filter specification
|
|
||||||
|
|
||||||
The geometry needs to be shrinked by a very small factor (-0.01) before a GML can be created for intersection
|
|
||||||
checking. Otherwise perfect parcel outline placement on top of a neighbouring parcel would result in an
|
|
||||||
intersection hit, despite the fact they do not truly intersect just because their vertices match.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
geometry_operation (str): One of the WFS supported spatial filter operations (according to capabilities)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
spatial_filter (str): The spatial filter element
|
|
||||||
"""
|
|
||||||
from konova.models import Geometry
|
|
||||||
|
|
||||||
geom = Geometry.objects.filter(
|
|
||||||
id=self.geometry_id
|
|
||||||
).annotate(
|
|
||||||
smaller=Func(F('geom'), -0.001, function="ST_Buffer") # same as geometry.geom_small_buffered but for QuerySet
|
|
||||||
).annotate(
|
|
||||||
gml=AsGML(MakeValid('smaller'))
|
|
||||||
).first()
|
|
||||||
geom_gml = geom.gml
|
|
||||||
spatial_filter = f"<Filter><{geometry_operation}><PropertyName>{self.geometry_property_name}</PropertyName>{geom_gml}</{geometry_operation}></Filter>"
|
|
||||||
return spatial_filter
|
|
||||||
|
|
||||||
def _create_post_data(self,
|
|
||||||
geometry_operation: str,
|
|
||||||
typenames: str = None,
|
|
||||||
start_index: int = 0,
|
|
||||||
):
|
|
||||||
""" Creates a POST body content for fetching features
|
|
||||||
|
|
||||||
Args:
|
|
||||||
geometry_operation (str): One of the WFS supported spatial filter operations (according to capabilities)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
_filter (str): A proper xml WFS filter
|
|
||||||
"""
|
|
||||||
start_index = str(start_index)
|
|
||||||
spatial_filter = self._create_spatial_filter(
|
|
||||||
geometry_operation
|
|
||||||
)
|
|
||||||
_filter = f'<wfs:GetFeature service="WFS" version="{self.version}" xmlns:wfs="http://www.opengis.net/wfs/2.0" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:myns="http://www.someserver.com/myns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0.0/wfs.xsd" count="{self.count}" startindex="{start_index}" outputFormat="application/json; subtype=geojson"><wfs:Query typeNames="{typenames}">{spatial_filter}</wfs:Query></wfs:GetFeature>'
|
|
||||||
return _filter
|
|
||||||
|
|
||||||
def get_features(self,
|
|
||||||
typenames: str,
|
|
||||||
spatial_operator: str = "Intersects",
|
|
||||||
filter_srid: str = None,
|
|
||||||
start_index: int = 0,
|
|
||||||
rerun_on_exception: bool = True
|
|
||||||
):
|
|
||||||
""" Fetches features from the WFS using POST
|
|
||||||
|
|
||||||
POST is required since GET has a character limit around 4000. Having a larger filter would result in errors,
|
|
||||||
which do not occur in case of POST.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
typenames (str): References to parameter 'typenames' in a WFS GetFeature request
|
|
||||||
spatial_operator (str): Defines the spatial operation for filtering
|
|
||||||
filter_srid (str): Defines the spatial reference system, the geometry shall be transformed into for filtering
|
|
||||||
start_index (str): References to parameter 'startindex' in a
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
features (list): A list of returned features
|
|
||||||
"""
|
|
||||||
found_features = []
|
|
||||||
while start_index is not None:
|
|
||||||
post_body = self._create_post_data(
|
|
||||||
spatial_operator,
|
|
||||||
typenames,
|
|
||||||
start_index
|
|
||||||
)
|
|
||||||
response = requests.post(
|
|
||||||
url=self.base_url,
|
|
||||||
data=post_body,
|
|
||||||
auth=self.auth_digest_obj,
|
|
||||||
proxies=PROXIES,
|
|
||||||
)
|
|
||||||
|
|
||||||
content = response.content.decode("utf-8")
|
|
||||||
try:
|
|
||||||
# Check if collection is an exception and does not contain the requested data
|
|
||||||
content = json.loads(content)
|
|
||||||
except JSONDecodeError as e:
|
|
||||||
if rerun_on_exception:
|
|
||||||
# Wait a second before another try
|
|
||||||
sleep(1)
|
|
||||||
self.get_features(
|
|
||||||
typenames,
|
|
||||||
spatial_operator,
|
|
||||||
filter_srid,
|
|
||||||
start_index,
|
|
||||||
rerun_on_exception=False
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
e.msg += content
|
|
||||||
raise e
|
|
||||||
fetched_features = content.get(
|
|
||||||
"features",
|
|
||||||
{},
|
|
||||||
)
|
|
||||||
|
|
||||||
found_features += fetched_features
|
|
||||||
|
|
||||||
if len(fetched_features) < self.count:
|
|
||||||
# The response was not 'full', so we got everything to fetch
|
|
||||||
start_index = None
|
|
||||||
else:
|
|
||||||
# If a 'full' response returned, there might be more to fetch. Increase the start_index!
|
|
||||||
start_index += self.count
|
|
||||||
|
|
||||||
return found_features
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue