Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Maplibre updates
Russ Garrett7f1bb989413e
diff --git a/web/package-lock.json b/web/package-lock.jsonindex fd81b77..77aaf37 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -13,7 +13,7 @@"lodash.invert": "^4.3.0","lodash.isequal": "^4.5.0","lodash.sortby": "^4.7.0",- "maplibre-gl": "^3.2.0",+ "maplibre-gl": "^3.6.2","redom": "^3.29.1","title-case": "^3.0.3"},@@ -522,9 +522,9 @@}},"node_modules/@maplibre/maplibre-gl-style-spec": {- "version": "19.2.2",- "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.2.2.tgz",- "integrity": "sha512-FbIm5WppbIFKeMQVE1xm4eawBPdlC5GcOCMz491Ip6kXTqe0pxp25rep60D69ioh8gTAAwS4up5MhI6vwMqsLg==",+ "version": "19.3.3",+ "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",+ "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==","dependencies": {"@mapbox/jsonlint-lines-primitives": "~2.0.2","@mapbox/unitbezier": "^0.0.1",@@ -975,19 +975,19 @@"dev": true},"node_modules/@types/geojson": {- "version": "7946.0.10",- "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",- "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="+ "version": "7946.0.13",+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",+ "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ=="},"node_modules/@types/mapbox__point-geometry": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",- "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz",+ "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA=="},"node_modules/@types/mapbox__vector-tile": {- "version": "1.3.0",- "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",- "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==",+ "version": "1.3.4",+ "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz",+ "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==","dependencies": {"@types/geojson": "*","@types/mapbox__point-geometry": "*",@@ -995,9 +995,17 @@}},"node_modules/@types/pbf": {- "version": "3.0.2",- "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz",- "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="+ "version": "3.0.5",+ "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz",+ "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA=="+ },+ "node_modules/@types/supercluster": {+ "version": "7.1.3",+ "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",+ "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",+ "dependencies": {+ "@types/geojson": "*"+ }},"node_modules/@wasm-codecs/oxipng": {"version": "1.0.1",@@ -1429,9 +1437,9 @@"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="},"node_modules/maplibre-gl": {- "version": "3.2.0",- "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.2.0.tgz",- "integrity": "sha512-TOo/cV9r8Xy3ngbJtY6JUC7rpjpObrsdO5pt14l5OIw4gY1v5XnxWP16VDSe0zRoncFfDCEBDmRwhfEFwtlbvw==",+ "version": "3.6.2",+ "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz",+ "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==","dependencies": {"@mapbox/geojson-rewind": "^0.5.2","@mapbox/jsonlint-lines-primitives": "^2.0.2",@@ -1440,11 +1448,12 @@"@mapbox/unitbezier": "^0.0.1","@mapbox/vector-tile": "^1.3.1","@mapbox/whoots-js": "^3.1.0",- "@maplibre/maplibre-gl-style-spec": "^19.2.1",- "@types/geojson": "^7946.0.10",- "@types/mapbox__point-geometry": "^0.1.2",- "@types/mapbox__vector-tile": "^1.3.0",- "@types/pbf": "^3.0.2",+ "@maplibre/maplibre-gl-style-spec": "^19.3.3",+ "@types/geojson": "^7946.0.13",+ "@types/mapbox__point-geometry": "^0.1.4",+ "@types/mapbox__vector-tile": "^1.3.4",+ "@types/pbf": "^3.0.5",+ "@types/supercluster": "^7.1.3","earcut": "^2.2.4","geojson-vt": "^3.2.1","gl-matrix": "^3.4.3",@@ -2295,9 +2304,9 @@"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="},"@maplibre/maplibre-gl-style-spec": {- "version": "19.2.2",- "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.2.2.tgz",- "integrity": "sha512-FbIm5WppbIFKeMQVE1xm4eawBPdlC5GcOCMz491Ip6kXTqe0pxp25rep60D69ioh8gTAAwS4up5MhI6vwMqsLg==",+ "version": "19.3.3",+ "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",+ "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==","requires": {"@mapbox/jsonlint-lines-primitives": "~2.0.2","@mapbox/unitbezier": "^0.0.1",@@ -2545,19 +2554,19 @@"dev": true},"@types/geojson": {- "version": "7946.0.10",- "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",- "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="+ "version": "7946.0.13",+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",+ "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ=="},"@types/mapbox__point-geometry": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",- "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz",+ "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA=="},"@types/mapbox__vector-tile": {- "version": "1.3.0",- "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",- "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==",+ "version": "1.3.4",+ "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz",+ "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==","requires": {"@types/geojson": "*","@types/mapbox__point-geometry": "*",@@ -2565,9 +2574,17 @@}},"@types/pbf": {- "version": "3.0.2",- "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz",- "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="+ "version": "3.0.5",+ "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz",+ "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA=="+ },+ "@types/supercluster": {+ "version": "7.1.3",+ "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",+ "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",+ "requires": {+ "@types/geojson": "*"+ }},"@wasm-codecs/oxipng": {"version": "1.0.1",@@ -2890,9 +2907,9 @@"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="},"maplibre-gl": {- "version": "3.2.0",- "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.2.0.tgz",- "integrity": "sha512-TOo/cV9r8Xy3ngbJtY6JUC7rpjpObrsdO5pt14l5OIw4gY1v5XnxWP16VDSe0zRoncFfDCEBDmRwhfEFwtlbvw==",+ "version": "3.6.2",+ "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz",+ "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==","requires": {"@mapbox/geojson-rewind": "^0.5.2","@mapbox/jsonlint-lines-primitives": "^2.0.2",@@ -2901,11 +2918,12 @@"@mapbox/unitbezier": "^0.0.1","@mapbox/vector-tile": "^1.3.1","@mapbox/whoots-js": "^3.1.0",- "@maplibre/maplibre-gl-style-spec": "^19.2.1",- "@types/geojson": "^7946.0.10",- "@types/mapbox__point-geometry": "^0.1.2",- "@types/mapbox__vector-tile": "^1.3.0",- "@types/pbf": "^3.0.2",+ "@maplibre/maplibre-gl-style-spec": "^19.3.3",+ "@types/geojson": "^7946.0.13",+ "@types/mapbox__point-geometry": "^0.1.4",+ "@types/mapbox__vector-tile": "^1.3.4",+ "@types/pbf": "^3.0.5",+ "@types/supercluster": "^7.1.3","earcut": "^2.2.4","geojson-vt": "^3.2.1","gl-matrix": "^3.4.3",diff --git a/web/package.json b/web/package.jsonindex 2bd29a4..12fa23d 100644--- a/web/package.json+++ b/web/package.json@@ -29,7 +29,7 @@"lodash.invert": "^4.3.0","lodash.isequal": "^4.5.0","lodash.sortby": "^4.7.0",- "maplibre-gl": "^3.2.0",+ "maplibre-gl": "^3.6.2","redom": "^3.29.1","title-case": "^3.0.3"}diff --git a/web/src/index.ts b/web/src/index.tsindex 96dc76c..1247726 100644--- a/web/src/index.ts+++ b/web/src/index.ts@@ -31,12 +31,6 @@ function init() {// mount(document.body, infobox);// }- maplibregl.setRTLTextPlugin(- "https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js",- () => {},- true // Lazy load the plugin- );-var oim_layers = style_oim_power.concat(// @ts-ignorestyle_oim_power_heatmap,@@ -82,6 +76,7 @@ function init() {minZoom: 2,maxZoom: 17.9,center: [12, 26],+ localIdeographFontFamily: "'Apple LiSung', 'Noto Sans', 'Noto Sans CJK SC', sans-serif"}));