Compare commits
4 Commits
e794f3fff2
..
1.22.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 112b74f5cd | |||
| 22a92cb3df | |||
| f5aaac2acf | |||
| 775e40e9ae |
@@ -156,6 +156,9 @@ class AbstractModelAPISerializer:
|
|||||||
if isinstance(geojson, dict):
|
if isinstance(geojson, dict):
|
||||||
geojson = json.dumps(geojson)
|
geojson = json.dumps(geojson)
|
||||||
geometry = geos.fromstr(geojson)
|
geometry = geos.fromstr(geojson)
|
||||||
|
is_4326 = Geometry.is_valid_4326(geometry)
|
||||||
|
if not is_4326:
|
||||||
|
raise ValueError("Geometry not in EPSG:4326 (WGS84). Unknown spatial reference system.")
|
||||||
geometry = Geometry.cast_to_rlp_srid(geometry)
|
geometry = Geometry.cast_to_rlp_srid(geometry)
|
||||||
geometry = Geometry.cast_to_multipolygon(geometry)
|
geometry = Geometry.cast_to_multipolygon(geometry)
|
||||||
return geometry
|
return geometry
|
||||||
|
|||||||
@@ -462,6 +462,26 @@ class Geometry(BaseResource):
|
|||||||
conflict_geoms = Geometry.objects.filter(id__in=conflict_geoms_id)
|
conflict_geoms = Geometry.objects.filter(id__in=conflict_geoms_id)
|
||||||
return conflict_geoms
|
return conflict_geoms
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_valid_4326(geometry):
|
||||||
|
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
||||||
|
|
||||||
|
Args:
|
||||||
|
geometry: The geometry
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ret_val (bool): Whether the geometry is valid EPSG:4326
|
||||||
|
"""
|
||||||
|
if not geometry.centroid.coords:
|
||||||
|
# No coordinates at all found, therefore technically proper 4326
|
||||||
|
return True
|
||||||
|
|
||||||
|
try:
|
||||||
|
lat,lon = geometry.centroid.coords
|
||||||
|
return (-90.0 <= lat <= 90.0) and (-180.0 <= lon <= 180.0)
|
||||||
|
except IndexError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class GeometryConflict(UuidModel):
|
class GeometryConflict(UuidModel):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -56,11 +56,9 @@
|
|||||||
],
|
],
|
||||||
"layers":
|
"layers":
|
||||||
[
|
[
|
||||||
{ "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_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": "luftbilder", "folder": "bg", "type": "WMS", "order": -1, "title": "Luftbilder", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/rp_dop20.fcgi?", "name": "rp_dop20", "active": false },
|
{ "id": "luftbilder", "folder": "bg", "type": "WMS", "order": -1, "title": "Luftbilder", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/rp_dop20.fcgi?", "name": "rp_dop20", "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": "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_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": "bg", "type": "WMS", "order": -1, "title": "BasemapDE grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": true },
|
||||||
{ "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": "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_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": "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 },
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user