From 02e8cfc76d16bbbad4f89d3541828b1463f1848d Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 16 Oct 2023 13:27:27 +0200 Subject: [PATCH 1/5] # Map client update * updates netgis map client to newest pre-release --- templates/map/client/config.json | 29 +- templates/map/client/index.html | 67 +- .../map/client/libs/netgis/Attribution.css | 11 - .../map/client/libs/netgis/Attribution.js | 86 - templates/map/client/libs/netgis/Client.css | 47 - templates/map/client/libs/netgis/Client.js | 304 --- templates/map/client/libs/netgis/Controls.css | 59 - templates/map/client/libs/netgis/Controls.js | 59 - templates/map/client/libs/netgis/Events.js | 81 - .../map/client/libs/netgis/LayerTree.css | 183 -- templates/map/client/libs/netgis/LayerTree.js | 475 ---- .../map/client/libs/netgis/LayerTypes.js | 14 - templates/map/client/libs/netgis/Map.css | 102 - templates/map/client/libs/netgis/Map.js | 20 - .../map/client/libs/netgis/MapOpenLayers.js | 2321 ----------------- templates/map/client/libs/netgis/Menu.css | 118 - templates/map/client/libs/netgis/Menu.js | 261 -- templates/map/client/libs/netgis/Modal.css | 161 -- templates/map/client/libs/netgis/Modal.js | 1020 -------- templates/map/client/libs/netgis/Modes.js | 27 - templates/map/client/libs/netgis/OWS.js | 237 -- templates/map/client/libs/netgis/SLD.js | 79 - .../map/client/libs/netgis/SearchParcel.css | 131 - .../map/client/libs/netgis/SearchParcel.js | 428 --- .../map/client/libs/netgis/SearchPlace.js | 59 - templates/map/client/libs/netgis/Theme.css | 69 - templates/map/client/libs/netgis/Toolbar.css | 139 - templates/map/client/libs/netgis/Toolbar.js | 564 ---- templates/map/client/libs/netgis/Util.js | 217 -- templates/map/client/netgis.min.css | 2 +- templates/map/client/netgis.min.js | 350 ++- 31 files changed, 267 insertions(+), 7453 deletions(-) delete mode 100644 templates/map/client/libs/netgis/Attribution.css delete mode 100644 templates/map/client/libs/netgis/Attribution.js delete mode 100644 templates/map/client/libs/netgis/Client.css delete mode 100644 templates/map/client/libs/netgis/Client.js delete mode 100644 templates/map/client/libs/netgis/Controls.css delete mode 100644 templates/map/client/libs/netgis/Controls.js delete mode 100644 templates/map/client/libs/netgis/Events.js delete mode 100644 templates/map/client/libs/netgis/LayerTree.css delete mode 100644 templates/map/client/libs/netgis/LayerTree.js delete mode 100644 templates/map/client/libs/netgis/LayerTypes.js delete mode 100644 templates/map/client/libs/netgis/Map.css delete mode 100644 templates/map/client/libs/netgis/Map.js delete mode 100644 templates/map/client/libs/netgis/MapOpenLayers.js delete mode 100644 templates/map/client/libs/netgis/Menu.css delete mode 100644 templates/map/client/libs/netgis/Menu.js delete mode 100644 templates/map/client/libs/netgis/Modal.css delete mode 100644 templates/map/client/libs/netgis/Modal.js delete mode 100644 templates/map/client/libs/netgis/Modes.js delete mode 100644 templates/map/client/libs/netgis/OWS.js delete mode 100644 templates/map/client/libs/netgis/SLD.js delete mode 100644 templates/map/client/libs/netgis/SearchParcel.css delete mode 100644 templates/map/client/libs/netgis/SearchParcel.js delete mode 100644 templates/map/client/libs/netgis/SearchPlace.js delete mode 100644 templates/map/client/libs/netgis/Theme.css delete mode 100644 templates/map/client/libs/netgis/Toolbar.css delete mode 100644 templates/map/client/libs/netgis/Toolbar.js delete mode 100644 templates/map/client/libs/netgis/Util.js diff --git a/templates/map/client/config.json b/templates/map/client/config.json index 5b8bf6c..8ef4f35 100644 --- a/templates/map/client/config.json +++ b/templates/map/client/config.json @@ -45,7 +45,6 @@ { "folder": 13, "type": "WMS", "title": "farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false }, { "folder": 13, "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false } ], - "folders": [ { "title": "Hintergrund", "parent": -1 }, @@ -65,7 +64,6 @@ { "title": "BaseMap", "parent": 0 }, { "title": "Webatlas", "parent": 0 } ], - "projections": [ [ "EPSG:25832", "+proj=utm +zone=32 +ellps=GRS80 +units=m +no_defs" ] @@ -78,7 +76,8 @@ "minZoom": 5, "maxZoom": 22, "zoom": 9, - "attribution": "LANIS RLP" + "attribution": "LANIS RLP", + "scalebar": true }, "output": @@ -94,9 +93,23 @@ "searchParcel": { "nameURL": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/gem_search.php?placename={q}", - "parcelURL": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/flur_search.php?gmk_gmn={district}&fln={field}&fsn_zae={parcelA}&fsn_nen={parcelB}&export=json" + "parcelURL": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/flur_search.php?gmk_gmn={district}&fln={field}&fsn_zae={parcelA}&fsn_nen={parcelB}&export=json", + "districts_service": + { + "type": "WFS", + "url": "http://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?", + "name": "vermkv:gemarkungen_rlp", + "order": 10, + "minZoom": 11, + "maxZoom": 17 + }, + "fields_service": + { + "url": "http://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?", + "name": "vermkv:fluren_rlp", + "filter_property": "gmkgnr" + } }, - "import": { "geopackageLibURL": "/libs/geopackage/4.2.3/" @@ -108,7 +121,6 @@ "defaultFilename": "Export", "defaultMargin": 10 }, - "tools": { "buffer": @@ -117,7 +129,6 @@ "defaultSegments": 2 } }, - "styles": { "editLayer": @@ -127,7 +138,6 @@ "strokeWidth": 3, "pointRadius": 6 }, - "select": { "fill": "rgba( 0, 127, 255, 0.5 )", @@ -135,7 +145,6 @@ "strokeWidth": 3, "pointRadius": 6 }, - "sketch": { "fill": "rgba( 0, 127, 255, 0.2 )", @@ -143,7 +152,6 @@ "strokeWidth": 3, "pointRadius": 6 }, - "modify": { "fill": "rgba( 0, 127, 255, 0.5 )", @@ -151,7 +159,6 @@ "strokeWidth": 3, "pointRadius": 6 }, - "parcel": { "fill": "rgba( 127, 255, 255, 0.5 )", diff --git a/templates/map/client/index.html b/templates/map/client/index.html index 9d77add..b45b77d 100644 --- a/templates/map/client/index.html +++ b/templates/map/client/index.html @@ -1,59 +1,34 @@ {% load static %} + - - + + - - - - - - - - - - + + + + + + + + + + + + + + + +
- - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -