From c232e1c349acc8556d308491fa4a3856047e6340 Mon Sep 17 00:00:00 2001 From: Jonas Geuens Date: Mon, 14 Sep 2020 16:18:14 +0200 Subject: [PATCH 1/6] #134 update kaartlagen closes #134 --- MapController.js | 14 ++++++-------- services/BeschermingService.js | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/MapController.js b/MapController.js index 7704a6b..e8ac295 100644 --- a/MapController.js +++ b/MapController.js @@ -144,14 +144,12 @@ define([ source: new ol.source.TileWMS(({ url: this.beschermingUrl, params: { - 'LAYERS': 'vioe_geoportaal:beschermde_landschappen,' + - 'vioe_geoportaal:beschermde_dorps_en_stadsgezichten,' + - 'vioe_geoportaal:beschermde_archeologische_zones,' + - 'vioe_geoportaal:beschermde_monumenten,' + - 'vioe_geoportaal:dibe_geheel,' + - 'vioe_geoportaal:dibe_relict,' + - 'vioe_geoportaal:ile_park,' + - 'vioe_geoportaal:ile_boom', + 'LAYERS': 'vioe_geoportaal:bes_landschap,' + + 'vioe_geoportaal:bes_sd_gezicht,' + + 'vioe_geoportaal:bes_arch_site,' + + 'vioe_geoportaal:bes_monument,' + + 'vioe_geoportaal:bes_overgangszone,' + + 'vioe_geoportaal:erfgoedls', 'TILED': true }, attributions: [new ol.Attribution({ diff --git a/services/BeschermingService.js b/services/BeschermingService.js index 17e28af..4a9152a 100644 --- a/services/BeschermingService.js +++ b/services/BeschermingService.js @@ -22,10 +22,10 @@ define([ //console.debug('searchBeschermingenGet', coordinate, srsname); var featureTypes = [ - 'vioe_geoportaal:beschermde_landschappen', - 'vioe_geoportaal:beschermde_dorps_en_stadsgezichten', - 'vioe_geoportaal:beschermde_archeologische_zones', - 'vioe_geoportaal:beschermde_monumenten' + 'vioe_geoportaal:bes_landschap', + 'vioe_geoportaal:bes_sd_gezicht', + 'vioe_geoportaal:bes_arch_site', + 'vioe_geoportaal:bes_monument' ]; var getUrl = this.beschermingWfsUrl + "?service=wfs&version=1.1.0&request=GetFeature"; @@ -44,10 +44,10 @@ define([ //console.debug('searchBeschermingenPost', coordinate, srsname); var featureTypes = [ - 'beschermde_landschappen', - 'beschermde_dorps_en_stadsgezichten', - 'beschermde_archeologische_zones', - 'beschermde_monumenten' + 'bes_landschap', + 'bes_sd_gezicht', + 'bes_arch_site', + 'bes_monument' ]; var getFeature = new ol.format.WFS().writeGetFeature({ @@ -75,10 +75,10 @@ define([ return new ol.format.WFS({ featureNS: "http://www.erfgoed.net/geoportaal", featureType: [ - 'beschermde_landschappen', - 'beschermde_dorps_en_stadsgezichten', - 'beschermde_archeologische_zones', - 'beschermde_monumenten' + 'bes_landschap', + 'bes_sd_gezicht', + 'bes_arch_site', + 'bes_monument' ] }).readFeatures(wfs, {}); } catch (e) { From 8d250cb1bb448666d4bcd17d1d9ad425cc32269a Mon Sep 17 00:00:00 2001 From: Jonas Geuens Date: Thu, 17 Sep 2020 13:04:10 +0200 Subject: [PATCH 2/6] verwijderen landschappen --- MapController.js | 3 +-- services/BeschermingService.js | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/MapController.js b/MapController.js index e8ac295..f3fdb06 100644 --- a/MapController.js +++ b/MapController.js @@ -144,8 +144,7 @@ define([ source: new ol.source.TileWMS(({ url: this.beschermingUrl, params: { - 'LAYERS': 'vioe_geoportaal:bes_landschap,' + - 'vioe_geoportaal:bes_sd_gezicht,' + + 'LAYERS': 'vioe_geoportaal:bes_sd_gezicht,' + 'vioe_geoportaal:bes_arch_site,' + 'vioe_geoportaal:bes_monument,' + 'vioe_geoportaal:bes_overgangszone,' + diff --git a/services/BeschermingService.js b/services/BeschermingService.js index 4a9152a..38dbfd0 100644 --- a/services/BeschermingService.js +++ b/services/BeschermingService.js @@ -22,7 +22,6 @@ define([ //console.debug('searchBeschermingenGet', coordinate, srsname); var featureTypes = [ - 'vioe_geoportaal:bes_landschap', 'vioe_geoportaal:bes_sd_gezicht', 'vioe_geoportaal:bes_arch_site', 'vioe_geoportaal:bes_monument' @@ -44,7 +43,6 @@ define([ //console.debug('searchBeschermingenPost', coordinate, srsname); var featureTypes = [ - 'bes_landschap', 'bes_sd_gezicht', 'bes_arch_site', 'bes_monument' @@ -75,7 +73,6 @@ define([ return new ol.format.WFS({ featureNS: "http://www.erfgoed.net/geoportaal", featureType: [ - 'bes_landschap', 'bes_sd_gezicht', 'bes_arch_site', 'bes_monument' From 174dadee1489938dca03caee5733ea942c942d98 Mon Sep 17 00:00:00 2001 From: Vanderhaegen Cedrik Date: Thu, 17 Sep 2020 14:01:45 +0200 Subject: [PATCH 3/6] update test file --- tests/testNgi.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/testNgi.html b/tests/testNgi.html index b80592b..4edc71b 100644 --- a/tests/testNgi.html +++ b/tests/testNgi.html @@ -60,14 +60,11 @@ source: new ol.source.TileWMS(({ url: 'https://dev-geo.onroerenderfgoed.be/geoserver/wms', params: { - 'LAYERS': 'vioe_geoportaal:beschermde_landschappen,' + - 'vioe_geoportaal:beschermde_dorps_en_stadsgezichten,' + - 'vioe_geoportaal:beschermde_archeologische_zones,' + - 'vioe_geoportaal:beschermde_monumenten,' + - 'vioe_geoportaal:dibe_geheel,' + - 'vioe_geoportaal:dibe_relict,' + - 'vioe_geoportaal:ile_park,' + - 'vioe_geoportaal:ile_boom', + 'LAYERS': 'vioe_geoportaal:bes_sd_gezicht,' + + 'vioe_geoportaal:bes_arch_site,' + + 'vioe_geoportaal:bes_monument,' + + 'vioe_geoportaal:bes_overgangszone,' + + 'vioe_geoportaal:erfgoedls', 'TILED': true }, attributions: [new ol.Attribution({ From 3add58b51655d415c2814005edfcb7852acb60a4 Mon Sep 17 00:00:00 2001 From: Vanderhaegen Cedrik Date: Thu, 17 Sep 2020 14:18:30 +0200 Subject: [PATCH 4/6] update doc --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index bca0a75..2911de0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,5 @@ zoneerder =========== -UPDATE: master is nu de 0.4 versie. - -Opgelet: er zijn nu 2 versies 0.3 en 0.4. De 0.4 versie gebruikt dgrid v0.4 en dstore. - -Development gebeurt op 2 aparte branches: dev-0.3 en dev-0.4. Dojo widget met een configureerbare Openlayers 3 kaart. From ccf1db494ec14abc8765242a2f6acc3968a06027 Mon Sep 17 00:00:00 2001 From: Vanderhaegen Cedrik Date: Thu, 17 Sep 2020 14:23:03 +0200 Subject: [PATCH 5/6] security update + add package-lock.json --- package-lock.json | 186 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..6382192 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,186 @@ +{ + "name": "zoneerder", + "version": "0.6.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, + "basic-auth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz", + "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=", + "dev": true + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true + }, + "corser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz", + "integrity": "sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=", + "dev": true + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ecstatic": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz", + "integrity": "sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==", + "dev": true, + "requires": { + "he": "^1.1.1", + "mime": "^1.6.0", + "minimist": "^1.1.0", + "url-join": "^2.0.5" + } + }, + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + }, + "follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", + "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", + "dev": true + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dev": true, + "requires": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + } + }, + "http-server": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz", + "integrity": "sha512-be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA==", + "dev": true, + "requires": { + "basic-auth": "^1.0.3", + "colors": "^1.4.0", + "corser": "^2.0.1", + "ecstatic": "^3.3.2", + "http-proxy": "^1.18.0", + "minimist": "^1.2.5", + "opener": "^1.5.1", + "portfinder": "^1.0.25", + "secure-compare": "3.0.1", + "union": "~0.5.0" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "opener": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", + "dev": true + }, + "portfinder": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "dev": true, + "requires": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + } + }, + "qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==", + "dev": true + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "secure-compare": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz", + "integrity": "sha1-8aAymzCLIh+uN7mXTz1XjQypmeM=", + "dev": true + }, + "union": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz", + "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==", + "dev": true, + "requires": { + "qs": "^6.4.0" + } + }, + "url-join": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz", + "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=", + "dev": true + } + } +} diff --git a/package.json b/package.json index 21ec93c..f31a0a7 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,6 @@ "lib": "." }, "devDependencies": { - "http-server": "^0.10.0" + "http-server": "^0.12.3" } } From 566ec5c96974a0e4719277d9d7b3ee9aa3450f07 Mon Sep 17 00:00:00 2001 From: Vanderhaegen Cedrik Date: Thu, 17 Sep 2020 14:23:18 +0200 Subject: [PATCH 6/6] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f31a0a7..56b77ea 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "Widget", "Openlayers" ], - "version": "0.6.1", + "version": "1.0.0", "repository": { "type": "git", "url": "https://github.com/OnroerendErfgoed/zoneerder"