IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

master #224

Merged
mpeltriaux merged 9 commits from master into Docker 2022-10-19 07:35:31 +02:00
Conversation 0 Commits 9 Files Changed 14 +17 -11
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d95827770d - Show all commits

11
konova/models/geometry.py
View File

@ -213,12 +213,9 @@ class Geometry(BaseResource):
geojson (dict): The FeatureCollection json (as dict) geojson (dict): The FeatureCollection json (as dict)
""" """
geom = self.geom geom = self.geom
geom.transform(ct=srid) if geom.srid != srid:
geom.transform(ct=srid)
polygons = []
for coords in geom.coords:
p = Polygon(coords[0], srid=geom.srid)
polygons.append(p)
geojson = { geojson = {
"type": "FeatureCollection", "type": "FeatureCollection",
"crs": { "crs": {
@ -230,8 +227,8 @@ class Geometry(BaseResource):
"features": [ "features": [
{ {
"type": "Feature", "type": "Feature",
"geometry": json.loads(x.geojson) "geometry": json.loads(geom.json),
} for x in polygons }
] ]
} }
return geojson return geojson

17
konova/templates/konova/includes/parcels/parcels.html
View File

@ -2,10 +2,19 @@
<div class="col-sm-12"> <div class="col-sm-12">
<div class="card"> <div class="card">
<div class="card-header rlp-r"> <div class="card-header rlp-r">
<h5> <div class="row">
{% fa5_icon 'search-location' %} <div class="col-6">
{% trans 'Spatial reference' %} <h5>
</h5> {% fa5_icon 'search-location' %}
{% trans 'Spatial reference' %}
</h5>
</div>
<div class="col-6 text-right">
<h5>
{{ obj.geometry.geom.area|floatformat:2 }} m²
</h5>
</div>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div hx-trigger="load, every 5s" hx-get="{% url 'geometry-parcels' geom_form.instance.geometry.id %}"> <div hx-trigger="load, every 5s" hx-get="{% url 'geometry-parcels' geom_form.instance.geometry.id %}">