compensation/tests/compensation/test_workflow.py

@@ -54,7 +54,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
             "intervention": self.intervention.id,
         }
         pre_creation_intervention_log_count = self.intervention.log.count()
@@ -94,7 +94,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
         }
         pre_creation_intervention_log_count = self.intervention.log.count()
 
@@ -150,7 +150,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
             "title": new_title,
             "intervention": self.intervention.id,  # just keep the intervention as it is
             "comment": new_comment,
-            "output": geojson,
+            "geom": geojson,
         }
         self.client_user.post(url, post_data)
         self.compensation.refresh_from_db()

compensation/tests/ecoaccount/test_workflow.py

@@ -46,7 +46,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }
@@ -103,7 +103,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "output": new_geometry.geojson,
+            "geom": new_geometry.geojson,
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }

ema/tests/test_workflow.py

@@ -46,7 +46,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(new_url, post_data)
@@ -99,7 +99,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "output": new_geometry.geojson,
+            "geom": new_geometry.geojson,
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(url, post_data)

ema/tests/unit/test_forms.py

@@ -48,7 +48,7 @@ class NewEmaFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "output": json.dumps(geom_form_data)
+            "geom": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)
@@ -116,7 +116,7 @@ class EditEmaFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "output": json.dumps(geom_form_data)
+            "geom": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)

intervention/tests/test_workflow.py

@@ -60,7 +60,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
         }
         response = self.client_user.post(
             new_url,

intervention/tests/unit/test_forms.py

@@ -62,7 +62,7 @@ class NewInterventionFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "output": json.dumps(geom_form_data)
+            "geom": json.dumps(geom_form_data)
         }
         geom_form = SimpleGeomForm(geom_form_data)
 
@@ -104,7 +104,7 @@ class EditInterventionFormTestCase(NewInterventionFormTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "output": json.dumps(geom_form_data)
+            "geom": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)

konova/forms/geometry_form.py

@@ -62,7 +62,7 @@ class SimpleGeomForm(BaseForm):
         is_valid = True
 
         # Get geojson from form
-        geom = self.data.get("output", None)
+        geom = self.data["output"]
         if geom is None or len(geom) == 0:
             # empty geometry is a valid geometry
             self.cleaned_data["output"] = MultiPolygon(srid=DEFAULT_SRID_RLP).ewkt
@@ -71,7 +71,7 @@ class SimpleGeomForm(BaseForm):
 
         # Write submitted data back into form field to make sure invalid geometry
         # will be rendered again on failed submit
-        self.initialize_form_field("output", self.data.get("output", None))
+        self.initialize_form_field("output", self.data["output"])
 
         # Read geojson into gdal geometry
         # HINT: This can be simplified if the geojson format holds data in epsg:4326 (GDAL provides direct creation for

konova/tests/test_geometries.py

@@ -124,7 +124,6 @@ class GeometryTestCase(BaseTestCase):
                 {
                     "type": "Feature",
                     "geometry": json.loads(p.json),
-                    "properties": {},
                 }
                 for p in polygons
             ]

konova/tests/test_views.py

@@ -345,7 +345,6 @@ class BaseTestCase(TestCase):
                 {
                     "type": "Feature",
                     "geometry": json.loads(geometry.geojson),
-                    "properties": {},
                 }
             ]
         }

templates/map/client/config.json

@@ -31,8 +31,8 @@
 	"map":
 	{
 		"projection": "EPSG:25832",
-		"center_lonlat": [ 7.0, 50.0 ],
+		"center_lonlat": [ 7.0, 51.0 ],
-		"zoom": 9.2,
+		"zoom": 12,
 		"min_zoom": 5,
 		"max_zoom": 24,
 		"scalebar": true,
@@ -41,18 +41,21 @@
 	"folders":
 	[
 		{ "id": "bg", "title": "Hintergrund", "parent": null , "radio":  true},
-		{ "id": "alkis", "parent": null, "title": "ALKIS Liegenschaften" },
+		{ "id": "alkis", "title": "ALKIS Liegenschaften", "parent": null },
-		{ "id": "verwaltung", "parent": null, "title": "Verwaltungsgrenzen" },
+		{ "id": "verwaltung", "title": "Verwaltungsgrenzen", "parent": null },
-		{ "id": "fachdaten", "parent": null, "title": "Geofachdaten" },
+		{ "id": "fachdaten", "title": "Geofachdaten", "parent": null },
-		{ "id": "ksp", "parent": "fachdaten", "title": "Kompensationsverzeichnis"},
+		{ "id": "ksp", "title": "Kompensationsverzeichnis", "parent": "fachdaten" },
-		{ "id": "schutzgebiet", "parent": "fachdaten", "title": "Schutzgebiete"},
+		{ "id": "kom", "title": "Kompensationen", "parent": "ksp" },
-		{ "id": "nationalpark", "parent": "schutzgebiet", "title": "Nationalparke"},
+		{ "id": "eiv", "title": "Eingriffe", "parent": "ksp" },
-		{ "id": "naturraum", "parent": "schutzgebiet", "title": "Naturräume" },
+		{ "id": "oek", "title": "Ökokonten", "parent": "ksp" },
-		{ "id": "kom", "parent": "ksp", "title": "Kompensationen" },
+		{ "id": "ema", "title": "EMA", "parent": "ksp" },
-		{ "id": "eiv", "parent": "ksp", "title": "Eingriffe" },
+		{ "id": "mae", "title": "MAE", "parent": "ksp" },
-		{ "id": "oek", "parent": "ksp", "title": "Ökokonten" },
+		{ "id": "schutzgebiet", "title": "Schutzgebiete", "parent": "fachdaten" },
-		{ "id": "ema", "parent": "ksp", "title": "EMA" },
+		{ "id": "nationalpark", "title": "Nationalparke", "parent": "schutzgebiet" },
-		{ "id": "mae", "parent": "ksp", "title": "MAE" }
+		{ "id": "naturraum", "title": "Naturräume", "parent": "schutzgebiet" },
+		{ "id": "dtk", "title": "Topographisch (DTK5)", "parent": "bg" },
+		{ "id": "basemap", "title": "BaseMap", "parent": "bg" },
+		{ "id": "webatlas", "title": "Webatlas", "parent": "bg" }
 	],
 	"layers":
 	[
@@ -92,13 +95,13 @@
 		{ "id": "vg", "folder": "verwaltung", "type": "WMS", "title": "Verbandsgemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" },
 		{ "id": "gmd", "folder": "verwaltung", "type": "WMS", "title": "Gemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" },
 
-		{ "id": "webatlas_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
+		{ "id": "webatlas_farbe", "folder": "webatlas", "type": "WMS", "order": -1, "title": "farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
-		{ "id": "webatlas_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
+		{ "id": "webatlas_grau", "folder": "webatlas", "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
-		{ "id": "luftbilder", "folder": "bg", "type": "WMS", "order": -1, "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
+		{ "id": "luftbilder", "folder": "bg", "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
-		{ "id": "basemap_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
+		{ "id": "basemap_farbe", "folder": "basemap", "type": "WMS", "title": "farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
-		{ "id": "basemap_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
+		{ "id": "basemap_grau", "folder": "basemap", "type": "WMS", "title": "grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
-		{ "id": "dtk_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },
+		{ "id": "dtk_farbe", "folder": "dtk", "type": "WMS", "title": "farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },
-		{ "id": "dtk_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false }
+		{ "id": "dtk_grau", "folder": "dtk", "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false }
 	],
 	"layertree":
 	{
@@ -223,8 +226,8 @@
 		"snapping":
 		{
 			"show": true,
-			"active": true,
+			"active": false,
-			"tolerance": 35
+			"tolerance": 10
 		},
 		"bounds_message": "Ausserhalb des erlaubten Bereichs!",
 		"show_bounds": true