diff --git a/config/webpack.common.config.js b/config/webpack.common.config.js
index aef48d76..0a33fc06 100644
--- a/config/webpack.common.config.js
+++ b/config/webpack.common.config.js
@@ -35,7 +35,6 @@ module.exports = {
stream: require.resolve('stream-browserify')
},
alias: {
- react: require.resolve('react'),
// uncomment for development with npm link
// 'geostyler': path.resolve('node_modules', 'geostyler'),
// 'geostyler-style': path.resolve('node_modules', 'geostyler-style'),
diff --git a/package-lock.json b/package-lock.json
index 87c3fbf9..8ca750d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,17 +13,17 @@
"@types/react-dom": "^18.0.9",
"antd": "^4.24.3",
"d3": "^7.6.1",
- "geostyler": "^10.2.0",
+ "geostyler": "^11.1.1",
"geostyler-geojson-parser": "^1.0.1",
"geostyler-legend": "^4.0.0",
- "geostyler-mapbox-parser": "^3.1.0",
+ "geostyler-mapbox-parser": "^3.1.1",
"geostyler-qgis-parser": "^2.0.0",
"geostyler-shapefile-parser": "^1.0.0",
"geostyler-sld-parser": "^5.0.0",
"geostyler-style": "^7.2.0",
"geostyler-wfs-parser": "^2.0.0",
"moment": "^2.29.4",
- "ol": "^7.1.0",
+ "ol": "^7.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^4.8.4"
@@ -150,6 +150,55 @@
"node": ">=10.0.0"
}
},
+ "node_modules/@dnd-kit/accessibility": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.0.1.tgz",
+ "integrity": "sha512-HXRrwS9YUYQO9lFRc/49uO/VICbM+O+ZRpFDe9Pd1rwVv2PCNkRiTZRdxrDgng/UkvdC3Re9r2vwPpXXrWeFzg==",
+ "dependencies": {
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/core": {
+ "version": "6.0.7",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.0.7.tgz",
+ "integrity": "sha512-qcLBTVTjmLuLqC0RHQ+dFKN5neWmAI56H9xZ+he9WEJEkAvR76YAcz7DSWDJfjErepfG2H3Fkb9lYiX7cPR62g==",
+ "dependencies": {
+ "@dnd-kit/accessibility": "^3.0.0",
+ "@dnd-kit/utilities": "^3.2.1",
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/sortable": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-7.0.2.tgz",
+ "integrity": "sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==",
+ "dependencies": {
+ "@dnd-kit/utilities": "^3.2.0",
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "@dnd-kit/core": "^6.0.7",
+ "react": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/utilities": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.1.tgz",
+ "integrity": "sha512-OOXqISfvBw/1REtkSK2N3Fi2EQiLMlWUlqnOK/UpOISqBZPWpE6TqL+jcPtMOkE8TqYGiURvRdPSI9hltNUjEA==",
+ "dependencies": {
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
"node_modules/@icons/material": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
@@ -354,6 +403,21 @@
"react-dom": ">=16.9.0"
}
},
+ "node_modules/@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ },
+ "node_modules/@react-dnd/invariant": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-3.0.1.tgz",
+ "integrity": "sha512-blqduwV86oiKw2Gr44wbe3pj3Z/OsXirc7ybCv9F/pLAR+Aih8F3rjeJzK0ANgtYKv5lCpkGVoZAeKitKDaD/g=="
+ },
+ "node_modules/@react-dnd/shallowequal": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-3.0.1.tgz",
+ "integrity": "sha512-XjDVbs3ZU16CO1h5Q3Ew2RPJqmZBDE/EVf1LYp6ePEffs3V/MX9ZbL5bJr8qiK5SbGmUMuDoaFgyKacYz8prRA=="
+ },
"node_modules/@sindresorhus/is": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
@@ -2358,13 +2422,16 @@
}
},
"node_modules/cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
"dependencies": {
"string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
+ "strip-ansi": "^6.0.1",
"wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/clone-deep": {
@@ -3599,6 +3666,16 @@
"node": ">=8"
}
},
+ "node_modules/dnd-core": {
+ "version": "15.1.2",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-15.1.2.tgz",
+ "integrity": "sha512-EOec1LyJUuGRFg0LDa55rSRAUe97uNVKVkUo8iyvzQlcECYTuPblVQfRWXWj1OyPseFIeebWpNmKFy0h6BcF1A==",
+ "dependencies": {
+ "@react-dnd/asap": "4.0.1",
+ "@react-dnd/invariant": "3.0.1",
+ "redux": "^4.1.2"
+ }
+ },
"node_modules/dns-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -4321,8 +4398,7 @@
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "dev": true
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"node_modules/fast-glob": {
"version": "3.2.11",
@@ -4658,11 +4734,14 @@
"dev": true
},
"node_modules/geostyler": {
- "version": "10.2.0",
- "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-10.2.0.tgz",
- "integrity": "sha512-D+0XzZoJd3QwGtKlV8ExXtI8VFr/VlYv79Hz5J97ZmZ7MM8XT5oXB4Tl4rKC3EBW70qiIFFQbmaYtVkG9/3Ieg==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-11.1.1.tgz",
+ "integrity": "sha512-B/+vHmMhMwbPOKgzV/AUhfZoOxmcGV1CkT1tbIwkD0saSM089QTPhXuPV0FphWOStmNhJTidDQ5xuArY6XcfhQ==",
"dependencies": {
"@babel/polyfill": "^7.12.1",
+ "@dnd-kit/core": "^6.0.6",
+ "@dnd-kit/sortable": "^7.0.1",
+ "@dnd-kit/utilities": "^3.2.1",
"@monaco-editor/react": "^4.4.6",
"@types/chroma-js": "^2.1.4",
"@types/color": "^3.0.3",
@@ -4681,7 +4760,7 @@
"geostyler-cql-parser": "^3.0.1",
"geostyler-data": "^1.0.0",
"geostyler-geojson-parser": "^1.0.1",
- "geostyler-openlayers-parser": "^4.0.0",
+ "geostyler-openlayers-parser": "^4.1.0",
"geostyler-sld-parser": "^5.0.0",
"geostyler-style": "^7.2.0",
"geostyler-wfs-parser": "^2.0.0",
@@ -4689,8 +4768,10 @@
"moment": "^2.29.4",
"monaco-editor": "^0.34.1",
"react-color": "^2.19.3",
+ "react-dnd": "^15.1.2",
+ "react-dnd-html5-backend": "^15.1.3",
"react-rnd": "^10.3.7",
- "typescript-json-schema": "^0.54.0"
+ "typescript-json-schema": "^0.55.0"
},
"engines": {
"node": ">=10.0.0"
@@ -4759,15 +4840,15 @@
}
},
"node_modules/geostyler-openlayers-parser": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-4.0.0.tgz",
- "integrity": "sha512-BHYooBhvyVryW7cd3Tq3y6ULrHbAtl3FsVuMkwnuFgu+lVQUm8GUgFmHdUe67jmqZaNOfAoehY2Shma6DdXanA==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-4.1.0.tgz",
+ "integrity": "sha512-9hrIJ2phyLPdkFHcb2NGHp9HbGKtK5dbseXyPFID8kOu8uf54CdjU3OjRmAopf/8DiLWV/7Cur5E8cl3Mwd+kQ==",
"dependencies": {
"color-name": "^1.1.4",
- "geostyler-style": "^7.1.0"
+ "geostyler-style": "^7.2.0"
},
"peerDependencies": {
- "ol": "^7.1.0"
+ "ol": ">=7.2"
}
},
"node_modules/geostyler-openlayers-parser/node_modules/color-name": {
@@ -5208,6 +5289,14 @@
"he": "bin/he"
}
},
+ "node_modules/hoist-non-react-statics": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+ "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+ "dependencies": {
+ "react-is": "^16.7.0"
+ }
+ },
"node_modules/hpack.js": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -7289,10 +7378,9 @@
}
},
"node_modules/path-equal": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/path-equal/-/path-equal-1.2.2.tgz",
- "integrity": "sha512-AUJvbcle1Zgb1TgtftHYknlrgrSYyI1ytrYgSbKUHSybwqUDnbD2cw9PIWivuMvsN+GTXmr/DRN4VBXpHG6aGg==",
- "hasInstallScript": true
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/path-equal/-/path-equal-1.2.5.tgz",
+ "integrity": "sha512-i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g=="
},
"node_modules/path-exists": {
"version": "4.0.0",
@@ -8409,6 +8497,43 @@
"react": "*"
}
},
+ "node_modules/react-dnd": {
+ "version": "15.1.2",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-15.1.2.tgz",
+ "integrity": "sha512-EaSbMD9iFJDY/o48T3c8wn3uWU+2uxfFojhesZN3LhigJoAIvH2iOjxofSA9KbqhAKP6V9P853G6XG8JngKVtA==",
+ "dependencies": {
+ "@react-dnd/invariant": "3.0.1",
+ "@react-dnd/shallowequal": "3.0.1",
+ "dnd-core": "15.1.2",
+ "fast-deep-equal": "^3.1.3",
+ "hoist-non-react-statics": "^3.3.2"
+ },
+ "peerDependencies": {
+ "@types/hoist-non-react-statics": ">= 3.3.1",
+ "@types/node": ">= 12",
+ "@types/react": ">= 16",
+ "react": ">= 16.14"
+ },
+ "peerDependenciesMeta": {
+ "@types/hoist-non-react-statics": {
+ "optional": true
+ },
+ "@types/node": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/react-dnd-html5-backend": {
+ "version": "15.1.3",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-15.1.3.tgz",
+ "integrity": "sha512-HH/8nOEmrrcRGHMqJR91FOwhnLlx5SRLXmsQwZT3IPcBjx88WT+0pWC5A4tDOYDdoooh9k+KMPvWfxooR5TcOA==",
+ "dependencies": {
+ "dnd-core": "15.1.2"
+ }
+ },
"node_modules/react-dom": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
@@ -8504,6 +8629,14 @@
"node": ">= 10.13.0"
}
},
+ "node_modules/redux": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
+ "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==",
+ "dependencies": {
+ "@babel/runtime": "^7.9.2"
+ }
+ },
"node_modules/regenerator-runtime": {
"version": "0.13.10",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
@@ -8689,9 +8822,9 @@
"dev": true
},
"node_modules/safe-stable-stringify": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
- "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==",
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz",
+ "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==",
"engines": {
"node": ">=10"
}
@@ -9815,8 +9948,7 @@
"node_modules/tslib": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
- "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
- "dev": true
+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
},
"node_modules/tunnel-agent": {
"version": "0.6.0",
@@ -9870,17 +10002,17 @@
}
},
"node_modules/typescript-json-schema": {
- "version": "0.54.0",
- "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.54.0.tgz",
- "integrity": "sha512-/MNhm1pjdxXiVspjjyRCrQAA1B768cRzHU83aIqN5vQqQEW2NgyyKOfcguiRIMM64lseIZIelegnHOHEu7YDCg==",
+ "version": "0.55.0",
+ "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.55.0.tgz",
+ "integrity": "sha512-BXaivYecUdiXWWNiUqXgY6A9cMWerwmhtO+lQE7tDZGs7Mf38sORDeQZugfYOZOHPZ9ulsD+w0LWjFDOQoXcwg==",
"dependencies": {
"@types/json-schema": "^7.0.9",
"@types/node": "^16.9.2",
"glob": "^7.1.7",
"path-equal": "^1.1.2",
"safe-stable-stringify": "^2.2.0",
- "ts-node": "^10.2.1",
- "typescript": "~4.6.0",
+ "ts-node": "^10.9.1",
+ "typescript": "~4.8.2",
"yargs": "^17.1.1"
},
"bin": {
@@ -9893,14 +10025,14 @@
"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
},
"node_modules/typescript-json-schema/node_modules/@types/node": {
- "version": "16.11.45",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz",
- "integrity": "sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ=="
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
},
"node_modules/typescript-json-schema/node_modules/typescript": {
- "version": "4.6.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
- "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+ "version": "4.8.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+ "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -10566,26 +10698,26 @@
"dev": true
},
"node_modules/yargs": {
- "version": "17.5.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
- "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+ "version": "17.6.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
"dependencies": {
- "cliui": "^7.0.2",
+ "cliui": "^8.0.1",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
- "yargs-parser": "^21.0.0"
+ "yargs-parser": "^21.1.1"
},
"engines": {
"node": ">=12"
}
},
"node_modules/yargs-parser": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
- "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
"engines": {
"node": ">=12"
}
@@ -10695,6 +10827,41 @@
"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
"dev": true
},
+ "@dnd-kit/accessibility": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.0.1.tgz",
+ "integrity": "sha512-HXRrwS9YUYQO9lFRc/49uO/VICbM+O+ZRpFDe9Pd1rwVv2PCNkRiTZRdxrDgng/UkvdC3Re9r2vwPpXXrWeFzg==",
+ "requires": {
+ "tslib": "^2.0.0"
+ }
+ },
+ "@dnd-kit/core": {
+ "version": "6.0.7",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.0.7.tgz",
+ "integrity": "sha512-qcLBTVTjmLuLqC0RHQ+dFKN5neWmAI56H9xZ+he9WEJEkAvR76YAcz7DSWDJfjErepfG2H3Fkb9lYiX7cPR62g==",
+ "requires": {
+ "@dnd-kit/accessibility": "^3.0.0",
+ "@dnd-kit/utilities": "^3.2.1",
+ "tslib": "^2.0.0"
+ }
+ },
+ "@dnd-kit/sortable": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-7.0.2.tgz",
+ "integrity": "sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==",
+ "requires": {
+ "@dnd-kit/utilities": "^3.2.0",
+ "tslib": "^2.0.0"
+ }
+ },
+ "@dnd-kit/utilities": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.1.tgz",
+ "integrity": "sha512-OOXqISfvBw/1REtkSK2N3Fi2EQiLMlWUlqnOK/UpOISqBZPWpE6TqL+jcPtMOkE8TqYGiURvRdPSI9hltNUjEA==",
+ "requires": {
+ "tslib": "^2.0.0"
+ }
+ },
"@icons/material": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
@@ -10852,6 +11019,21 @@
"rc-util": "^5.24.4"
}
},
+ "@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ },
+ "@react-dnd/invariant": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-3.0.1.tgz",
+ "integrity": "sha512-blqduwV86oiKw2Gr44wbe3pj3Z/OsXirc7ybCv9F/pLAR+Aih8F3rjeJzK0ANgtYKv5lCpkGVoZAeKitKDaD/g=="
+ },
+ "@react-dnd/shallowequal": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-3.0.1.tgz",
+ "integrity": "sha512-XjDVbs3ZU16CO1h5Q3Ew2RPJqmZBDE/EVf1LYp6ePEffs3V/MX9ZbL5bJr8qiK5SbGmUMuDoaFgyKacYz8prRA=="
+ },
"@sindresorhus/is": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
@@ -12524,12 +12706,12 @@
}
},
"cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
"requires": {
"string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
+ "strip-ansi": "^6.0.1",
"wrap-ansi": "^7.0.0"
}
},
@@ -13462,6 +13644,16 @@
"path-type": "^4.0.0"
}
},
+ "dnd-core": {
+ "version": "15.1.2",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-15.1.2.tgz",
+ "integrity": "sha512-EOec1LyJUuGRFg0LDa55rSRAUe97uNVKVkUo8iyvzQlcECYTuPblVQfRWXWj1OyPseFIeebWpNmKFy0h6BcF1A==",
+ "requires": {
+ "@react-dnd/asap": "4.0.1",
+ "@react-dnd/invariant": "3.0.1",
+ "redux": "^4.1.2"
+ }
+ },
"dns-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -14033,8 +14225,7 @@
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "dev": true
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"fast-glob": {
"version": "3.2.11",
@@ -14300,11 +14491,14 @@
"dev": true
},
"geostyler": {
- "version": "10.2.0",
- "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-10.2.0.tgz",
- "integrity": "sha512-D+0XzZoJd3QwGtKlV8ExXtI8VFr/VlYv79Hz5J97ZmZ7MM8XT5oXB4Tl4rKC3EBW70qiIFFQbmaYtVkG9/3Ieg==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-11.1.1.tgz",
+ "integrity": "sha512-B/+vHmMhMwbPOKgzV/AUhfZoOxmcGV1CkT1tbIwkD0saSM089QTPhXuPV0FphWOStmNhJTidDQ5xuArY6XcfhQ==",
"requires": {
"@babel/polyfill": "^7.12.1",
+ "@dnd-kit/core": "^6.0.6",
+ "@dnd-kit/sortable": "^7.0.1",
+ "@dnd-kit/utilities": "^3.2.1",
"@monaco-editor/react": "^4.4.6",
"@types/chroma-js": "^2.1.4",
"@types/color": "^3.0.3",
@@ -14323,7 +14517,7 @@
"geostyler-cql-parser": "^3.0.1",
"geostyler-data": "^1.0.0",
"geostyler-geojson-parser": "^1.0.1",
- "geostyler-openlayers-parser": "^4.0.0",
+ "geostyler-openlayers-parser": "^4.1.0",
"geostyler-sld-parser": "^5.0.0",
"geostyler-style": "^7.2.0",
"geostyler-wfs-parser": "^2.0.0",
@@ -14331,8 +14525,10 @@
"moment": "^2.29.4",
"monaco-editor": "^0.34.1",
"react-color": "^2.19.3",
+ "react-dnd": "^15.1.2",
+ "react-dnd-html5-backend": "^15.1.3",
"react-rnd": "^10.3.7",
- "typescript-json-schema": "^0.54.0"
+ "typescript-json-schema": "^0.55.0"
},
"dependencies": {
"@types/geojson": {
@@ -14391,12 +14587,12 @@
}
},
"geostyler-openlayers-parser": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-4.0.0.tgz",
- "integrity": "sha512-BHYooBhvyVryW7cd3Tq3y6ULrHbAtl3FsVuMkwnuFgu+lVQUm8GUgFmHdUe67jmqZaNOfAoehY2Shma6DdXanA==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-4.1.0.tgz",
+ "integrity": "sha512-9hrIJ2phyLPdkFHcb2NGHp9HbGKtK5dbseXyPFID8kOu8uf54CdjU3OjRmAopf/8DiLWV/7Cur5E8cl3Mwd+kQ==",
"requires": {
"color-name": "^1.1.4",
- "geostyler-style": "^7.1.0"
+ "geostyler-style": "^7.2.0"
},
"dependencies": {
"color-name": {
@@ -14730,6 +14926,14 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
+ "hoist-non-react-statics": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+ "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+ "requires": {
+ "react-is": "^16.7.0"
+ }
+ },
"hpack.js": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -16314,9 +16518,9 @@
}
},
"path-equal": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/path-equal/-/path-equal-1.2.2.tgz",
- "integrity": "sha512-AUJvbcle1Zgb1TgtftHYknlrgrSYyI1ytrYgSbKUHSybwqUDnbD2cw9PIWivuMvsN+GTXmr/DRN4VBXpHG6aGg=="
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/path-equal/-/path-equal-1.2.5.tgz",
+ "integrity": "sha512-i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g=="
},
"path-exists": {
"version": "4.0.0",
@@ -17115,6 +17319,26 @@
"tinycolor2": "^1.4.1"
}
},
+ "react-dnd": {
+ "version": "15.1.2",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-15.1.2.tgz",
+ "integrity": "sha512-EaSbMD9iFJDY/o48T3c8wn3uWU+2uxfFojhesZN3LhigJoAIvH2iOjxofSA9KbqhAKP6V9P853G6XG8JngKVtA==",
+ "requires": {
+ "@react-dnd/invariant": "3.0.1",
+ "@react-dnd/shallowequal": "3.0.1",
+ "dnd-core": "15.1.2",
+ "fast-deep-equal": "^3.1.3",
+ "hoist-non-react-statics": "^3.3.2"
+ }
+ },
+ "react-dnd-html5-backend": {
+ "version": "15.1.3",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-15.1.3.tgz",
+ "integrity": "sha512-HH/8nOEmrrcRGHMqJR91FOwhnLlx5SRLXmsQwZT3IPcBjx88WT+0pWC5A4tDOYDdoooh9k+KMPvWfxooR5TcOA==",
+ "requires": {
+ "dnd-core": "15.1.2"
+ }
+ },
"react-dom": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
@@ -17192,6 +17416,14 @@
"resolve": "^1.20.0"
}
},
+ "redux": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
+ "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==",
+ "requires": {
+ "@babel/runtime": "^7.9.2"
+ }
+ },
"regenerator-runtime": {
"version": "0.13.10",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
@@ -17329,9 +17561,9 @@
"dev": true
},
"safe-stable-stringify": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
- "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz",
+ "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="
},
"safer-buffer": {
"version": "2.1.2",
@@ -18212,8 +18444,7 @@
"tslib": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
- "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
- "dev": true
+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
},
"tunnel-agent": {
"version": "0.6.0",
@@ -18248,17 +18479,17 @@
"integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="
},
"typescript-json-schema": {
- "version": "0.54.0",
- "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.54.0.tgz",
- "integrity": "sha512-/MNhm1pjdxXiVspjjyRCrQAA1B768cRzHU83aIqN5vQqQEW2NgyyKOfcguiRIMM64lseIZIelegnHOHEu7YDCg==",
+ "version": "0.55.0",
+ "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.55.0.tgz",
+ "integrity": "sha512-BXaivYecUdiXWWNiUqXgY6A9cMWerwmhtO+lQE7tDZGs7Mf38sORDeQZugfYOZOHPZ9ulsD+w0LWjFDOQoXcwg==",
"requires": {
"@types/json-schema": "^7.0.9",
"@types/node": "^16.9.2",
"glob": "^7.1.7",
"path-equal": "^1.1.2",
"safe-stable-stringify": "^2.2.0",
- "ts-node": "^10.2.1",
- "typescript": "~4.6.0",
+ "ts-node": "^10.9.1",
+ "typescript": "~4.8.2",
"yargs": "^17.1.1"
},
"dependencies": {
@@ -18268,14 +18499,14 @@
"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
},
"@types/node": {
- "version": "16.11.45",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz",
- "integrity": "sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ=="
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
},
"typescript": {
- "version": "4.6.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
- "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="
+ "version": "4.8.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+ "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
}
}
},
@@ -18744,23 +18975,23 @@
"dev": true
},
"yargs": {
- "version": "17.5.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
- "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+ "version": "17.6.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
"requires": {
- "cliui": "^7.0.2",
+ "cliui": "^8.0.1",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
- "yargs-parser": "^21.0.0"
+ "yargs-parser": "^21.1.1"
}
},
"yargs-parser": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
- "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
},
"yauzl": {
"version": "2.10.0",
diff --git a/package.json b/package.json
index 6327ac4f..9e20044a 100644
--- a/package.json
+++ b/package.json
@@ -4,24 +4,24 @@
"homepage": ".",
"dependencies": {
"@ant-design/icons": "^4.8.0",
- "@types/react": "^18.0.25",
- "@types/react-dom": "^18.0.9",
+ "@types/react": "^18.0.26",
+ "@types/react-dom": "^18.0.10",
"antd": "^4.24.3",
"d3": "^7.6.1",
- "geostyler": "^10.2.0",
+ "geostyler": "^11.1.1",
"geostyler-geojson-parser": "^1.0.1",
"geostyler-legend": "^4.0.0",
- "geostyler-mapbox-parser": "^3.1.0",
+ "geostyler-mapbox-parser": "^3.1.1",
"geostyler-qgis-parser": "^2.0.0",
"geostyler-shapefile-parser": "^1.0.0",
"geostyler-sld-parser": "^5.0.0",
"geostyler-style": "^7.2.0",
"geostyler-wfs-parser": "^2.0.0",
"moment": "^2.29.4",
- "ol": "^7.1.0",
+ "ol": "^7.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "typescript": "^4.8.4"
+ "typescript": "^4.9.4"
},
"scripts": {
"start": "webpack serve --config config/webpack.static.config.js --hot --progress --mode development",
diff --git a/src/index.tsx b/src/index.tsx
index 9d50d2ac..89095195 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -7,7 +7,5 @@ import 'antd/dist/antd.css';
const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
root.render(
-
-
-
+
);