From ccc4a51f54f94096f7d017fa0307b41c19e20fbe Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:26:12 +0100
Subject: [PATCH 1/9] [#614] Use `leaflet-tools`
---
package.json | 1 +
src/components/Map/index.js | 4 ++--
src/map/constants.js | 25 +++++--------------------
yarn.lock | 7 +++++++
4 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/package.json b/package.json
index b99cae5ad..e1af4baa3 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"@formio/protected-eval": "^1.2.1",
"@fortawesome/fontawesome-free": "^6.1.1",
"@open-formulieren/design-tokens": "^0.52.1",
+ "@open-formulieren/leaflet-tools": "^1.0.0",
"@sentry/react": "^6.13.2",
"@sentry/tracing": "^6.13.2",
"@trivago/prettier-plugin-sort-imports": "^4.0.0",
diff --git a/src/components/Map/index.js b/src/components/Map/index.js
index 2283b388e..d6cde94fe 100644
--- a/src/components/Map/index.js
+++ b/src/components/Map/index.js
@@ -7,7 +7,7 @@ import {MapContainer, Marker, TileLayer, useMap, useMapEvent} from 'react-leafle
import {useGeolocation} from 'react-use';
import {ConfigContext} from 'Context';
-import {DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS, TILE_LAYERS} from 'map/constants';
+import {DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS, TILE_LAYERS_RD} from 'map/constants';
import {getBEMClassName} from 'utils';
import NearestAddress from './NearestAddress';
@@ -100,7 +100,7 @@ const LeaftletMap = ({
duration: 3000,
}}
>
-
+
{coordinates ? (
<>
diff --git a/src/map/constants.js b/src/map/constants.js
index 0362dc009..a64b8c6c7 100644
--- a/src/map/constants.js
+++ b/src/map/constants.js
@@ -1,21 +1,6 @@
-import {RD_CRS} from './rd';
-
-const TILES = 'https://service.pdok.nl/brt/achtergrondkaart/wmts/v2_0/standaard';
-
-const ATTRIBUTION = `
- Kaartgegevens ©
- Kadaster |
- Verbeter de kaart
-`;
-
-const TILE_LAYERS = {
- url: `${TILES}/EPSG:28992/{z}/{x}/{y}.png`,
- options: {
- minZoom: 1,
- maxZoom: 13,
- attribution: ATTRIBUTION,
- },
-};
+// a hack - this library has side effects because it patches L from leaflet.
+import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
+import 'proj4leaflet';
// Roughly the center of the Netherlands
const DEFAULT_LAT_LNG = [52.1326332, 5.291266];
@@ -23,10 +8,10 @@ const DEFAULT_ZOOM = 13;
const MAP_DEFAULTS = {
continuousWorld: true,
- crs: RD_CRS,
+ crs: CRS_RD,
attributionControl: true,
center: DEFAULT_LAT_LNG,
zoom: DEFAULT_ZOOM,
};
-export {TILES, ATTRIBUTION, TILE_LAYERS, DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS};
+export {TILES_ATTRIBUTION, TILE_LAYER_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS};
diff --git a/yarn.lock b/yarn.lock
index fd5aa24e8..10cbcc965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3008,6 +3008,13 @@
resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
+"@open-formulieren/leaflet-tools@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@open-formulieren/leaflet-tools/-/leaflet-tools-1.0.0.tgz#7b1d7c9d2dc45cf21ca75fa2b87c71c7d81b556f"
+ integrity sha512-G2Sdh+Td5iYkVQ9cEIvAiQfpV3V7HdYfQOovLJp3RVJEaXEuOc37ScYaCags5amIjjQZwJpQ+UZtjfK0IBU8pQ==
+ dependencies:
+ proj4leaflet "^1.0.2"
+
"@pkgjs/parseargs@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
From fd0fbb44c9684c360e015ef45c20f31c76a62d00 Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:34:46 +0100
Subject: [PATCH 2/9] [#614] Fix import
---
src/components/Map/index.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/Map/index.js b/src/components/Map/index.js
index d6cde94fe..33dadf7dc 100644
--- a/src/components/Map/index.js
+++ b/src/components/Map/index.js
@@ -7,7 +7,7 @@ import {MapContainer, Marker, TileLayer, useMap, useMapEvent} from 'react-leafle
import {useGeolocation} from 'react-use';
import {ConfigContext} from 'Context';
-import {DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS, TILE_LAYERS_RD} from 'map/constants';
+import {DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS, TILE_LAYER_RD} from 'map/constants';
import {getBEMClassName} from 'utils';
import NearestAddress from './NearestAddress';
@@ -100,7 +100,7 @@ const LeaftletMap = ({
duration: 3000,
}}
>
-
+
{coordinates ? (
<>
From 14323af8f879d3138b532cc18445f2d04be5a024 Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:52:52 +0100
Subject: [PATCH 3/9] [#614] Build fix
---
package.json | 2 +-
src/map/constants.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index e1af4baa3..aeb3e88c6 100644
--- a/package.json
+++ b/package.json
@@ -263,7 +263,7 @@
"^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
- "[/\\\\]node_modules[/\\\\](?!(react-leaflet|@react-leaflet)).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
+ "[/\\\\]node_modules[/\\\\](?!(react-leaflet|@react-leaflet|@open-formulieren\/leaflet-tools)).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"modulePaths": [
diff --git a/src/map/constants.js b/src/map/constants.js
index a64b8c6c7..083cc158b 100644
--- a/src/map/constants.js
+++ b/src/map/constants.js
@@ -1,3 +1,4 @@
+// sort-imports-ignore
// a hack - this library has side effects because it patches L from leaflet.
import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
import 'proj4leaflet';
From 46003b8017da260d2e715d3d3b1ec61062d5288b Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Fri, 29 Dec 2023 17:32:41 +0100
Subject: [PATCH 4/9] [#614] Update sort plugin to take ignore comment into
account
---
package.json | 4 +-
src/map/constants.js | 2 +-
yarn.lock | 123 ++++++++++++++++++++++++++++++++++---------
3 files changed, 101 insertions(+), 28 deletions(-)
diff --git a/package.json b/package.json
index aeb3e88c6..fe8c5a662 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
"@open-formulieren/leaflet-tools": "^1.0.0",
"@sentry/react": "^6.13.2",
"@sentry/tracing": "^6.13.2",
- "@trivago/prettier-plugin-sort-imports": "^4.0.0",
"classnames": "^2.3.1",
"date-fns": "^2.30.0",
"flatpickr": "^4.6.9",
@@ -142,6 +141,7 @@
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
+ "@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@utrecht/component-library-css": "1.0.0-alpha.604",
"@utrecht/component-library-react": "1.0.0-alpha.353",
"@utrecht/components": "1.0.0-alpha.565",
@@ -263,7 +263,7 @@
"^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
- "[/\\\\]node_modules[/\\\\](?!(react-leaflet|@react-leaflet|@open-formulieren\/leaflet-tools)).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
+ "[/\\\\]node_modules[/\\\\](?!(react-leaflet|@react-leaflet|@open-formulieren/leaflet-tools)).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"modulePaths": [
diff --git a/src/map/constants.js b/src/map/constants.js
index 083cc158b..b403a727d 100644
--- a/src/map/constants.js
+++ b/src/map/constants.js
@@ -1,7 +1,7 @@
// sort-imports-ignore
// a hack - this library has side effects because it patches L from leaflet.
-import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
import 'proj4leaflet';
+import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
// Roughly the center of the Netherlands
const DEFAULT_LAT_LNG = [52.1326332, 5.291266];
diff --git a/yarn.lock b/yarn.lock
index 10cbcc965..6391ac6f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -72,6 +72,14 @@
"@babel/highlight" "^7.22.10"
chalk "^2.4.2"
+"@babel/code-frame@^7.22.13":
+ version "7.23.5"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+ integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+ dependencies:
+ "@babel/highlight" "^7.23.4"
+ chalk "^2.4.2"
+
"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5", "@babel/compat-data@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
@@ -163,7 +171,7 @@
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/generator@^7.12.11", "@babel/generator@^7.17.3", "@babel/generator@^7.21.5", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2":
+"@babel/generator@^7.12.11", "@babel/generator@^7.21.5", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
@@ -183,6 +191,16 @@
"@jridgewell/trace-mapping" "^0.3.17"
jsesc "^2.5.1"
+"@babel/generator@^7.23.0":
+ version "7.23.6"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+ integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+ dependencies:
+ "@babel/types" "^7.23.6"
+ "@jridgewell/gen-mapping" "^0.3.2"
+ "@jridgewell/trace-mapping" "^0.3.17"
+ jsesc "^2.5.1"
+
"@babel/generator@~7.21.1":
version "7.21.9"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.9.tgz#3a1b706e07d836e204aee0650e8ee878d3aaa241"
@@ -277,12 +295,17 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.5":
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5":
+"@babel/helper-environment-visitor@^7.22.20":
+ version "7.22.20"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+ integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
+"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
@@ -290,7 +313,15 @@
"@babel/template" "^7.22.5"
"@babel/types" "^7.22.5"
-"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+"@babel/helper-function-name@^7.23.0":
+ version "7.23.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+ integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+ dependencies:
+ "@babel/template" "^7.22.15"
+ "@babel/types" "^7.23.0"
+
+"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
@@ -384,7 +415,7 @@
dependencies:
"@babel/types" "^7.22.5"
-"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
@@ -403,7 +434,17 @@
resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
+"@babel/helper-string-parser@^7.23.4":
+ version "7.23.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+ integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
+"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.22.20":
+ version "7.22.20"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+ integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
+"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
@@ -459,11 +500,25 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.17.3", "@babel/parser@^7.20.15", "@babel/parser@^7.20.5", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5":
+"@babel/highlight@^7.23.4":
+ version "7.23.4"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+ integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.22.20"
+ chalk "^2.4.2"
+ js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
+"@babel/parser@^7.20.5", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+ version "7.23.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
+ integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+
"@babel/parser@^7.22.10", "@babel/parser@^7.22.7":
version "7.22.10"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
@@ -1512,6 +1567,15 @@
"@babel/parser" "^7.22.5"
"@babel/types" "^7.22.5"
+"@babel/template@^7.22.15":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+ integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+ dependencies:
+ "@babel/code-frame" "^7.22.13"
+ "@babel/parser" "^7.22.15"
+ "@babel/types" "^7.22.15"
+
"@babel/traverse@7", "@babel/traverse@^7.1.6", "@babel/traverse@^7.21.5", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
@@ -1528,19 +1592,19 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/traverse@7.17.3":
- version "7.17.3"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
- integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+"@babel/traverse@7.23.2":
+ version "7.23.2"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+ integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
dependencies:
- "@babel/code-frame" "^7.16.7"
- "@babel/generator" "^7.17.3"
- "@babel/helper-environment-visitor" "^7.16.7"
- "@babel/helper-function-name" "^7.16.7"
- "@babel/helper-hoist-variables" "^7.16.7"
- "@babel/helper-split-export-declaration" "^7.16.7"
- "@babel/parser" "^7.17.3"
- "@babel/types" "^7.17.0"
+ "@babel/code-frame" "^7.22.13"
+ "@babel/generator" "^7.23.0"
+ "@babel/helper-environment-visitor" "^7.22.20"
+ "@babel/helper-function-name" "^7.23.0"
+ "@babel/helper-hoist-variables" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@babel/parser" "^7.23.0"
+ "@babel/types" "^7.23.0"
debug "^4.1.0"
globals "^11.1.0"
@@ -1584,7 +1648,7 @@
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.17.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
@@ -1593,6 +1657,15 @@
"@babel/helper-validator-identifier" "^7.22.5"
to-fast-properties "^2.0.0"
+"@babel/types@^7.17.0", "@babel/types@^7.22.15", "@babel/types@^7.23.0", "@babel/types@^7.23.6":
+ version "7.23.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
+ integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+ dependencies:
+ "@babel/helper-string-parser" "^7.23.4"
+ "@babel/helper-validator-identifier" "^7.22.20"
+ to-fast-properties "^2.0.0"
+
"@babel/types@^7.22.10":
version "7.22.10"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03"
@@ -4970,14 +5043,14 @@
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-"@trivago/prettier-plugin-sort-imports@^4.0.0":
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz#71c3c1ae770c3738b6fc85710714844477574ffd"
- integrity sha512-dQ2r2uzNr1x6pJsuh/8x0IRA3CBUB+pWEW3J/7N98axqt7SQSm+2fy0FLNXvXGg77xEDC7KHxJlHfLYyi7PDcw==
+"@trivago/prettier-plugin-sort-imports@^4.3.0":
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.3.0.tgz#725f411646b3942193a37041c84e0b2116339789"
+ integrity sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==
dependencies:
"@babel/generator" "7.17.7"
"@babel/parser" "^7.20.5"
- "@babel/traverse" "7.17.3"
+ "@babel/traverse" "7.23.2"
"@babel/types" "7.17.0"
javascript-natural-sort "0.7.1"
lodash "^4.17.21"
From 340a95f1cb06dadf2d413978763dbeed45493862 Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:46:06 +0100
Subject: [PATCH 5/9] [#614] Remove unneeded file
---
src/map/rd.js | 26 --------------------------
1 file changed, 26 deletions(-)
delete mode 100644 src/map/rd.js
diff --git a/src/map/rd.js b/src/map/rd.js
deleted file mode 100644
index a748822b3..000000000
--- a/src/map/rd.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// From https://github.com/arbakker/pdok-js-map-examples/blob/master/leaflet-tms-epsg28992/index.js
-import L from 'leaflet';
-import 'proj4leaflet';
-
-/**
- * see "Nederlandse richtlijn tiling"
- * https://www.geonovum.nl/uploads/standards/downloads/nederlandse_richtlijn_tiling_-_versie_1.1.pdf
- */
-
-// Resolution (in pixels per meter) for each zoomlevel
-const RES = [
- 3440.64, 1720.32, 860.16, 430.08, 215.04, 107.52, 53.76, 26.88, 13.44, 6.72, 3.36, 1.68, 0.84,
- 0.42,
-];
-
-const RD =
- '+proj=sterea+lat_0=52.15616055555555+lon_0=5.38763888888889+k=0.9999079+x_0=155000+y_0=463000+ellps=bessel+units=m+towgs84=565.2369,50.0087,465.658,-0.406857330322398,0.350732676542563,-1.8703473836068,4.0812+no_defs';
-
-const RD_CRS = new L.Proj.CRS('EPSG:28992', RD, {
- resolutions: RES,
- origin: [-285401.92, 903401.92],
- transformation: L.Transformation(-1, 0, -1, 0),
- bounds: L.bounds([-285401.92, 903401.92], [595401.92, 22598.08]),
-});
-
-export {RD_CRS};
From 3a833e9e29bdac737e3510f64d5fca8f3607ac92 Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:50:55 +0100
Subject: [PATCH 6/9] [#614] Update to latest leaflet-tools
---
package.json | 2 +-
yarn.lock | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index fe8c5a662..c41c77a7a 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"formiojs": "4.13.12",
"ibantools": "^3.3.0",
"immer": "^9.0.6",
- "leaflet": "^1.7.1",
+ "leaflet": "^1.9.4",
"leaflet-geosearch": "^3.8.0",
"leaflet-gesture-handling": "^1.2.2",
"microscope-sass": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 6391ac6f3..617484f32 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11923,7 +11923,7 @@ leaflet-gesture-handling@^1.2.2:
resolved "https://registry.yarnpkg.com/leaflet-gesture-handling/-/leaflet-gesture-handling-1.2.2.tgz#ea10afb94f2d477d77d47beb21e409ed327df07a"
integrity sha512-Blf5V4PoNphWkzL7Y1qge+Spkd4OCQ2atjwUNhMhLIcjKzPcBH++x/lwOinaR9jSqLWqJ6oKYO8d0XdTffy4hQ==
-leaflet@^1.6.0, leaflet@^1.7.1:
+leaflet@^1.6.0, leaflet@^1.9.4:
version "1.9.4"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
From ce6306ed08573d208453be6d65bab725f2e6b7ac Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:50:17 +0100
Subject: [PATCH 7/9] [#614] Fix bug and cleanup
---
src/components/Map/index.js | 6 +++---
src/formio/components/Map.js | 4 ++--
src/map/constants.js | 10 +---------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/components/Map/index.js b/src/components/Map/index.js
index 33dadf7dc..34dd93f01 100644
--- a/src/components/Map/index.js
+++ b/src/components/Map/index.js
@@ -7,7 +7,7 @@ import {MapContainer, Marker, TileLayer, useMap, useMapEvent} from 'react-leafle
import {useGeolocation} from 'react-use';
import {ConfigContext} from 'Context';
-import {DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS, TILE_LAYER_RD} from 'map/constants';
+import {CRS_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, TILE_LAYER_RD} from 'map/constants';
import {getBEMClassName} from 'utils';
import NearestAddress from './NearestAddress';
@@ -86,7 +86,7 @@ const LeaftletMap = ({
center={defaultCenter}
zoom={defaultZoomLevel}
continuousWorld
- crs={MAP_DEFAULTS.crs}
+ crs={CRS_RD}
attributionControl
className={className}
searchControl
@@ -100,7 +100,7 @@ const LeaftletMap = ({
duration: 3000,
}}
>
-
+
{coordinates ? (
<>
diff --git a/src/formio/components/Map.js b/src/formio/components/Map.js
index 517f5dcdd..729c142b0 100644
--- a/src/formio/components/Map.js
+++ b/src/formio/components/Map.js
@@ -8,7 +8,7 @@ import {IntlProvider} from 'react-intl';
import {ConfigContext} from 'Context';
import LeafletMap from 'components/Map';
-import {DEFAULT_LAT_LNG, MAP_DEFAULTS} from 'map/constants';
+import {DEFAULT_LAT_LNG, DEFAULT_ZOOM} from 'map/constants';
const Field = Formio.Components.components.field;
@@ -112,7 +112,7 @@ export default class Map extends Field {
markerCoordinates={markerCoordinates || null}
onMarkerSet={this.onMarkerSet.bind(this)}
defaultCenter={defaultCenter}
- defaultZoomLevel={zoom || MAP_DEFAULTS.zoom}
+ defaultZoomLevel={zoom || DEFAULT_ZOOM}
/>
diff --git a/src/map/constants.js b/src/map/constants.js
index b403a727d..08d27c451 100644
--- a/src/map/constants.js
+++ b/src/map/constants.js
@@ -7,12 +7,4 @@ import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leafle
const DEFAULT_LAT_LNG = [52.1326332, 5.291266];
const DEFAULT_ZOOM = 13;
-const MAP_DEFAULTS = {
- continuousWorld: true,
- crs: CRS_RD,
- attributionControl: true,
- center: DEFAULT_LAT_LNG,
- zoom: DEFAULT_ZOOM,
-};
-
-export {TILES_ATTRIBUTION, TILE_LAYER_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, MAP_DEFAULTS};
+export {CRS_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, TILES_ATTRIBUTION, TILE_LAYER_RD};
From 5de6feeb4302a713e876fe340f391399c3844b8e Mon Sep 17 00:00:00 2001
From: Sergei Maertens
Date: Mon, 22 Jan 2024 14:46:46 +0100
Subject: [PATCH 8/9] :coffin: [#614] continuousWorld hasn't been an option
since leaflet 1.0
---
src/components/Map/index.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/Map/index.js b/src/components/Map/index.js
index 34dd93f01..a4beeb141 100644
--- a/src/components/Map/index.js
+++ b/src/components/Map/index.js
@@ -85,7 +85,6 @@ const LeaftletMap = ({
Date: Mon, 22 Jan 2024 14:50:06 +0100
Subject: [PATCH 9/9] :art: [#614] Remove unused import/export
The tile layer attribution is included in the TILE_LAYER_RD already.
---
src/map/constants.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/map/constants.js b/src/map/constants.js
index 08d27c451..dd7cd2f6b 100644
--- a/src/map/constants.js
+++ b/src/map/constants.js
@@ -1,10 +1,10 @@
// sort-imports-ignore
// a hack - this library has side effects because it patches L from leaflet.
import 'proj4leaflet';
-import {CRS_RD, TILES_ATTRIBUTION, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
+import {CRS_RD, TILE_LAYER_RD} from '@open-formulieren/leaflet-tools';
// Roughly the center of the Netherlands
const DEFAULT_LAT_LNG = [52.1326332, 5.291266];
const DEFAULT_ZOOM = 13;
-export {CRS_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, TILES_ATTRIBUTION, TILE_LAYER_RD};
+export {CRS_RD, DEFAULT_LAT_LNG, DEFAULT_ZOOM, TILE_LAYER_RD};