Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Add search box
Russ Garrett80655fc60b24
diff --git a/web/package-lock.json b/web/package-lock.jsonindex 8a58f73..ddb5625 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -9,6 +9,7 @@"version": "1.0.0","license": "ISC","dependencies": {+ "@opencage/geosearch-core": "^0.1.10","lodash.invert": "^4.3.0","lodash.isequal": "^4.5.0","lodash.sortby": "^4.7.0",@@ -29,6 +30,194 @@"vite-plugin-render-svg": "^1.1.1"}},+ "node_modules/@algolia/autocomplete-core": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.4.tgz",+ "integrity": "sha512-H1CAzj43RDeC4Vq9FW2JLtRDNxhjRG/aPX69nbNrKbYzX9P0YohxrEj3kJ9G+e20y0L0pYboAOeU6wgbKJ6gOA==",+ "peer": true,+ "dependencies": {+ "@algolia/autocomplete-plugin-algolia-insights": "1.17.4",+ "@algolia/autocomplete-shared": "1.17.4"+ }+ },+ "node_modules/@algolia/autocomplete-js": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-js/-/autocomplete-js-1.17.4.tgz",+ "integrity": "sha512-ANhINMwusKmsW/xHhgiKvUSLis/Lll9OilueBR9h/lxBlgEJ/hHIOTnZupzksyna1OtGZaW5keAu04E19+CW1w==",+ "peer": true,+ "dependencies": {+ "@algolia/autocomplete-core": "1.17.4",+ "@algolia/autocomplete-preset-algolia": "1.17.4",+ "@algolia/autocomplete-shared": "1.17.4",+ "htm": "^3.1.1",+ "preact": "^10.13.2"+ },+ "peerDependencies": {+ "@algolia/client-search": ">= 4.5.1 < 6",+ "algoliasearch": ">= 4.9.1 < 6"+ }+ },+ "node_modules/@algolia/autocomplete-plugin-algolia-insights": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.4.tgz",+ "integrity": "sha512-fPABTwZtfD83qAzwnMYjJQ6ohCK7XE2l2++H+dOtV76cCIsAYYAC1bO5DnCbIi6Ma+OkNOgB1jCPI5EYOEsSpg==",+ "peer": true,+ "dependencies": {+ "@algolia/autocomplete-shared": "1.17.4"+ },+ "peerDependencies": {+ "search-insights": ">= 1 < 3"+ }+ },+ "node_modules/@algolia/autocomplete-preset-algolia": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.4.tgz",+ "integrity": "sha512-ijYn6hAGr3luVBVYDubaX600KXolVJH6yZlpeWZ9CNCEewgKIQ9ok3eNGha9EEJ0s9REYbp1TmDQ3T1I1aqcBA==",+ "peer": true,+ "dependencies": {+ "@algolia/autocomplete-shared": "1.17.4"+ },+ "peerDependencies": {+ "@algolia/client-search": ">= 4.9.1 < 6",+ "algoliasearch": ">= 4.9.1 < 6"+ }+ },+ "node_modules/@algolia/autocomplete-shared": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.4.tgz",+ "integrity": "sha512-AM7KntpKinDZGVYfZ4j8zt5ymgYBRXOZg0CFEeHLmViqu5BvQzzoc1aoNHQx6lBjViGckBYP9szA+t2QzRXy3A==",+ "peer": true,+ "peerDependencies": {+ "@algolia/client-search": ">= 4.9.1 < 6",+ "algoliasearch": ">= 4.9.1 < 6"+ }+ },+ "node_modules/@algolia/autocomplete-theme-classic": {+ "version": "1.17.4",+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.17.4.tgz",+ "integrity": "sha512-HK72OAhj0R5yYwjEO97gae+WbI7zsGeItl0Awo4H7b9VsYW5RyS4Z9EpO+WiWbYITu1EVz3mu2A6Vh/gNEszOg==",+ "peer": true+ },+ "node_modules/@algolia/client-abtesting": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.8.1.tgz",+ "integrity": "sha512-a2umbOcAPHS8mWRMssNqqkSCJdX7ssGZmj7rjhqCrUXoOwTihU9aUyiHihy8JHV1upJXch3T70ni7/bWrMpR6g==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/client-analytics": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.8.1.tgz",+ "integrity": "sha512-vE+cU1agk79nmBghxe9C7Hr/euj9cIDbk9SiBsnhWA2rsS4yOSSnxdY+GJGOoiJjvS2yQm7cjyxMd5M6q2aAKQ==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/client-common": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.8.1.tgz",+ "integrity": "sha512-MLX/gipPFEhJPCExsxXf9tnt+kLfWCe9JWRp1adcoVySkhzPxpIeSiWaQaOqyy0TYIgIpdeVx/emlBT9Ni8GFw==",+ "peer": true,+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/client-personalization": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.8.1.tgz",+ "integrity": "sha512-QXlX5zKa420vMABJ6V119ig5kqrzF+8jfaXSmzmXoXZXAiOnbOrGyuEHNYsVbOlkupSs6+sz4ECkKdCoVGew+A==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/client-search": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.8.1.tgz",+ "integrity": "sha512-zy3P4fI28GfzKihUw5+L76pEedQxyLDiMsdDYEWghIz8yAnELDatPNEThyWuUk8fD0PeVoCi1M4tr1iz00fOtQ==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/recommend": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.8.1.tgz",+ "integrity": "sha512-g+x39Uc673ysZ0OjAW7wDtn6qii2XttctSpSuz0GFNKhUUVE/GgjZPbbBG/DgTkWnYmDBYEscsoGZ43yjvcykQ==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/requester-browser-xhr": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.8.1.tgz",+ "integrity": "sha512-x0iULVrx5PocaYBqH+G6jyEsEHf7m5FDiZW7CP8AaJdzdCzoUyx7YH6e6TSCNlkFEjwmn8uj05coN8uljCHXTg==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/requester-fetch": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.8.1.tgz",+ "integrity": "sha512-SRWGrNsKSLNYIDNlVKVkf4wxsm6h57xI+0b8JPm0wUe0ly0jymAgQU2yW2GDzNuXyiPiS7U1oWwaVGs71IT5Pw==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },+ "node_modules/@algolia/requester-node-http": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.8.1.tgz",+ "integrity": "sha512-pYylr2gBsV68E88bltaVoJHIc3YNIllVmA12d+jefAcutR9ytQM7iP6dXbCYuRqF4CHF32YvZuwvqNI3J4kowA==",+ "peer": true,+ "dependencies": {+ "@algolia/client-common": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },"node_modules/@esbuild/aix-ppc64": {"version": "0.21.5","resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",@@ -652,6 +841,15 @@"node": ">= 8"}},+ "node_modules/@opencage/geosearch-core": {+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/@opencage/geosearch-core/-/geosearch-core-0.1.10.tgz",+ "integrity": "sha512-+XeZwRaM8hQUrYXAuxbDLYAkbw0Ko92ZuDodve1YQAlv89YktNRmxLvBi1LkhKQR+PRjJygZr7k1yo4PeDSRoA==",+ "peerDependencies": {+ "@algolia/autocomplete-js": "^1.*",+ "@algolia/autocomplete-theme-classic": "^1.*"+ }+ },"node_modules/@pkgr/core": {"version": "0.1.1","resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",@@ -1400,6 +1598,26 @@"url": "https://github.com/sponsors/epoberezkin"}},+ "node_modules/algoliasearch": {+ "version": "5.8.1",+ "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.8.1.tgz",+ "integrity": "sha512-9qYA9fVEhf3d3sGA71hIr0tBJp8+byqirjzvvVvwokc3uTN7J+rnsNcbgxFXlJQrBpfssDG08olVBqCbtZl4Mw==",+ "peer": true,+ "dependencies": {+ "@algolia/client-abtesting": "5.8.1",+ "@algolia/client-analytics": "5.8.1",+ "@algolia/client-common": "5.8.1",+ "@algolia/client-personalization": "5.8.1",+ "@algolia/client-search": "5.8.1",+ "@algolia/recommend": "5.8.1",+ "@algolia/requester-browser-xhr": "5.8.1",+ "@algolia/requester-fetch": "5.8.1",+ "@algolia/requester-node-http": "5.8.1"+ },+ "engines": {+ "node": ">= 14.0.0"+ }+ },"node_modules/ansi-regex": {"version": "5.0.1","resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",@@ -2287,6 +2505,12 @@"node": ">=8"}},+ "node_modules/htm": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.1.tgz",+ "integrity": "sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==",+ "peer": true+ },"node_modules/ieee754": {"version": "1.2.1","resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",@@ -2879,6 +3103,16 @@"resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz","integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw=="},+ "node_modules/preact": {+ "version": "10.24.2",+ "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.2.tgz",+ "integrity": "sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==",+ "peer": true,+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/preact"+ }+ },"node_modules/prelude-ls": {"version": "1.2.1","resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",@@ -3085,6 +3319,12 @@"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz","integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="},+ "node_modules/search-insights": {+ "version": "2.17.2",+ "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.2.tgz",+ "integrity": "sha512-zFNpOpUO+tY2D85KrxJ+aqwnIfdEGi06UH2+xEb+Bp9Mwznmauqc9djbnBibJO5mpfUPPa8st6Sx65+vbeO45g==",+ "peer": true+ },"node_modules/semver": {"version": "7.6.3","resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",diff --git a/web/package.json b/web/package.jsonindex 7e5997c..f6043af 100644--- a/web/package.json+++ b/web/package.json@@ -32,6 +32,7 @@"vite-plugin-render-svg": "^1.1.1"},"dependencies": {+ "@opencage/geosearch-core": "^0.1.10","lodash.invert": "^4.3.0","lodash.isequal": "^4.5.0","lodash.sortby": "^4.7.0",diff --git a/web/src/geocoder.ts b/web/src/geocoder.tsnew file mode 100644index 0000000..fcc3a7d--- /dev/null+++ b/web/src/geocoder.ts@@ -0,0 +1,46 @@+import { el } from 'redom'+import { IControl, LngLat, LngLatBounds, Map } from 'maplibre-gl'+import { OpenCageGeoSearchPlugin } from '@opencage/geosearch-core'+import { autocomplete } from '@algolia/autocomplete-js'+import '@algolia/autocomplete-theme-classic'++export default class OpenInfraMapGeocoder implements IControl {+ map?: Map+ container?: HTMLElement++ onAdd(map: Map): HTMLElement {+ this.map = map+ this.container = el('div.maplibregl-ctrl#geo-search')+ autocomplete({+ container: this.container,+ plugins: [+ OpenCageGeoSearchPlugin(+ {+ // This key only works on openinframap.org (and local dev).+ // Thanks to OpenCage for sponsoring!+ key: 'oc_gs_a595f2059dee41d6b7073647aec5c303'+ },+ {+ onSelect: ({ item }) => {+ if (item.bounds) {+ const bounds = new LngLatBounds(+ new LngLat(item.bounds.southwest.lng, item.bounds.southwest.lat),+ new LngLat(item.bounds.northeast.lng, item.bounds.northeast.lat)+ )+ map.fitBounds(bounds, { padding: 50 })+ } else {+ map.flyTo({+ center: [item.geometry.lng, item.geometry.lat],+ zoom: 12+ })+ }+ }+ }+ )+ ]+ })+ return this.container+ }++ onRemove(): void {}+}diff --git a/web/src/index.css b/web/src/index.cssindex e35a290..25ca7b2 100644--- a/web/src/index.css+++ b/web/src/index.css@@ -1,5 +1,11 @@@import 'maplibre-gl/dist/maplibre-gl.css';+:root {+ --aa-search-input-height: 33px !important;+ --aa-input-icon-size: 20px !important;+ --aa-primary-color-rgb: 100, 100, 100 !important;+}+html {width: 100%;height: 100%;@@ -22,17 +28,15 @@ body,header {z-index: 2;- padding: 4px;+ padding: 0.25rem 0 0.5rem 0.5rem;border-radius: 0px 0px 15px 0px;- background-color: rgba(240, 240, 240, 0.8);+ background-color: rgba(250, 250, 250, 0.8);top: 0px;left: 0px;+ width: 15rem;position: absolute;display: block;font-size: 13px;-}--header {backdrop-filter: blur(3px) saturate(80%);}@@ -59,6 +63,23 @@ h1 {font-size: 18px;}+.maplibregl-ctrl-top-left {+ /* Move control container down to avoid header */+ top: 60px;+}++.maplibregl-ctrl-top-left .maplibregl-ctrl {+ margin: 0.5rem 0 0 0.5rem;+}++.maplibregl-ctrl-top-right .maplibregl-ctrl {+ margin: 0.5rem 0.5rem 0 0;+}++#geo-search {+ box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 0px 2px;+}+a {color: #333;}diff --git a/web/src/index.ts b/web/src/index.tsindex 0219818..57e93e8 100644--- a/web/src/index.ts+++ b/web/src/index.ts@@ -9,6 +9,7 @@ import EditButton from './editbutton.js'import InfoPopup from './infopopup.js'import KeyControl from './key/key.js'import WarningBox from './warning-box/warning-box.js'+import OpenInfraMapGeocoder from './geocoder.js'import map_style from './style/style.js'import style_base from './style/style_base.js'@@ -131,6 +132,7 @@ function init() {map.addControl(new KeyControl(), 'top-right')map.addControl(layer_switcher, 'top-right')map.addControl(new EditButton(), 'bottom-right')+ map.addControl(new OpenInfraMapGeocoder(), 'top-left')new InfoPopup(oim_layers.map((layer: { [x: string]: any }) => layer['id']),6