Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Improve Osmose validation error display, much CSS refactoring

Russ Garrettb51e6281c8d1
diff --git a/web/package-lock.json b/web/package-lock.json
index 40bff69..1c68f2d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -10,6 +10,7 @@
"license": "ISC",
"dependencies": {
"@opencage/geosearch-core": "^0.1.10",
+ "@ts-stack/markdown": "^1.5.0",
"geo-coordinates-parser": "^1.7.4",
"i18next": "^23.15.2",
"i18next-browser-languagedetector": "^8.0.0",
@@ -297,6 +298,7 @@
"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
"integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
"dev": true,
+ "license": "MIT",
"optional": true,
"engines": {
"node": ">=0.1.90"
@@ -1131,6 +1133,7 @@
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
"integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=10"
},
@@ -1138,6 +1141,15 @@
"url": "https://github.com/sindresorhus/is?sponsor=1"
}
},
+ "node_modules/@ts-stack/markdown": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@ts-stack/markdown/-/markdown-1.5.0.tgz",
+ "integrity": "sha512-ntVX2Kmb2jyTdH94plJohokvDVPvp6CwXHqsa9NVZTK8cOmHDCYNW0j6thIadUVRTStJhxhfdeovLd0owqDxLw==",
+ "license": "MIT",
+ "dependencies": {
+ "tslib": "^2.3.0"
+ }
+ },
"node_modules/@types/estree": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -1461,6 +1473,7 @@
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
"integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"environment": "^1.0.0"
},
@@ -1499,7 +1512,8 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
"integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/anymatch": {
"version": "3.1.3",
@@ -1590,6 +1604,7 @@
"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=10"
}
@@ -1635,6 +1650,7 @@
"resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
"integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
"dev": true,
+ "license": "ISC",
"dependencies": {
"chalk": "^4.0.0",
"highlight.js": "^10.7.1",
@@ -1651,43 +1667,40 @@
"npm": ">=5.0.0"
}
},
- "node_modules/cli-highlight/node_modules/cliui": {
+ "node_modules/cli-table3": {
+ "version": "0.6.5",
+ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+ "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "string-width": "^4.2.0"
+ },
+ "engines": {
+ "node": "10.* || >= 12.*"
+ },
+ "optionalDependencies": {
+ "@colors/colors": "1.5.0"
+ }
+ },
+ "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==",
"dev": true,
+ "license": "ISC",
"dependencies": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^7.0.0"
}
},
- "node_modules/cli-highlight/node_modules/parse5": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
- "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
- "dev": true
- },
- "node_modules/cli-highlight/node_modules/parse5-htmlparser2-tree-adapter": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
- "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
- "dev": true,
- "dependencies": {
- "parse5": "^6.0.1"
- }
- },
- "node_modules/cli-highlight/node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
- "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
- "dev": true
- },
- "node_modules/cli-highlight/node_modules/wrap-ansi": {
+ "node_modules/cliui/node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
@@ -1700,57 +1713,6 @@
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
- "node_modules/cli-highlight/node_modules/y18n": {
- "version": "5.0.8",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
- "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
- "dev": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/cli-highlight/node_modules/yargs": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
- "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
- "dev": true,
- "dependencies": {
- "cliui": "^7.0.2",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.0",
- "y18n": "^5.0.5",
- "yargs-parser": "^20.2.2"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/cli-highlight/node_modules/yargs-parser": {
- "version": "20.2.9",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
- "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
- "dev": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/cli-table3": {
- "version": "0.6.5",
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
- "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
- "dev": true,
- "dependencies": {
- "string-width": "^4.2.0"
- },
- "engines": {
- "node": "10.* || >= 12.*"
- },
- "optionalDependencies": {
- "@colors/colors": "1.5.0"
- }
- },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1878,13 +1840,15 @@
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz",
"integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/environment": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
"integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=18"
},
@@ -1897,6 +1861,7 @@
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6"
}
@@ -2312,6 +2277,7 @@
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true,
+ "license": "ISC",
"engines": {
"node": "6.* || 8.* || >= 10.*"
}
@@ -2462,6 +2428,7 @@
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
"dev": true,
+ "license": "BSD-3-Clause",
"engines": {
"node": "*"
}
@@ -2833,11 +2800,11 @@
}
},
"node_modules/marked": {
- "version": "13.0.3",
- "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.3.tgz",
- "integrity": "sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==",
+ "version": "15.0.7",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz",
+ "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
"dev": true,
- "peer": true,
+ "license": "MIT",
"bin": {
"marked": "bin/marked.js"
},
@@ -2846,24 +2813,25 @@
}
},
"node_modules/marked-terminal": {
- "version": "7.2.1",
- "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.2.1.tgz",
- "integrity": "sha512-rQ1MoMFXZICWNsKMiiHwP/Z+92PLKskTPXj+e7uwXmuMPkNn7iTqC+IvDekVm1MPeC9wYQeLxeFaOvudRR/XbQ==",
+ "version": "7.3.0",
+ "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.3.0.tgz",
+ "integrity": "sha512-t4rBvPsHc57uE/2nJOLmMbZCQ4tgAccAED3ngXQqW6g+TxA488JzJ+FK3lQkzBQOI1mRV/r/Kq+1ZlJ4D0owQw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ansi-escapes": "^7.0.0",
"ansi-regex": "^6.1.0",
- "chalk": "^5.3.0",
+ "chalk": "^5.4.1",
"cli-highlight": "^2.1.11",
"cli-table3": "^0.6.5",
- "node-emoji": "^2.1.3",
+ "node-emoji": "^2.2.0",
"supports-hyperlinks": "^3.1.0"
},
"engines": {
"node": ">=16.0.0"
},
"peerDependencies": {
- "marked": ">=1 <15"
+ "marked": ">=1 <16"
}
},
"node_modules/marked-terminal/node_modules/ansi-regex": {
@@ -2871,6 +2839,7 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=12"
},
@@ -2879,10 +2848,11 @@
}
},
"node_modules/marked-terminal/node_modules/chalk": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
- "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+ "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": "^12.17.0 || ^14.13 || >=16.0.0"
},
@@ -2962,6 +2932,7 @@
"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
"integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"any-promise": "^1.0.0",
"object-assign": "^4.0.1",
@@ -2994,10 +2965,11 @@
"dev": true
},
"node_modules/node-emoji": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz",
- "integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.2.0.tgz",
+ "integrity": "sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@sindresorhus/is": "^4.6.0",
"char-regex": "^1.0.2",
@@ -3022,6 +2994,7 @@
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
@@ -3106,6 +3079,30 @@
"node": ">=6"
}
},
+ "node_modules/parse5": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+ "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/parse5-htmlparser2-tree-adapter": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+ "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "parse5": "^6.0.1"
+ }
+ },
+ "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+ "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3336,6 +3333,7 @@
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
@@ -3509,6 +3507,7 @@
"resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz",
"integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"unicode-emoji-modifier-base": "^1.0.0"
},
@@ -3616,10 +3615,11 @@
}
},
"node_modules/supports-hyperlinks": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
- "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz",
+ "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"has-flag": "^4.0.0",
"supports-color": "^7.0.0"
@@ -3628,7 +3628,7 @@
"node": ">=14.18"
},
"funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1"
}
},
"node_modules/synckit": {
@@ -3659,6 +3659,7 @@
"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
"integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"any-promise": "^1.0.0"
}
@@ -3668,6 +3669,7 @@
"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
"integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"thenify": ">= 3.1.0 < 4"
},
@@ -3773,6 +3775,7 @@
"resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz",
"integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=4"
}
@@ -3901,19 +3904,6 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/vite-plugin-i18next-loader/node_modules/marked": {
- "version": "15.0.3",
- "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.3.tgz",
- "integrity": "sha512-Ai0cepvl2NHnTcO9jYDtcOEtVBNVYR31XnEA3BndO7f5As1wzpcOceSUM8FDkNLJNIODcLpDTWay/qQhqbuMvg==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "marked": "bin/marked.js"
- },
- "engines": {
- "node": ">= 18"
- }
- },
"node_modules/vite-plugin-i18next-loader/node_modules/minimatch": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
@@ -4540,6 +4530,45 @@
"dev": true,
"peer": true
},
+ "node_modules/y18n": {
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/yargs": {
+ "version": "16.2.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+ "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "cliui": "^7.0.2",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.0",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^20.2.2"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/yargs-parser": {
+ "version": "20.2.9",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/web/package.json b/web/package.json
index 2c60aa7..07ad6f4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -26,7 +26,7 @@
"@typescript-eslint/parser": "^8.18.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.2",
- "prettier": "^3.1.1",
+ "prettier": "^3.5.2",
"typescript": "^5.5.4",
"vite": "^6.0.3",
"vite-plugin-i18next-loader": "^3.0.0",
@@ -34,6 +34,7 @@
},
"dependencies": {
"@opencage/geosearch-core": "^0.1.10",
+ "@ts-stack/markdown": "^1.5.0",
"geo-coordinates-parser": "^1.7.4",
"i18next": "^23.15.2",
"i18next-browser-languagedetector": "^8.0.0",
diff --git a/web/src/edit-control.ts b/web/src/edit-control.ts
index ed62ff4..4ae54cf 100644
--- a/web/src/edit-control.ts
+++ b/web/src/edit-control.ts
@@ -1,10 +1,11 @@
import { t } from 'i18next'
import { IControl } from 'maplibre-gl'
import { el } from 'redom'
+import { OSMRemoteControl } from './remote-control'
import './edit-control.css'
class EditControl implements IControl {
- _map: any
+ _map?: maplibregl.Map
_control!: HTMLDivElement
_menu!: HTMLUListElement
@@ -49,6 +50,7 @@ class EditControl implements IControl {
}
doEdit(setEditor?: string) {
+ if (!this._map) return
let editor = setEditor || localStorage.getItem('editor')
if (!editor) {
editor = 'id'
@@ -60,15 +62,23 @@ class EditControl implements IControl {
if (editor === 'id') {
window.open(this._getIdURL(), '_blank')
} else {
- const url = this._getRemoteURL()
- fetch(url).catch((error) => {
- alert(
- t(
- 'edit.error',
- "Unable to load remote editor - make sure it's running and has remote control enabled.\nError: "
- ) + error
- )
- })
+ const remote = new OSMRemoteControl()
+ const bounds = this._map.getBounds()
+ remote
+ .loadAndZoom({
+ minLon: bounds.getWest(),
+ minLat: bounds.getSouth(),
+ maxLon: bounds.getEast(),
+ maxLat: bounds.getNorth()
+ })
+ .catch((error) => {
+ alert(
+ t(
+ 'edit.error',
+ "Unable to load remote editor - make sure it's running and has remote control enabled.\nError: "
+ ) + error
+ )
+ })
}
}
@@ -78,6 +88,7 @@ class EditControl implements IControl {
}
updateVisibility() {
+ if (!this._map) return
if (this._map.getZoom() > 14) {
this._control.classList.add('active')
} else {
@@ -85,23 +96,8 @@ class EditControl implements IControl {
}
}
- _getRemoteURL() {
- const url = 'http://127.0.0.1:8111/load_and_zoom'
- const bounds = this._map.getBounds()
- return (
- url +
- '?left=' +
- bounds.getWest() +
- '&right=' +
- bounds.getEast() +
- '&top=' +
- bounds.getNorth() +
- '&bottom=' +
- bounds.getSouth()
- )
- }
-
_getIdURL() {
+ if (!this._map) return ''
const zoom = Math.round(this._map.getZoom())
const center = this._map.getCenter()
return `https://www.openstreetmap.org/edit?editor=id#map=${zoom}/${center.lat.toFixed(5)}/${center.lng.toFixed(5)}`
diff --git a/web/src/elements/tab-pane.css b/web/src/elements/tab-pane.css
new file mode 100644
index 0000000..7d977eb
--- /dev/null
+++ b/web/src/elements/tab-pane.css
@@ -0,0 +1,53 @@
+.tab-pane {
+ --active-tab-background-color: var(--oim-light-grey);
+ --inactive-tab-background-color: #fafafa;
+ --active-tab-border-color: var(--oim-grey);
+ --inactive-tab-border-color: var(--oim-grey);
+}
+
+.tab-header {
+ display: flex;
+ flex-direction: row;
+ justify-content: start;
+ align-items: center;
+ padding: 0 5px;
+ margin-bottom: -1px;
+}
+
+.tab-header .tab {
+ display: inline-block;
+ border-radius: var(--oim-radius-large) var(--oim-radius-large) 0 0;
+ padding: 5px 10px;
+ cursor: pointer;
+ background-color: var(--inactive-tab-background-color);
+ border: 1px solid var(--inactive-tab-border-color);
+ border-bottom: 1px solid var(--active-tab-border-color);
+}
+
+.tab-header .tab + .tab {
+ margin-left: 2px;
+}
+
+.tab-header .tab:hover {
+ background-color: var(--active-tab-background-color);
+}
+
+.tab-header .tab.active {
+ font-weight: bold;
+ background-color: var(--active-tab-background-color);
+ border-color: var(--active-tab-border-color);
+ border-bottom: 1px solid var(--active-tab-background-color);
+}
+
+.tab-content {
+ display: none;
+ background-color: var(--active-tab-background-color);
+ border: solid var(--active-tab-border-color);
+ border-width: 1px 1px 1px 1px;
+ border-radius: var(--oim-radius-small);
+ padding: 0 1em;
+}
+
+.tab-content.active {
+ display: block;
+}
diff --git a/web/src/elements/tab-pane.ts b/web/src/elements/tab-pane.ts
new file mode 100644
index 0000000..2f6bb53
--- /dev/null
+++ b/web/src/elements/tab-pane.ts
@@ -0,0 +1,34 @@
+import './tab-pane.css'
+import { el, mount } from 'redom'
+
+export class TabPane {
+ el: HTMLElement
+ header?: HTMLElement
+
+ constructor() {
+ this.el = el('div.tab-pane')
+ }
+
+ addTab(title: string, content: HTMLElement) {
+ let classes = ''
+ if (!this.header) {
+ this.header = el('div.tab-header')
+ mount(this.el, this.header)
+ }
+ if (this.header.children.length === 0) {
+ classes = 'active'
+ }
+ const tab = el('div.tab', title, { class: classes })
+ const tabContent = el('div.tab-content', content, { class: classes })
+ tab.addEventListener('click', () => {
+ this.el.querySelectorAll('.tab').forEach((t) => t.classList.remove('active'))
+ tab.classList.add('active')
+
+ this.el.querySelectorAll('.tab-content').forEach((t) => t.classList.remove('active'))
+ tabContent.classList.add('active')
+ })
+
+ this.header.appendChild(tab)
+ this.el.appendChild(tabContent)
+ }
+}
diff --git a/web/src/icons/validation_error.svg b/web/src/icons/validation_error.svg
new file mode 100644
index 0000000..4f980ec
--- /dev/null
+++ b/web/src/icons/validation_error.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 50 95" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <use xlink:href="#_Image1" x="0" y="0" width="48.363px" height="94.372px" transform="matrix(0.986993,0,0,0.993389,0,0)"/>
+ <g transform="matrix(1.05519,0,0,1.05519,-1.37984,-1.57282)">
+ <path d="M4.755,33.378C3.879,31.028 3.358,28.374 3.358,25.72C3.358,13.775 13.056,4.078 25,4.078C36.944,4.078 46.642,13.775 46.642,25.72C46.642,28.445 46.137,31.053 45.216,33.456L45.231,33.456L24.833,90.427L4.755,33.378Z" style="fill:rgb(237,107,107);stroke:black;stroke-width:0.79px;"/>
+ </g>
+ <defs>
+ <image id="_Image1" width="49px" height="95px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAABfCAYAAABBYi82AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAG60lEQVR4nNWce3faRhDFfxbBIbZrJ6nTV3rauN//e7Wnaes3+IXpHzvXGtYrWIkVKHOODkQBMXfnznMl79Fe9uyogDfAGNgH3trrvjs3su/MgUc7HoB7e32wc0/Asx2LLgq1VX5kCk6AA+AIOLTXAwOjw4OQ8vfA1I4bO26BO/vMvC2YHBB+5fdN0WPgPfDBjmMD8Y7aEmP7DqbUE7Ul7kz5K+ACOLfjysDdG5hFDph1IKT82BQ8AT4CPwKn9v6YYImJU3xkr7r+gpouzwbmnmCBawPwFfgb+NeATQ3wWqusAuGpcwx8D/wM/AT8YACOCLQZ22f33NEkHpAsc2OKfwX+BP6y91fAjNoqSRk1nBeAd6bsL8AfdvxmIE4IFtgnOHhFvfo5x8i+t2+/c2DXO7SF2TOg8y4g9uzih4TV/9WUPzMwHwgWEHW84rkSA1KUU7CYGBAIviQgz6mLvUlcXBY4NQBn9npqwKR8G6XXAcJ+d8Jy2BZNFSBuCKCWrOJBCMCEsNqfqelzSlihN7Rf9VzRdb2F5WdQU2tKRC9PpxHBhO+pKfQF+ERtgb4AePE+I4vsmeJKkkkQ4uUxtRN/ITjwIf1aICUxkJEprRwjIEBtLvnBJ4IPnBHC6XfUFti2eCDS85FAp5m9X0DtNGOWafTZ/r0tCjWJrxYqgl/cUZcpc2AhlAeELHwG/E5w5Allo1BXiROokqPKk4UysqxwRsjIR9R+MASRNSCE2CmhXLkD5hUhIh1T10KHNGfyXYn32/eEJHxC0L3yID4SHHmfYdAoFuWQI4KuHwhuMKqoq9Njez80K0hEqQlB1xMsAVcE+qicVmIZmhUkiqQHBNYcAuPKnfBlxZBFLqCKd1/mUUdWNX93MOI7zHfAW5lHTf2QqQTLpftbAoixbyW/BSvAcr8/xhw7LnmHLgKh4rD6lizgZakzVFGVNRoZkCz84UF8KyLl59jksGJNEz5AEQCNRecV9Ux05VhkICIrPBEq2BnwUBFq8hnLo8Mhy4JggRnWU1TUtfmMxDhkgKKBwS026qyo56FThg9CVJpRT9OfKgK3ru3kPcONVprhPhCU15z2UT5xDVzafz7uSMkcmRMW/RI3bFZ00lT6hgBiiOFWU/QbahD3WJ5Q463/eBmF7ETVtIhKYs05AcwDlrHnBLNo1+aW4Tm4EtyUoOMF9b7Fy0DqkYDwwl6H5OBKcKKStsXuMB1VwWo8eEGglT4wFNHkz7PlZYxZUfOt8UM7FlnBL/IMt8h+d/OB2mmuyNz061m0wKL7OQm6+4ZIDn5phzYzdi3PrAk8AhGHME+pXfpGTCW/m/oi3hI+megL9+yu6/NlhqfSK5rH/bWKK8ViFYW7Ek9xT6Ul8SBSlNplGSJm3FIz4yU3+A/GllhEX9QewLYppd/zZcY1DQuaGtfEZciuKOWprdyQ1CNlCTnTFcuF1jYplQoySSpB2hKeUsoZjRfoQbxvig3yzeTvN03/VIb4qLCtZkktqNoDUbox8TZZwsfnS5bjc58ih45zw8qquskSWg1FKVFqG82SphmeSiv7m1UgdDH5xTaapdTivSozYlk1ERel1Ij03Sx5GisqJcuMWNaN9b2DvarjexAFFJU9yTIjllUgtt0sxdVCdmhfZ4k46fRFqVRuyI6IObtEKkNeTRkKix+MtSp31oFIVbaNhdgG0tTLZFk8xxJNlCpV2ca+tzQYy7lA7qajKkrff5eqbJWTOlM2B0Rc2ZakVFxm+B4mO3jkWsI37K8mcG20TkgclVqH8TZ72HG/W4JS8TRDVGpl4TaW0IqlSoIuEg/GOuehNpaIi7MS2wAajMV9S6vrtQVRchtgVZnRStre1xGP2FvF8+g6nSrWlHQBIUr5/rsLpeLcMKVjC9wFhGqcTSrb7MFYjnS5TSiOKG23AeLBmE+enQJE13ud1Cw1Tqozvh+XGZ1zThcQce0vB89dyVaDsRzpagmviMqQnCTVejCWI5vcOidKXLFmVuokTphFmqyuILxzxivalKx8xVq03d3EEl12luIWdO1gLEc2vROzTWXrZ6xF+/VNQMQzW61sqrKNe/XL6LM7tURcxK0Kl6lJe5EWt8SNvfE+c6oGkkO3HozlSAlLxDtLcf/dNPYptlVQwhLxpkiqWdItoL1sLZcCsSp0bjQYy5FSN7vHO//+psgmKhWb5Za8Yz/eBrizc6mKtegstxSIpsJOfyHC9x7Fp+rxQ+WbSOpmku/svCJXL/sbJUHA6zJEIM7p8ba8kiBiSv1HeDpxTrueo7X08XSjnr7SI2831H/C4pYeLFEahB6u0rNKc4IF/iHQq2holfT1nGlMLX9PYXEQff3VBz2EOLZzenSmlz3w/wGEUxXFROHAzwAAAABJRU5ErkJggg=="/>
+ </defs>
+</svg>
diff --git a/web/src/index.css b/web/src/index.css
index e086b0f..3c73630 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -6,18 +6,48 @@
--aa-primary-color-rgb: 100, 100, 100 !important;
--aa-input-background-color-rgb: 250, 250, 250 !important;
--aa-input-background-color-alpha: 0.8 !important;
+
+ --oim-font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ --oim-font-family-monospace: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', 'Roboto Mono',
+ 'Oxygen Mono', 'Ubuntu Mono', 'Source Code Pro', 'Fira Mono', 'Droid Sans Mono', 'Consolas', 'Courier New',
+ monospace;
+
+ --oim-content-background: #fcfcfc;
+ --oim-text-color: #333;
+ --oim-text-color-light: #666;
+ --oim-text-color-dark: #000;
+
+ --oim-light-grey: #f3f3f3;
+ --oim-grey: #ddd;
+ --oim-dark-grey: #888;
+
+ --oim-radius-large: 6px;
+ --oim-radius-small: 3px;
+
+ --oim-popup-header-info-background: #e0f6f6;
+ --oim-popup-header-validation-background: #f9e2e4;
}
-html {
+* {
+ box-sizing: border-box;
+ color: inherit;
+}
+
+html,
+#map {
width: 100%;
height: 100%;
- font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
- color: #333;
+ font-family: var(--oim-font-family);
+ font-size: 15px;
+ color: var(--oim-text-color);
+}
+
+p {
+ text-wrap: pretty;
}
body,
-#container,
-#map {
+#container {
width: 100%;
height: 100%;
margin: 0px;
@@ -55,14 +85,41 @@ nav ul li {
nav ul li + li::before {
content: '|';
- color: #666;
+ color: var(--oim-text-color-light);
margin-right: 5px;
}
+h1,
+h2,
+h3,
+h4 {
+ font-weight: bold;
+}
+
h1 {
display: inline;
margin: 0px;
- font-size: 18px;
+ font-size: 1.4rem;
+}
+
+h2 {
+ font-size: 1.2rem;
+}
+
+h3 {
+ font-size: 1.1rem;
+}
+
+code {
+ font-family: var(--oim-font-family-monospace);
+}
+
+th {
+ font-weight: bold;
+}
+
+.maplibregl-ctrl-group {
+ background-color: var(--oim-content-background);
}
.maplibregl-ctrl-top-left {
@@ -78,6 +135,10 @@ h1 {
margin: 0.5rem 0.5rem 0 0;
}
+.maplibregl-ctrl-attrib {
+ font-size: 0.8em;
+}
+
.maplibregl-ctrl-attrib.maplibregl-compact {
background-color: rgba(250, 250, 250, 0.8);
backdrop-filter: blur(3px) saturate(80%);
@@ -94,18 +155,60 @@ h1 {
}
a {
- color: #333;
+ color: var(--oim-text-color);
}
a:hover {
- color: #000;
-}
-
-.maplibregl-popup-content {
- box-shadow: 3px 3px 4px rgba(0, 0, 0, 0.2);
+ color: var(--oim-text-color-dark);
}
canvas:focus {
/* Remove unnecessary focus border */
outline: none;
}
+
+.oim-button {
+ font-weight: 500;
+ cursor: pointer;
+ display: inline-block;
+ font-size: inherit;
+ margin: 0.2em;
+ padding: 0.2em 0.4em;
+ border-radius: var(--oim-radius-large);
+ background-color: var(--oim-light-grey);
+ text-decoration: none;
+ border: 1px solid var(--oim-grey);
+}
+
+.oim-button:hover {
+ background-color: #ddd;
+}
+
+.layer-switcher-list {
+ min-width: 10vw !important;
+ background-color: var(--oim-content-background) !important;
+}
+
+.layer-switcher-list ul {
+ font-size: 1.1rem !important;
+}
+
+.layer-switcher-list label {
+ padding: 1px 2px;
+ border-radius: var(--oim-radius-small);
+}
+
+.layer-switcher-list label:hover {
+ background-color: var(--oim-light-grey);
+}
+
+.layer-switcher-list h3 {
+ background-color: var(--oim-light-grey);
+ margin: 0 -8px 0 -8px !important;
+ border-radius: var(--oim-radius-large) !important;
+ padding: 0.3em 8px 0.3em 8px;
+}
+
+.layer-switcher-list h4 {
+ border-bottom: 1px solid var(--oim-light-grey) !important;
+}
diff --git a/web/src/index.ts b/web/src/index.ts
index 5dea266..e167e76 100644
--- a/web/src/index.ts
+++ b/web/src/index.ts
@@ -1,4 +1,5 @@
import './index.css'
+import './popup/popup.css'
import i18next from 'i18next'
import LanguageDetector from 'i18next-browser-languagedetector'
import resources from 'virtual:i18next-loader'
diff --git a/web/src/key/key.css b/web/src/key/key.css
index 58da8d5..bf90e64 100644
--- a/web/src/key/key.css
+++ b/web/src/key/key.css
@@ -1,7 +1,8 @@
.oim-key-control {
min-height: 30px;
min-width: 30px;
- background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 11-7.778 7.778 5.5 5.5 0 017.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4"/></svg>') white;
+ background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 11-7.778 7.778 5.5 5.5 0 017.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4"/></svg>')
+ white;
background-repeat: no-repeat;
background-size: 20px 20px;
background-position: center;
@@ -9,66 +10,90 @@
.oim-key-panel {
display: none;
+ position: absolute;
+ overflow: hidden;
+ border-radius: var(--oim-radius-large);
+ bottom: 30px;
+ background-color: var(--oim-content-background);
+ z-index: 1000;
min-width: 220px;
min-height: 300px;
- margin: 0px 0px 8px 0px !important;
+ margin: 0px 0px 8px 0px !important;
+ box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
}
-.oim-key-pane {
+.oim-key-panel.visible {
+ display: block;
+}
+
+.oim-key-header {
+ height: 2.2em;
+ padding-top: 0.3em;
padding-left: 8px;
- padding-right: 2px;
+ background-color: var(--oim-light-grey);
+}
+
+.oim-key-header h2 {
+ margin: 0px;
+ display: inline;
+}
+
+.oim-key-close {
+ background-color: var(--oim-light-grey);
+ width: 29px;
+ height: 29px;
+ position: absolute;
+ right: 0;
+ top: 0;
+ border: 0;
+ font-weight: bold;
+ font-size: 1.5em;
+ cursor: pointer;
+}
+
+.oim-key-close:hover {
+ background-color: var(--oim-grey);
+}
+
+.oim-key-body {
+ position: relative;
+ top: 0;
+ width: 100%;
+ height: calc(100% - 2.2em);
+ padding: 0.5em 0.2em 0.5em 0.5em;
overflow-y: scroll;
}
-.oim-key-pane h3 {
+.oim-key-body h3 {
margin-top: 0;
margin-bottom: 3px;
- border-bottom: 1px #eee solid;
+ border-bottom: 1px var(--oim-light-grey) solid;
clear: both;
}
-.oim-key-pane table {
+.oim-key-body table {
width: 100%;
padding: 0px;
+ margin-bottom: 0.5em;
}
-.oim-key-pane table tr {
+
+.oim-key-body table tr {
padding: 0px;
}
-
-.oim-key-pane table td {
- vertical-align: center;
+.oim-key-body table td {
+ height: 26px;
}
-.oim-key-pane table tr td:nth-child(2) {
+.oim-key-body table tr td:nth-child(2) {
width: 30px;
+ padding: 0 0 0 1em;
text-align: center;
}
-
-.oim-plant-sprite {
+.oim-key-body svg,
+.oim-key-body img {
margin-left: auto;
margin-right: auto;
vertical-align: middle;
}
-
-.oim-key-header {
- height: 20px;
- padding-bottom: 5px;
- padding-top: 2px;
- padding-left: 8px;
- background-color: #eee;
-}
-
-.oim-key-header h2 {
- margin: 0px;
- display: inline;
-}
-
-.oim-key-close {
- padding-right: 14px;
- float: right;
- font-weight: bold;
- font-size: 1.6em;
- cursor: pointer;
-}
diff --git a/web/src/key/key.ts b/web/src/key/key.ts
index d385119..e49fc1f 100644
--- a/web/src/key/key.ts
+++ b/web/src/key/key.ts
@@ -62,18 +62,19 @@ class KeyControl implements IControl {
ariaLabel: t('key.name')
})
- this._container = el('div', { class: 'maplibregl-ctrl oim-key-panel' })
+ this._container = el('div', { class: 'oim-key-panel' })
this.populate()
+ mount(document.body, this._container)
this._control.onclick = () => {
- this._container.style.display = 'block'
- this._control.style.display = 'none'
+ const button_position = this._control.getBoundingClientRect()
+ this._container.style.top = button_position.top + 'px'
+ this._container.style.right = document.documentElement.clientWidth - button_position.right + 'px'
+ this._container.classList.add('visible')
}
- setTimeout(() => this.resize(), 100)
- this._map.on('resize', () => this.resize())
- return el('div', this._control, this._container, {
+ return el('div', this._control, {
class: 'maplibregl-ctrl maplibregl-ctrl-group'
})
}
@@ -85,28 +86,11 @@ class KeyControl implements IControl {
this._pane = undefined
}
- resize() {
- if (!this._pane) {
- return
- }
- // Set max-height of key depending on window style
- const map_style = window.getComputedStyle(this._map!.getContainer())
- let cont_style
- if (this._control.style.display != 'none') {
- cont_style = this._control.getBoundingClientRect()
- } else {
- cont_style = this._container.getBoundingClientRect()
- }
- const height = parseInt(map_style.height) - cont_style.top - 100 + 'px'
- setStyle(this._pane, { 'max-height': height })
- }
-
header() {
- const close_button = el('.oim-key-close', '×')
+ const close_button = el('button.oim-key-close', '×')
close_button.onclick = () => {
- this._container.style.display = 'none'
- this._control.style.display = 'block'
+ this._container.classList.remove('visible')
}
return el('.oim-key-header', el('h2', t('key.name', 'Key')), close_button)
}
@@ -114,7 +98,7 @@ class KeyControl implements IControl {
async populate() {
mount(this._container, this.header())
- const pane = el('.oim-key-pane')
+ const pane = el('.oim-key-body')
pane.appendChild(el('h3', t('key.power-lines', 'Power Lines')))
mount(pane, await this.voltageTable())
pane.appendChild(el('h3', t('key.power-plants', 'Power Plants')))
@@ -165,7 +149,7 @@ class KeyControl implements IControl {
}
async sprite(name: string, size = 25) {
- const spriteDiv = el('img.oim-plant-sprite', {
+ const spriteDiv = el('img.oim-key-symbol', {
src: manifest['svg'][name],
height: size
})
diff --git a/web/src/key/svg.ts b/web/src/key/svg.ts
index 949279a..62705f9 100644
--- a/web/src/key/svg.ts
+++ b/web/src/key/svg.ts
@@ -10,7 +10,7 @@ function getLayer(layers: { [key: string]: any }[], id: string) {
}
export function svgLine(colour: string, thickness: number, dash = '') {
- const height = 15
+ const height = 16
const width = 30
const line = svg('line', {
diff --git a/web/src/openinframap.ts b/web/src/openinframap.ts
index 3362b0d..ff61460 100644
--- a/web/src/openinframap.ts
+++ b/web/src/openinframap.ts
@@ -5,7 +5,7 @@ import { mount } from 'redom'
import { LayerSwitcher, URLHash, Layer, LayerGroup } from '@russss/maplibregl-layer-switcher'
import EditButton from './edit-control.js'
-import InfoPopup from './infopopup.js'
+import InfoPopup from './popup/infopopup.js'
import KeyControl from './key/key.js'
import WarningBox from './warning-box/warning-box.js'
import OpenInfraMapGeocoder from './geocoder.js'
@@ -23,7 +23,7 @@ import style_osmose from './style/style_osmose.js'
import { LayerSpecificationWithZIndex } from './style/types.js'
import { manifest } from 'virtual:render-svg'
-import { ValidationErrorPopup } from './validation-error-popup.js'
+import { ValidationErrorPopup } from './popup/validation-error-popup.js'
import { ClickRouter } from './click-router.js'
export default class OpenInfraMap {
@@ -140,10 +140,6 @@ export default class OpenInfraMap {
map.addImage(e.id, image.data, { pixelRatio: icon_ratio })
})
- map.on('click', 'place_capital', (e) => {
- console.log(e.features)
- })
-
map.dragRotate.disable()
map.touchZoomRotate.disableRotation()
diff --git a/web/src/infopopup.css b/web/src/popup/infopopup.css
similarity index 98%
rename from web/src/infopopup.css
rename to web/src/popup/infopopup.css
index bf3431f..ec85f25 100644
--- a/web/src/infopopup.css
+++ b/web/src/popup/infopopup.css
@@ -1,46 +1,18 @@
-.oim-info {
- font-size: 0.9rem;
- max-width: min(350px, 70vw) !important;
+.oim-popup-info .oim-popup-header {
+ background: var(--oim-popup-header-info-background);
}
-.oim-info .maplibregl-popup-content {
- background-color: #fdfdfd;
- padding: 0 0.5em 0.5em 0.5em;
-}
-
-.oim-info-content > * + * {
- margin-block-start: 0.5em;
-}
-
-.oim-info .nameContainer {
- border-radius: 4px 4px 0 0;
- background-color: #d5ecec;
- padding: 0.5em 1.3em 0.5em 0.5em;
- margin: 0 -0.5em 0.5em -0.5em;
-}
-
-.oim-info h3 {
- font-size: 1.3em;
- margin: 0;
-}
-
-.oim-info h3 img {
+.oim-popup-info h3 img {
max-height: 16px;
position: relative;
top: 1px;
margin-right: 0.3em;
}
-.oim-info h4 {
- font-weight: normal;
- color: rgb(80, 80, 80);
- margin: 0.1em 0 0 0;
-}
-
table.item_info {
width: 100%;
border-collapse: collapse;
- border: 1px solid #ddd;
+ border: 1px solid var(--oim-light-grey);
border-radius: 4px;
}
@@ -65,27 +37,12 @@ table.item_info tr:nth-child(odd) {
.wikidata_image {
display: block;
- border: 2px solid #ddd;
+ border: 1px solid var(--oim-grey);
margin-left: auto;
margin-right: auto;
max-height: 25vh;
}
-.oim-info-button {
- display: block;
- height: 1.4em;
- margin: 0.2em;
- padding: 0.2em 0.4em;
- border-radius: 4px;
- background-color: #eee;
- text-decoration: none;
- border: 1px solid #ccc;
-}
-
-.oim-info-button:hover {
- background-color: #ddd;
-}
-
.oim-info-footer {
display: flex;
flex-direction: row;
@@ -117,12 +74,8 @@ div.ext_link {
}
div.ext_link:hover {
- background-color: #eee;
- border: 1px solid #ddd;
-}
-
-span.voltages {
- font-size: 1.05em;
+ background-color: var(--oim-light-grey);
+ border: 1px solid var(--oim-grey);
}
div.wikidata_link {
diff --git a/web/src/infopopup.ts b/web/src/popup/infopopup.ts
similarity index 96%
rename from web/src/infopopup.ts
rename to web/src/popup/infopopup.ts
index 1c38f8e..aaac04e 100644
--- a/web/src/infopopup.ts
+++ b/web/src/popup/infopopup.ts
@@ -3,11 +3,11 @@ import './infopopup.css'
import i18next, { t } from 'i18next'
import maplibregl, { LngLat, MapGeoJSONFeature, Popup } from 'maplibre-gl'
import { titleCase } from 'title-case'
-import { local_name_tags } from './l10n.ts'
-import friendlyNames from './friendlynames.ts'
-import friendlyIcons from './friendlyicons.ts'
+import { local_name_tags } from '../l10n.ts'
+import friendlyNames from '../friendlynames.ts'
+import friendlyIcons from '../friendlyicons.ts'
import { el, mount, setChildren, RedomElement } from 'redom'
-import { ClickRouter } from './click-router.ts'
+import { ClickRouter } from '../click-router.ts'
const hidden_keys = [
'osm_id',
@@ -312,7 +312,7 @@ class InfoPopup {
feature_title = el('h3', el('img', { src: feature_iconpath, height: 35 }), title_text)
}
- const container = el('div.nameContainer', feature_title)
+ const container = el('div.oim-popup-header', feature_title)
// If we're showing a translated name, also show the name tag
if (feature.properties.name && title_text != feature.properties.name) {
@@ -347,7 +347,7 @@ class InfoPopup {
.filter((x) => x !== null) as HTMLTableRowElement[]
setChildren(attrs_table, renderedProperties)
- const content = el('div.oim-info-content', this.nameTags(feature))
+ const content = el('div.oim-popup-content', this.nameTags(feature))
if (feature.properties['voltage'] || feature.properties['voltage_primary']) {
mount(content, this.voltageField(feature))
@@ -385,7 +385,7 @@ class InfoPopup {
if (feature.layer.id.startsWith('power_plant')) {
mount(
footer,
- el('a.oim-info-button', t('more_info', 'More info'), {
+ el('a.oim-button', t('more_info', 'More info'), {
href: '/stats/object/plant/' + feature.properties['osm_id'],
target: '_blank'
})
@@ -407,7 +407,8 @@ class InfoPopup {
.setLngLat(location)
.setDOMContent(this.popupHtml(feature))
.addTo(this._map)
- .addClassName('oim-info')
+ .addClassName('oim-popup')
+ .addClassName('oim-popup-info')
}
fetch_wikidata(id: string, imageContainer: RedomElement, linksContainer: RedomElement) {
diff --git a/web/src/popup/popup.css b/web/src/popup/popup.css
new file mode 100644
index 0000000..67ed75c
--- /dev/null
+++ b/web/src/popup/popup.css
@@ -0,0 +1,47 @@
+.maplibregl-popup-content {
+ box-shadow: 3px 3px 4px rgba(0, 0, 0, 0.2);
+}
+
+.oim-popup {
+ max-width: min(350px, 70vw) !important;
+}
+
+.oim-popup .maplibregl-popup-content {
+ background-color: var(--oim-content-background);
+ padding: 0 0.5em 0.5em 0.5em;
+}
+
+.oim-popup-content > * + * {
+ margin-block-start: 0.5em;
+}
+
+.oim-popup .oim-popup-header {
+ padding: 0.5em 2.2em 0.5em 0.5em;
+ margin: 0 -0.5em 0.5em -0.5em;
+}
+
+.oim-popup h3 {
+ font-weight: bold;
+ font-size: 1.2rem;
+ margin: 0;
+}
+
+.oim-popup h4 {
+ font-weight: normal;
+ color: var(--oim-text-color-light);
+ margin: 0.1em 0 0 0;
+}
+
+.oim-popup .maplibregl-popup-close-button {
+ font-weight: bold;
+ font-size: 1.5rem;
+ height: 1.3em;
+ color: var(--oim-text-color);
+ background-color: var(--oim-light-grey);
+ border-radius: 0 0 0 var(--oim-radius-small);
+}
+
+.oim-popup .maplibregl-popup-close-button:hover {
+ color: var(--oim-text-color-light);
+ background-color: var(--oim-grey);
+}
diff --git a/web/src/popup/validation-error-popup.css b/web/src/popup/validation-error-popup.css
new file mode 100644
index 0000000..ab69e4a
--- /dev/null
+++ b/web/src/popup/validation-error-popup.css
@@ -0,0 +1,46 @@
+.oim-popup-validation-error .oim-popup-header {
+ background: var(--oim-popup-header-validation-background);
+}
+
+ul.oim-elements {
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+}
+
+ul.oim-elements li {
+ font-family: var(--oim-font-family-monospace);
+ list-style-type: none;
+ padding: 2px 4px;
+ margin: 3px 0px;
+ border-radius: var(--oim-radius-small);
+}
+
+ul.oim-elements li.add::before {
+ content: '+';
+ font-weight: bold;
+ color: #00a000;
+ padding-inline-start: 0.3em;
+ padding-inline-end: 0.3em;
+}
+
+ul.oim-elements li.add {
+ background: #f3fff3;
+}
+
+ul.oim-elements span.key {
+ font-weight: bold;
+}
+
+ul.oim-elements span.key::after {
+ content: '=';
+ font-weight: normal;
+ padding-inline-start: 0.3em;
+ padding-inline-end: 0.3em;
+}
+
+.oim-validation-actions {
+ display: flex;
+ justify-content: end;
+ margin-top: 1em;
+}
diff --git a/web/src/popup/validation-error-popup.ts b/web/src/popup/validation-error-popup.ts
new file mode 100644
index 0000000..9a39382
--- /dev/null
+++ b/web/src/popup/validation-error-popup.ts
@@ -0,0 +1,122 @@
+import './validation-error-popup.css'
+import { OSMRemoteControl } from '../remote-control'
+import i18next, { t } from 'i18next'
+import { Marked } from '@ts-stack/markdown'
+import { el, mount } from 'redom'
+import maplibregl, { MapGeoJSONFeature } from 'maplibre-gl'
+import { ClickRouter } from '../click-router'
+import { TabPane } from '../elements/tab-pane'
+
+export class ValidationErrorPopup {
+ osmose_endpoint = 'https://osmose.openstreetmap.fr/api/0.3'
+
+ map: maplibregl.Map
+ layers = ['osmose_errors_power', 'osmose_errors_power_symbol']
+ popup_obj?: maplibregl.Popup
+
+ constructor(map: maplibregl.Map, clickRouter: ClickRouter) {
+ this.map = map
+
+ clickRouter.registerHandler(this.layers, (f, l) => this.popup(f, l))
+
+ document.addEventListener('keydown', (e) => {
+ if (e.key === 'Escape' && this.popup_obj) {
+ this.popup_obj.remove()
+ }
+ })
+ }
+
+ async fetchOsmose(path: string) {
+ const response = await fetch(`${this.osmose_endpoint}${path}`, {
+ headers: {
+ 'Accept-Language': `${i18next.language}, en`
+ }
+ })
+ return await response.json()
+ }
+
+ async fetchIssue(uuid: string) {
+ return await this.fetchOsmose(`/issue/${uuid}`)
+ }
+
+ async fetchItemDetail(item: string, itemClass: string) {
+ return await this.fetchOsmose(`/items/${item}/class/${itemClass}`)
+ }
+
+ changesList(elements: any): HTMLElement {
+ const list = el('ul.oim-elements')
+ elements['add'].forEach((elem: any) => {
+ mount(list, el('li.add', el('span.key', elem['k']), el('span.value', elem['v'])))
+ })
+ elements['del'].forEach((elem: any) => {
+ mount(list, el('li.del', el('span.key', elem['k']), el('span.value', elem['v'])))
+ })
+ return list
+ }
+
+ popup_content(issue: any, detail: any, location: maplibregl.LngLat) {
+ const content = el(
+ 'div.oim-popup-content',
+ el('div.oim-popup-header', el('h3', issue.title.auto), el('h4', 'Osmose validation issue'))
+ )
+ const osmose_url = `https://osmose.openstreetmap.fr/en/map/#loc=15/${location.lat}/${location.lng}&tags=power&issue_uuid=${issue.uuid}`
+ const clsInfo = detail.categories[0].items[0].class[0]
+
+ const tabPane = new TabPane()
+ if (clsInfo.detail) {
+ const content = el('div')
+ content.innerHTML = Marked.parse(clsInfo.detail.auto)
+ tabPane.addTab('Detail', content)
+ }
+ if (clsInfo.fix) {
+ const content = el('div')
+ content.innerHTML = Marked.parse(clsInfo.fix.auto)
+ if (clsInfo.trap) {
+ content.innerHTML += Marked.parse(clsInfo.trap.auto)
+ }
+ tabPane.addTab('Fix', content)
+ }
+ if (issue.new_elems && issue.new_elems.length > 0) {
+ tabPane.addTab('Suggested', this.changesList(issue.new_elems[0]))
+ }
+ mount(content, tabPane)
+
+ const actions = el('div.oim-validation-actions')
+
+ if (issue.new_elems && issue.new_elems.length > 0) {
+ mount(
+ actions,
+ el('button', 'Fix in JOSM', {
+ class: 'oim-button',
+ onclick: () => {
+ const fixUrl = `https://osmose.openstreetmap.fr/api/0.3/issue/${issue.uuid}/fix/0`
+ const remote = new OSMRemoteControl()
+ remote.import(fixUrl).catch((error) => {
+ alert(t('edit.error') + error)
+ })
+ }
+ })
+ )
+ }
+
+ mount(actions, el('a', { href: osmose_url, target: '_blank', class: 'oim-button' }, 'View on Osmose'))
+
+ mount(content, actions)
+ return content
+ }
+
+ async popup(feature: MapGeoJSONFeature, location: maplibregl.LngLat) {
+ const uuid = feature.properties.uuid
+ const [issue, detail] = await Promise.all([
+ this.fetchIssue(uuid),
+ this.fetchItemDetail(feature.properties.item, feature.properties.class)
+ ])
+
+ this.popup_obj = new maplibregl.Popup()
+ .setLngLat(location)
+ .setDOMContent(this.popup_content(issue, detail, location))
+ .addTo(this.map)
+ .addClassName('oim-popup')
+ .addClassName('oim-popup-validation-error')
+ }
+}
diff --git a/web/src/remote-control.ts b/web/src/remote-control.ts
new file mode 100644
index 0000000..4342c55
--- /dev/null
+++ b/web/src/remote-control.ts
@@ -0,0 +1,59 @@
+// Client for OpenStreetMap editor remote control protocol (JOSM, etc)
+// https://wiki.openstreetmap.org/wiki/JOSM/RemoteControl
+
+export interface Bounds {
+ minLon: number
+ minLat: number
+ maxLon: number
+ maxLat: number
+}
+
+export class OSMRemoteControl {
+ host = 'http://127.0.0.1:8111'
+
+ version() {
+ return this.fetch('/version')
+ }
+
+ loadAndZoom(
+ bounds: Bounds,
+ options?: { select?: Array<string>; addTags?: Record<string, string> }
+ ): Promise<Response> {
+ const args = this.convertBounds(bounds)
+ if (options && options.select) {
+ args['select'] = options.select.join(',')
+ }
+ if (options && options.addTags) {
+ args['addTags'] = Object.entries(options.addTags)
+ .map((key, value) => `${key}=${value}`)
+ .join('|')
+ }
+ return this.fetch('/load_and_zoom', args)
+ }
+
+ zoom(bounds: Bounds, select?: Array<string>): Promise<Response> {
+ const args = this.convertBounds(bounds)
+ if (select) {
+ args['select'] = select.join(',')
+ }
+ return this.fetch('/zoom', args)
+ }
+
+ import(url: string): Promise<Response> {
+ return this.fetch('/import', { url })
+ }
+
+ private fetch(path: string, args: Record<string, string> = {}): Promise<Response> {
+ const params = new URLSearchParams(args)
+ return fetch(`${this.host}${path}?${params}`)
+ }
+
+ private convertBounds(bounds: Bounds): Record<string, string> {
+ return {
+ left: bounds.minLon.toString(),
+ right: bounds.maxLon.toString(),
+ top: bounds.maxLat.toString(),
+ bottom: bounds.minLat.toString()
+ }
+ }
+}
diff --git a/web/src/style/style_osmose.ts b/web/src/style/style_osmose.ts
index d7f46fa..dd342cf 100644
--- a/web/src/style/style_osmose.ts
+++ b/web/src/style/style_osmose.ts
@@ -16,14 +16,28 @@ export default function layers(): LayerSpecificationWithZIndex[] {
[17, 15]
]),
'circle-color': '#ff0000',
- 'circle-opacity': interpolate(zoom, [
- [11, 0],
- [17, 0.6]
- ]),
+ 'circle-opacity': 0.2,
'circle-stroke-color': '#dd0000',
'circle-stroke-width': interpolate(zoom, [
[11, 0.5],
- [17, 3]
+ [17, 1]
+ ])
+ }
+ },
+ {
+ id: 'osmose_errors_power_symbol',
+ zorder: 701,
+ minzoom: 12.5,
+ source: 'osmose_errors_power',
+ 'source-layer': 'issues',
+ type: 'symbol',
+ layout: {
+ 'icon-image': 'validation_error',
+ 'icon-anchor': 'bottom',
+ 'icon-allow-overlap': true,
+ 'icon-size': interpolate(zoom, [
+ [12, 0.2],
+ [17, 1]
])
}
}
diff --git a/web/src/validation-error-popup.ts b/web/src/validation-error-popup.ts
deleted file mode 100644
index 036f5bc..0000000
--- a/web/src/validation-error-popup.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import i18next from 'i18next'
-import maplibregl, { MapGeoJSONFeature } from 'maplibre-gl'
-import { ClickRouter } from './click-router'
-
-export class ValidationErrorPopup {
- map: maplibregl.Map
- errors_layer = 'osmose_errors_power'
- popup_obj?: maplibregl.Popup
-
- constructor(map: maplibregl.Map, clickRouter: ClickRouter) {
- this.map = map
-
- clickRouter.registerHandler(this.errors_layer, (f, l) => this.popup(f, l))
-
- document.addEventListener('keydown', (e) => {
- if (e.key === 'Escape' && this.popup_obj) {
- this.popup_obj.remove()
- }
- })
- }
-
- async fetchIssue(uuid: string) {
- const response = await fetch(`https://osmose.openstreetmap.fr/api/0.3/issue/${uuid}`, {
- headers: {
- 'Accept-Language': `${i18next.language}, en`
- }
- })
- return await response.json()
- }
-
- popup_content(issue: any, location: maplibregl.LngLat) {
- const osmose_url = `https://osmose.openstreetmap.fr/en/map/#loc=15/${location.lat}/${location.lng}&issue_uuid=${issue.uuid}`
- return `<h3>${issue.title.auto}</h3><p><a href="${osmose_url}" target="_blank">View on Osmose</a></p>`
- }
-
- async popup(feature: MapGeoJSONFeature, location: maplibregl.LngLat) {
- const uuid = feature.properties.uuid
- const issue = await this.fetchIssue(uuid)
-
- this.popup_obj = new maplibregl.Popup()
- .setLngLat(location)
- .setHTML(this.popup_content(issue, location))
- .addTo(this.map)
- }
-}