Compare commits

...

140 Commits
ali ... master

Author SHA1 Message Date
e34ba23f18 Improve 2023-11-16 13:41:32 -05:00
ea1e8a520d Lower the positions of switch buttons 2023-11-10 16:49:18 -05:00
b746aabeba Solve the scroll bar issue 2023-11-10 16:44:21 -05:00
c451e572c8 Import the mapbox css and solve the controls problem 2023-11-09 12:32:42 -05:00
aa19dd40ff Reset 2023-11-08 14:02:48 -05:00
ca225e969b Test wit all the functionalities 2023-11-08 13:59:01 -05:00
bfa55a03cd Test 2023-11-08 13:47:17 -05:00
522cda0aec Test 2023-11-08 13:44:26 -05:00
c28716106f Remove pane darkLightTheme 2023-11-08 13:43:16 -05:00
cf5ea926c2 Test with the core functionalities 2023-11-08 13:41:42 -05:00
e61a661abd Add click handler 2023-11-08 13:39:29 -05:00
44d3f20a0e Test with MapContainer 2023-11-08 13:37:39 -05:00
2b099a073d Add BuildingDataLayer 2023-11-08 13:24:20 -05:00
b73c945c10 Use mapp.css for styling 2023-11-03 11:47:49 -04:00
a3d3be1a3c Fix theme_color in webmanifest 2023-11-03 11:45:11 -04:00
cae401cebc Fix the top 2023-11-03 11:38:35 -04:00
ff779aefda Fix the problem temporarily by activating the css file 2023-11-03 08:43:49 -04:00
c720a02a7a Change css 2023-11-02 13:39:30 -04:00
2a1429ca5e Add city map2 2023-11-02 13:38:12 -04:00
5b69948846 Add city map 2023-11-02 13:37:03 -04:00
da09b12a44 Change the top position 2023-11-02 11:00:44 -04:00
667cfc3d07 Put map in its right position 2023-11-02 09:20:06 -04:00
311baff7ee Change the location of datalayer buttons-3 2023-10-27 16:23:08 -04:00
9cd4bba190 Change the location of datalayer buttons-2 2023-10-27 16:22:06 -04:00
fa92037c79 Change the location of theme & datalayer buttons 2023-10-27 16:20:38 -04:00
7c47757ef5 Remove switch theme 2023-10-27 16:08:25 -04:00
88d27dbf6b Improve navigation control 2023-10-27 15:05:04 -04:00
c9a56504ce Add mapbox navigation control & remove leaflet's map cpntainer 2023-10-27 14:55:19 -04:00
5bad2b11a4 Improve leaf-let's map-container 2023-10-27 14:44:48 -04:00
222613c532 Add map-container element 2023-10-27 14:37:50 -04:00
3566d18662 Activate legend and dataset buttons menu on map 2023-10-27 14:21:29 -04:00
60dda8cb48 Test with legend menu 2 2023-10-27 14:19:53 -04:00
ef9f4613ef Test legend menu 2023-10-27 14:17:29 -04:00
746964e22b Delete zoom control 2023-10-27 14:13:47 -04:00
bf7ad27c0c Develop zoom control 2023-10-27 14:12:08 -04:00
2ab35b1340 Comment CityMap in map.tsx 2023-10-27 13:55:36 -04:00
a99d257c4e Comment city-bas-map-layer 2023-10-27 13:53:51 -04:00
c080b0762a Add package-lock.json 2023-10-27 11:32:54 -04:00
alireza
fc510f0e11 Replace leaflet with mapbox-gl directly 2023-10-20 15:30:59 -04:00
alireza
c010da3fe4 Add package.json 2023-10-20 13:57:38 -04:00
20a95b9922 Test 2023-10-19 16:57:18 -04:00
61d4d61a43 Test 2023-10-19 16:27:40 -04:00
348ddaaba8 Test 2023-10-19 16:11:46 -04:00
9cae59fd55 Test 2023-10-19 16:07:53 -04:00
ffb3f94679 Go back to normal 2023-10-19 15:42:04 -04:00
769c62f9f9 Go back to normal 2023-10-19 15:40:18 -04:00
962877177c Make header.css and map.css relative 2023-10-19 15:39:13 -04:00
99e9b4ac12 Make header.css and map.css relative 2023-10-19 15:38:28 -04:00
2b2231ecab Go back to normal 2023-10-19 15:21:24 -04:00
42f75e6b17 Remove verbose 2023-10-19 15:20:13 -04:00
f4938c04e3 Test global mapbox 2023-10-19 15:15:45 -04:00
a42bcefcf5 Test leaflet 2023-10-19 15:11:40 -04:00
8f6baeaefb Test 2023-10-19 14:59:45 -04:00
8e5e3e0b5e Everything 2023-10-19 14:58:47 -04:00
9b96c2112f Test 2023-10-19 14:56:16 -04:00
0ce9f983c4 Test 2023-10-19 14:54:12 -04:00
bc69df28f9 Test 2023-10-19 14:50:56 -04:00
706f570ef0 Test 2023-10-19 14:49:26 -04:00
ea40c794a7 Test 2023-10-19 14:48:33 -04:00
6f3403554c Test 2023-10-19 14:47:50 -04:00
b7ba0ef73e Test 2023-10-19 14:46:53 -04:00
eb7a70de24 Test 2023-10-19 14:45:01 -04:00
3edf7d4482 Test 2023-10-19 14:43:28 -04:00
06186b6cc9 Test 2023-10-19 14:42:31 -04:00
e1354cbc66 Add className map-container-5 2023-10-19 14:39:05 -04:00
c2666e4e53 Add className map-container-4 2023-10-19 14:35:15 -04:00
3fbaeb2f7a Add className map-container-3 2023-10-19 14:34:07 -04:00
f46db35bdc Add className map-container-2 2023-10-19 14:32:41 -04:00
bc027a2146 Add className map-container 2023-10-19 14:31:09 -04:00
e45a100e41 Put the css & JS again with double quotation-2 2023-10-19 12:53:44 -04:00
f13c98881a Delete the JS css codes from line 96 to test2 2023-10-19 12:47:59 -04:00
18042618f8 Put the css & JS again with double quotation 2023-10-19 12:44:49 -04:00
1929adbaf9 Delete the JS css codes from line 96 to test 2023-10-19 11:47:22 -04:00
e44df33b1a Delete the JS css codes (no impact) 2023-10-19 11:44:50 -04:00
3398dd2e00 Delete JS & CSS to test 2023-10-19 11:42:43 -04:00
c7b39d960b Comment to see if the JS css codes work there 2023-10-19 11:40:29 -04:00
e353710afc Return back to map, and import js in mapcss 2023-10-13 14:02:40 -04:00
7d517ed1bc Change map to leaflet-container 2023-10-13 13:42:33 -04:00
bdfd25d314 Change map to map-container 2023-10-13 13:41:03 -04:00
7e53f3a97e Change the width and zoom 2023-10-12 17:07:12 -04:00
46a97bbb5e Change the width and zoom 2023-10-12 17:03:20 -04:00
e6e04cef75 Change the zoom 2023-10-12 17:01:41 -04:00
c71f5c8261 Change the width and zoom 2023-10-12 17:00:02 -04:00
ed8e4713ec Change the width 2023-10-12 16:57:38 -04:00
c24379671d Remove theme to line 109 2023-10-12 14:16:25 -04:00
0e52538a13 Add theme to line 109 2023-10-12 14:10:05 -04:00
de0a2d5abe Change CSS and width 2023-10-12 12:00:52 -04:00
39ed1022dd Change CSS and width 2023-10-12 11:59:47 -04:00
32e44cc1f1 Change CSS and width 2023-10-12 11:58:07 -04:00
4c943753ab Change CSS and width 2023-10-12 11:57:13 -04:00
69298726d3 Change CSS and width 2023-10-12 11:55:18 -04:00
789aae47b4 Change CSS 2023-10-12 11:53:33 -04:00
2f5f127873 Change CSS and width 2023-10-12 11:51:43 -04:00
1169a6afc6 Change position back to absolute 2023-10-12 11:43:49 -04:00
df11643c05 Change width and height 2023-10-12 11:42:35 -04:00
0de1d691b4 Change position to relative 2023-10-12 11:40:57 -04:00
02ddf69d06 Change width and height 2023-10-12 11:40:06 -04:00
d95af6e67f Change width and height 2023-10-12 11:30:15 -04:00
d61de7ff81 Change width to 80% 2023-10-12 11:29:03 -04:00
ad35493c97 Change to the old width and height 2023-10-12 11:24:54 -04:00
b2e2229463 Change height 2023-10-12 11:23:48 -04:00
b77b6dc0d1 Change width and height 2023-10-12 11:21:37 -04:00
6d63a66cdc Return the media 2023-10-06 12:55:07 -04:00
1896950f52 Comment the last media 2023-10-06 12:54:06 -04:00
825c80de4a Comment leaflt-grab 2023-10-06 12:51:51 -04:00
eb173a396a Comment leaflt-container 2023-10-06 12:49:11 -04:00
58dce24463 Comment the media query 2023-10-06 12:47:02 -04:00
9fec553b16 Return to default 2023-10-06 12:32:24 -04:00
22c13e26b5 Add attributes to the media mapcontainer 2023-10-06 12:31:21 -04:00
59173da3fb Fux the media's top attribute 2023-10-06 12:27:51 -04:00
5dd409045d Play with the media attributes 2023-10-06 12:25:54 -04:00
02a4430677 Play with the map-container attributes-2 2023-10-06 12:22:42 -04:00
89d65ce6ca Play with the map-container attributes 2023-10-06 12:20:34 -04:00
9f89423946 Change the position back to absolute 2023-10-06 11:59:06 -04:00
b0776f490c Add mapbox css and js to the head 2023-10-06 11:46:46 -04:00
9ad925cfc2 Delete css reference from index.ts 2023-10-05 18:45:10 -04:00
070abd07de Change index.ts and app.css 2023-10-05 18:43:44 -04:00
75ba25f2ed Make position fixed 2023-10-05 17:19:57 -04:00
0586af694a Add mapbox css directly 2023-10-05 17:04:45 -04:00
dec12d19cd Change the order of lat and lng 2023-10-05 16:27:29 -04:00
90bb71dac9 Edit the head 2023-10-05 15:59:32 -04:00
bc5b1c8f79 Change the % to px for width & height 2023-10-05 15:35:05 -04:00
10d068ba62 Change the % value for width & height 2023-10-05 15:33:49 -04:00
7e4fe071a6 Change the % value for width & height 2023-10-05 15:27:45 -04:00
5602245ec0 Change the px to % for width & height 2023-10-05 15:23:43 -04:00
01dab19220 Enlarge the map by changing the width value-5 2023-10-05 13:42:30 -04:00
5edfb2d48a Enlarge the map by changing width (px was %) and height values-4 2023-10-05 13:39:06 -04:00
b8b5140944 Enlarge the map by changing width and height values-3 2023-10-05 13:37:26 -04:00
71dc5bb1a7 Enlarge the map by changing the height value 2023-10-05 13:35:14 -04:00
e5cc456d6b Enlarge the map by changing width and height values 2023-10-05 13:33:17 -04:00
2c53688a8e Remove theme from line 109 2023-10-05 13:24:03 -04:00
4d90354f0b Replace CityBaseMapLayer them=.. with CityMap 2023-10-05 13:01:53 -04:00
ae46ec1547 Change the function to export function 2023-10-05 12:55:19 -04:00
5ac7bac38d Replace CityMap with CityBaseMapLayer 2023-10-05 12:01:03 -04:00
3d94fd9e49 Replace CityBaseMapLayer with CityMap 2023-10-05 11:40:36 -04:00
bfc6ab13d7 Add mapbox src and href 2023-10-05 11:33:33 -04:00
89885fb83e Test Changing the Land use menu 2023-09-21 14:58:30 -04:00
demianAdli
1630253b2d Rounding the latitude and longitude values 2023-09-14 11:39:41 -04:00
ec1a21f0e6 Change the point coordinates in the cc-config.json 2023-08-25 14:58:26 -04:00
a14b825f1f Remove etl from gitignore. Add the ER's building point to the module 2023-08-25 14:47:12 -04:00
16 changed files with 11396 additions and 240 deletions

1
.gitignore vendored
View File

@ -10,7 +10,6 @@ html/norton*.html
.vscode
# Data
etl/
etl/cache/*
etl/images/*
etl/*.geojson

373
app/package-lock.json generated
View File

@ -25,6 +25,7 @@
"geojson": "^0.5.0",
"leaflet": "^1.7.1",
"lodash": "^4.17.21",
"mapbox-gl": "^2.15.0",
"mapnik": "^4.5.9",
"markdown-to-jsx": "^7.1.3",
"node-fs": "^0.1.7",
@ -2556,6 +2557,42 @@
"react": ">=16.3.0"
}
},
"node_modules/@mapbox/geojson-rewind": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
"dependencies": {
"get-stream": "^6.0.1",
"minimist": "^1.2.6"
},
"bin": {
"geojson-rewind": "geojson-rewind"
}
},
"node_modules/@mapbox/geojson-rewind/node_modules/get-stream": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@mapbox/jsonlint-lines-primitives": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/@mapbox/mapbox-gl-supported": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
"integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ=="
},
"node_modules/@mapbox/node-pre-gyp": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
@ -2575,6 +2612,11 @@
"node-pre-gyp": "bin/node-pre-gyp"
}
},
"node_modules/@mapbox/point-geometry": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="
},
"node_modules/@mapbox/sphericalmercator": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.2.0.tgz",
@ -2586,6 +2628,32 @@
"xyz": "bin/xyz.js"
}
},
"node_modules/@mapbox/tiny-sdf": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz",
"integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA=="
},
"node_modules/@mapbox/unitbezier": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
"integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw=="
},
"node_modules/@mapbox/vector-tile": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
"integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
"dependencies": {
"@mapbox/point-geometry": "~0.1.0"
}
},
"node_modules/@mapbox/whoots-js": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==",
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -5678,6 +5746,11 @@
"url": "https://github.com/sponsors/fb55"
}
},
"node_modules/csscolorparser": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="
},
"node_modules/cssesc": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@ -6578,6 +6651,11 @@
"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
"dev": true
},
"node_modules/earcut": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
},
"node_modules/ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@ -8264,6 +8342,11 @@
"node": ">= 0.10"
}
},
"node_modules/geojson-vt": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
},
"node_modules/get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@ -8340,6 +8423,11 @@
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
},
"node_modules/gl-matrix": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
},
"node_modules/glob": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@ -8450,6 +8538,11 @@
"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"node_modules/grid-index": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
},
"node_modules/growly": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@ -10542,6 +10635,11 @@
"node": ">=4.0"
}
},
"node_modules/kdbush": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
},
"node_modules/killable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@ -10796,6 +10894,35 @@
"node": ">=0.10.0"
}
},
"node_modules/mapbox-gl": {
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
"integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==",
"dependencies": {
"@mapbox/geojson-rewind": "^0.5.2",
"@mapbox/jsonlint-lines-primitives": "^2.0.2",
"@mapbox/mapbox-gl-supported": "^2.0.1",
"@mapbox/point-geometry": "^0.1.0",
"@mapbox/tiny-sdf": "^2.0.6",
"@mapbox/unitbezier": "^0.0.1",
"@mapbox/vector-tile": "^1.3.1",
"@mapbox/whoots-js": "^3.1.0",
"csscolorparser": "~1.0.3",
"earcut": "^2.2.4",
"geojson-vt": "^3.2.1",
"gl-matrix": "^3.4.3",
"grid-index": "^1.1.0",
"kdbush": "^4.0.1",
"murmurhash-js": "^1.0.0",
"pbf": "^3.2.1",
"potpack": "^2.0.0",
"quickselect": "^2.0.0",
"rw": "^1.3.3",
"supercluster": "^8.0.0",
"tinyqueue": "^2.0.3",
"vt-pbf": "^3.1.3"
}
},
"node_modules/mapnik": {
"version": "4.5.9",
"resolved": "https://registry.npmjs.org/mapnik/-/mapnik-4.5.9.tgz",
@ -11285,6 +11412,11 @@
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
"node_modules/murmurhash-js": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
},
"node_modules/mute-stream": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@ -12243,6 +12375,18 @@
"through": "~2.3"
}
},
"node_modules/pbf": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
"integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
"dependencies": {
"ieee754": "^1.1.12",
"resolve-protobuf-schema": "^2.1.0"
},
"bin": {
"pbf": "bin/pbf"
}
},
"node_modules/pg": {
"version": "8.7.1",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
@ -14151,6 +14295,11 @@
"node": ">=0.10.0"
}
},
"node_modules/potpack": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
"integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw=="
},
"node_modules/prebuild-install": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@ -14295,6 +14444,11 @@
"react-is": "^16.13.1"
}
},
"node_modules/protocol-buffers-schema": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
},
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@ -14428,6 +14582,11 @@
}
]
},
"node_modules/quickselect": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
},
"node_modules/random-bytes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@ -15798,6 +15957,14 @@
"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
},
"node_modules/resolve-protobuf-schema": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
"dependencies": {
"protocol-buffers-schema": "^3.3.1"
}
},
"node_modules/resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@ -15928,6 +16095,11 @@
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true
},
"node_modules/rw": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
},
"node_modules/rxjs": {
"version": "6.6.7",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@ -17569,6 +17741,14 @@
"node": ">=0.10.0"
}
},
"node_modules/supercluster": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
"integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
"dependencies": {
"kdbush": "^4.0.2"
}
},
"node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@ -18224,6 +18404,11 @@
"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
},
"node_modules/tinyqueue": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
},
"node_modules/tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@ -18879,6 +19064,16 @@
"url": "https://github.com/sponsors/wooorm"
}
},
"node_modules/vt-pbf": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
"integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
"dependencies": {
"@mapbox/point-geometry": "0.1.0",
"@mapbox/vector-tile": "^1.3.1",
"pbf": "^3.2.1"
}
},
"node_modules/w3c-hr-time": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@ -22130,6 +22325,32 @@
"react-is": "^16.12.0"
}
},
"@mapbox/geojson-rewind": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
"requires": {
"get-stream": "^6.0.1",
"minimist": "^1.2.6"
},
"dependencies": {
"get-stream": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
}
}
},
"@mapbox/jsonlint-lines-primitives": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ=="
},
"@mapbox/mapbox-gl-supported": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
"integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ=="
},
"@mapbox/node-pre-gyp": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
@ -22146,11 +22367,39 @@
"tar": "^6.1.11"
}
},
"@mapbox/point-geometry": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="
},
"@mapbox/sphericalmercator": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.2.0.tgz",
"integrity": "sha512-ZTOuuwGuMOJN+HEmG/68bSEw15HHaMWmQ5gdTsWdWsjDe56K1kGvLOK6bOSC8gWgIvEO0w6un/2Gvv1q5hJSkQ=="
},
"@mapbox/tiny-sdf": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz",
"integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA=="
},
"@mapbox/unitbezier": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
"integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw=="
},
"@mapbox/vector-tile": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
"integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
"requires": {
"@mapbox/point-geometry": "~0.1.0"
}
},
"@mapbox/whoots-js": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
"@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -24630,6 +24879,11 @@
"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
"dev": true
},
"csscolorparser": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="
},
"cssesc": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@ -25323,6 +25577,11 @@
"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
"dev": true
},
"earcut": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@ -26618,6 +26877,11 @@
"resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
"integrity": "sha1-PNbJY5m+ZbVu5VWWEW/pGRznAcA="
},
"geojson-vt": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
},
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@ -26670,6 +26934,11 @@
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
},
"gl-matrix": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
},
"glob": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@ -26755,6 +27024,11 @@
"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"grid-index": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
},
"growly": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@ -28363,6 +28637,11 @@
"object.assign": "^4.1.2"
}
},
"kdbush": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
},
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@ -28564,6 +28843,35 @@
"object-visit": "^1.0.0"
}
},
"mapbox-gl": {
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
"integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==",
"requires": {
"@mapbox/geojson-rewind": "^0.5.2",
"@mapbox/jsonlint-lines-primitives": "^2.0.2",
"@mapbox/mapbox-gl-supported": "^2.0.1",
"@mapbox/point-geometry": "^0.1.0",
"@mapbox/tiny-sdf": "^2.0.6",
"@mapbox/unitbezier": "^0.0.1",
"@mapbox/vector-tile": "^1.3.1",
"@mapbox/whoots-js": "^3.1.0",
"csscolorparser": "~1.0.3",
"earcut": "^2.2.4",
"geojson-vt": "^3.2.1",
"gl-matrix": "^3.4.3",
"grid-index": "^1.1.0",
"kdbush": "^4.0.1",
"murmurhash-js": "^1.0.0",
"pbf": "^3.2.1",
"potpack": "^2.0.0",
"quickselect": "^2.0.0",
"rw": "^1.3.3",
"supercluster": "^8.0.0",
"tinyqueue": "^2.0.3",
"vt-pbf": "^3.1.3"
}
},
"mapnik": {
"version": "4.5.9",
"resolved": "https://registry.npmjs.org/mapnik/-/mapnik-4.5.9.tgz",
@ -28937,6 +29245,11 @@
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
"murmurhash-js": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
},
"mute-stream": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@ -29664,6 +29977,15 @@
"through": "~2.3"
}
},
"pbf": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
"integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
"requires": {
"ieee754": "^1.1.12",
"resolve-protobuf-schema": "^2.1.0"
}
},
"pg": {
"version": "8.7.1",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
@ -31108,6 +31430,11 @@
"xtend": "^4.0.0"
}
},
"potpack": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
"integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw=="
},
"prebuild-install": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@ -31226,6 +31553,11 @@
"react-is": "^16.13.1"
}
},
"protocol-buffers-schema": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
},
"proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@ -31313,6 +31645,11 @@
"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
"dev": true
},
"quickselect": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
},
"random-bytes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@ -32360,6 +32697,14 @@
"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
},
"resolve-protobuf-schema": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
"requires": {
"protocol-buffers-schema": "^3.3.1"
}
},
"resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@ -32452,6 +32797,11 @@
}
}
},
"rw": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
},
"rxjs": {
"version": "6.6.7",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@ -33776,6 +34126,14 @@
}
}
},
"supercluster": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
"integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
"requires": {
"kdbush": "^4.0.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@ -34312,6 +34670,11 @@
"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
},
"tinyqueue": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
},
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@ -34828,6 +35191,16 @@
"integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
"dev": true
},
"vt-pbf": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
"integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
"requires": {
"@mapbox/point-geometry": "0.1.0",
"@mapbox/vector-tile": "^1.3.1",
"pbf": "^3.2.1"
}
},
"w3c-hr-time": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",

View File

@ -29,6 +29,7 @@
"geojson": "^0.5.0",
"leaflet": "^1.7.1",
"lodash": "^4.17.21",
"mapbox-gl": "^2.15.0",
"mapnik": "^4.5.9",
"markdown-to-jsx": "^7.1.3",
"node-fs": "^0.1.7",

View File

@ -10,5 +10,5 @@
],
"start_url": "/",
"background_color": "#ffffff",
"theme_color": "#fffff"
"theme_color": "#ffffff"
}

View File

@ -1,12 +1,12 @@
{
"cityName": "Cities",
"projectBlurb": "Colouring {City Name} is part Colouring Cities.",
"cityName": "Montreal",
"projectBlurb": "Colouring Montreal is a part of Colouring Cities.",
"githubURL": "https://github.com/colouring-cities/colouring-core",
"githubURL": "https://github.com/colouring-cities/colouring-montreal/",
"manualURL": "https://github.com/colouring-cities/manual/wiki/M3.-COLOURING-BRITAIN",
"privacyStatement": "{Privacy statement goes here}",
"initialMapPosition": [ 51.5245255, -0.1338422 ],
"initialMapPosition": [ 45.4962261, -73.5801403 ],
"initialZoomLevel": 16,
"postcode": "Postcode",

View File

@ -430,9 +430,9 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{
mapStyle: 'is_domestic',
legend: {
title: 'Residential building',
title: 'Test MTL', //Residential building
elements: [
{ color: '#f7ec25', text: 'Residential' },
{ color: '#f7ec25', text: 'Test' }, //Residential
{ color: '#fc9b2a', text: 'Mixed' },
{ color: '#ff2121', text: 'Non-residential' },
]

View File

@ -1,38 +1,31 @@
import * as React from 'react';
import { TileLayer } from 'react-leaflet';
import React, { useEffect } from 'react';
import mapboxgl from 'mapbox-gl';
import { MapTheme } from '../../config/map-config';
const OS_API_KEY = 'UVWEspgInusDKKYANE5bmyddoEmCSD4r';
// Set your Mapbox access token
mapboxgl.accessToken = 'pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg';
/**
* Base raster layer for the map.
* @param theme map theme
* Component to display a Mapbox map.
*/
export function CityBaseMapLayer({ theme }: { theme: MapTheme }) {
export function CityMap() {
useEffect(() => {
const map = new mapboxgl.Map({
container: 'map', // container ID
style: 'mapbox://styles/mapbox/streets-v12', // style URL
center: [-73.5801403, 45.4962261], // starting position [lng, lat]
zoom: 15, // starting zoom
});
/**
* Ordnance Survey maps - UK / London specific
* (replace with appropriate base map for other cities/countries)
*/
const apiKey = OS_API_KEY;
// Optionally, you can add more configuration options or features to your map here.
// Note that OS APIs does not provide dark theme
const layer = 'Light_3857';
// Cleanup the map when the component unmounts
return () => map.remove();
}, []);
// In either theme case, we will use OS's light theme, but add our own filter
const theme_class = theme === 'light' ? "light-theme" : "night-theme";
const baseUrl = `https://api.os.uk/maps/raster/v1/zxy/${layer}/{z}/{x}/{y}.png?key=${apiKey}`;
const attribution = `Building attribute data is © Colouring Cities contributors. Maps contain OS data © Crown copyright: OS Maps baselayers and building outlines. <a href=/ordnance-survey-licence.html>OS licence</a>`;
return <TileLayer
url={baseUrl}
attribution={attribution}
maxNativeZoom={18}
maxZoom={19}
detectRetina={false}
className={theme_class}
/>;
return (
<div id="map" style={{ width: '100%', height: '100vh' }}></div>
);
}
export default CityMap;

View File

@ -73,14 +73,14 @@
}
.theme-switcher {
top: 77px;
top: 100px;
}
.theme-switcher .btn {
min-width: 340px;
}
.data-switcher {
top: 117px;
top: 140px;
}
.data-switcher .btn {
min-width: 340px;

View File

@ -1,10 +1,9 @@
.map-container {
position: absolute;
top: 76px; /* sync with header positioning */
top: 76px; /* sync with header positioning*/
bottom: 0;
left: 0;
right: 0;
min-width: 320px;
}
@media (min-width: 990px) {
.map-container {
@ -12,8 +11,7 @@
left: 470px;
}
}
.leaflet-container {
height: 100%;
.leaflet-container {height: 100%;
width: 100%;
}
.leaflet-container .leaflet-control-zoom {
@ -34,3 +32,4 @@
display: block;
}
}

View File

@ -1,219 +1,209 @@
import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { AttributionControl, MapContainer, ZoomControl, useMapEvent, Pane, useMap } from 'react-leaflet';
import React, {
FC,
useCallback,
useEffect,
useMemo,
useState,
useRef,
} from "react";
import {
AttributionControl,
MapContainer,
ZoomControl,
useMapEvent,
Pane,
useMap,
} from "react-leaflet";
import 'leaflet/dist/leaflet.css';
import './map.css';
import "leaflet/dist/leaflet.css";
import "./map.css";
import { apiGet } from '../apiHelpers';
import { initialMapViewport, mapBackgroundColor, MapTheme, LayerEnablementState } from '../config/map-config';
import { apiGet } from "../apiHelpers";
import {
initialMapViewport,
mapBackgroundColor,
MapTheme,
LayerEnablementState,
} from "../config/map-config";
import { Building } from '../models/building';
import mapboxgl from "mapbox-gl";
import { CityBaseMapLayer } from './layers/city-base-map-layer';
import { CityBoundaryLayer } from './layers/city-boundary-layer';
import { BoroughBoundaryLayer } from './layers/borough-boundary-layer';
import { BoroughLabelLayer } from './layers/borough-label-layer';
import { ParcelBoundaryLayer } from './layers/parcel-boundary-layer';
import { HistoricDataLayer } from './layers/historic-data-layer';
import { HistoricMapLayer } from './layers/historic-map-layer';
import { FloodBoundaryLayer } from './layers/flood-boundary-layer';
import { ConservationAreaBoundaryLayer } from './layers/conservation-boundary-layer';
import { VistaBoundaryLayer } from './layers/vista-boundary-layer';
import { HousingBoundaryLayer } from './layers/housing-boundary-layer';
import { CreativeBoundaryLayer } from './layers/creative-boundary-layer';
import { BuildingBaseLayer } from './layers/building-base-layer';
import { BuildingDataLayer } from './layers/building-data-layer';
import { BuildingNumbersLayer } from './layers/building-numbers-layer';
import { BuildingHighlightLayer } from './layers/building-highlight-layer';
import { Building } from "../models/building";
import { Legend } from './legend';
import SearchBox from './search-box';
import ThemeSwitcher from './theme-switcher';
import DataLayerSwitcher from './data-switcher';
import { BoroughSwitcher } from './borough-switcher';
import { ParcelSwitcher } from './parcel-switcher';
import { FloodSwitcher } from './flood-switcher';
import { ConservationAreaSwitcher } from './conservation-switcher';
import { HistoricDataSwitcher } from './historic-data-switcher';
import { HistoricMapSwitcher } from './historic-map-switcher';
import { VistaSwitcher } from './vista-switcher';
import { CreativeSwitcher } from './creative-switcher';
import { HousingSwitcher } from './housing-switcher';
import { BuildingMapTileset } from '../config/tileserver-config';
import { useDisplayPreferences } from '../displayPreferences-context';
import { CategoryMapDefinition } from '../config/category-maps-config';
import { CityMap } from "./layers/city-base-map-layer";
import { CityBoundaryLayer } from "./layers/city-boundary-layer";
import { BoroughBoundaryLayer } from "./layers/borough-boundary-layer";
import { BoroughLabelLayer } from "./layers/borough-label-layer";
import { ParcelBoundaryLayer } from "./layers/parcel-boundary-layer";
import { HistoricDataLayer } from "./layers/historic-data-layer";
import { HistoricMapLayer } from "./layers/historic-map-layer";
import { FloodBoundaryLayer } from "./layers/flood-boundary-layer";
import { ConservationAreaBoundaryLayer } from "./layers/conservation-boundary-layer";
import { VistaBoundaryLayer } from "./layers/vista-boundary-layer";
import { HousingBoundaryLayer } from "./layers/housing-boundary-layer";
import { CreativeBoundaryLayer } from "./layers/creative-boundary-layer";
import { BuildingBaseLayer } from "./layers/building-base-layer";
import { BuildingDataLayer } from "./layers/building-data-layer";
import { BuildingNumbersLayer } from "./layers/building-numbers-layer";
import { BuildingHighlightLayer } from "./layers/building-highlight-layer";
import { Legend } from "./legend";
import SearchBox from "./search-box";
import ThemeSwitcher from "./theme-switcher";
import DataLayerSwitcher from "./data-switcher";
import { BoroughSwitcher } from "./borough-switcher";
import { ParcelSwitcher } from "./parcel-switcher";
import { FloodSwitcher } from "./flood-switcher";
import { ConservationAreaSwitcher } from "./conservation-switcher";
import { HistoricDataSwitcher } from "./historic-data-switcher";
import { HistoricMapSwitcher } from "./historic-map-switcher";
import { VistaSwitcher } from "./vista-switcher";
import { CreativeSwitcher } from "./creative-switcher";
import { HousingSwitcher } from "./housing-switcher";
import { BuildingMapTileset } from "../config/tileserver-config";
import { useDisplayPreferences } from "../displayPreferences-context";
import { CategoryMapDefinition } from "../config/category-maps-config";
mapboxgl.accessToken =
"pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
interface ColouringMapProps {
selectedBuildingId: number;
mode: 'basic' | 'view' | 'edit' | 'multi-edit';
revisionId: string;
onBuildingAction: (building: Building) => void;
mapColourScale: BuildingMapTileset;
onMapColourScale: (x: BuildingMapTileset) => void;
categoryMapDefinitions: CategoryMapDefinition[]
selectedBuildingId: number;
mode: "basic" | "view" | "edit" | "multi-edit";
revisionId: string;
onBuildingAction: (building: Building) => void;
mapColourScale: BuildingMapTileset;
onMapColourScale: (x: BuildingMapTileset) => void;
categoryMapDefinitions: CategoryMapDefinition[];
}
export const ColouringMap : FC<ColouringMapProps> = ({
mode,
revisionId,
onBuildingAction,
selectedBuildingId,
mapColourScale,
onMapColourScale,
categoryMapDefinitions,
children
export const ColouringMap: FC<ColouringMapProps> = ({
mode,
revisionId,
onBuildingAction,
selectedBuildingId,
mapColourScale,
onMapColourScale,
categoryMapDefinitions,
children,
}) => {
const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } = useDisplayPreferences();
const [position, setPosition] = useState(initialMapViewport.position);
const [zoom, setZoom] = useState(initialMapViewport.zoom);
const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } =
useDisplayPreferences();
const [position, setPosition] = useState(initialMapViewport.position);
const [zoom, setZoom] = useState(initialMapViewport.zoom);
const handleLocate = useCallback((lat: number, lng: number, zoom: number) => {
setPosition([lat, lng]);
setZoom(zoom);
}, []);
const handleLocate = useCallback(
(lat: number, lng: number, zoom: number) => {
setPosition([lat, lng]);
setZoom(zoom);
},
[]
);
const handleClick = useCallback(
async (e) => {
const { lat, lng } = e.latlng;
const data = await apiGet(`/api/buildings/locate?lat=${lat}&lng=${lng}`);
const building = data?.[0];
onBuildingAction(building);
},
[onBuildingAction]
);
const handleClick = useCallback(
async (e) => {
const {lat, lng} = e.latlng;
const data = await apiGet(`/api/buildings/locate?lat=${lat}&lng=${lng}`);
const building = data?.[0];
onBuildingAction(building);
},
[onBuildingAction],
)
const mapContainer = useRef(null);
const map = useRef(null);
const [lng, setLng] = useState(-73.5801403);
const [lat, setLat] = useState(45.4962261);
return (
<div className="map-container">
<MapContainer
center={initialMapViewport.position}
zoom={initialMapViewport.zoom}
minZoom={9}
maxZoom={18}
doubleClickZoom={false}
zoomControl={false}
attributionControl={false}
>
<ClickHandler onClick={handleClick} />
<MapBackgroundColor theme={darkLightTheme} />
<MapViewport position={position} zoom={zoom} />
<Pane
key={darkLightTheme}
name={'cc-base-pane'}
style={{zIndex: 50}}
>
<CityBaseMapLayer theme={darkLightTheme} />
<BuildingBaseLayer theme={darkLightTheme} />
</Pane>
<Pane
name='cc-overlay-pane-shown-behind-buildings'
style={{zIndex: 199}}
>
<ConservationAreaBoundaryLayer/>
</Pane>
{
mapColourScale &&
<BuildingDataLayer
tileset={mapColourScale}
revisionId={revisionId}
/>
}
<Pane
name='cc-overlay-pane'
style={{zIndex: 300}}
>
<CityBoundaryLayer/>
<HistoricDataLayer revisionId={revisionId} />
<HistoricMapLayer revisionId={revisionId} />
<BoroughBoundaryLayer/>
<ParcelBoundaryLayer/>
<FloodBoundaryLayer/>
<VistaBoundaryLayer/>
<HousingBoundaryLayer/>
<CreativeBoundaryLayer/>
<BuildingNumbersLayer revisionId={revisionId} />
{
selectedBuildingId &&
<BuildingHighlightLayer
selectedBuildingId={selectedBuildingId}
baseTileset={mapColourScale}
/>
}
</Pane>
<Pane
name='cc-label-overlay-pane'
style={{zIndex: 1000}}
>
<BoroughLabelLayer/>
</Pane>
<ZoomControl position="topright" />
<AttributionControl prefix=""/>
</MapContainer>
{
mode !== 'basic' &&
<>
<Legend mapColourScaleDefinitions={categoryMapDefinitions} mapColourScale={mapColourScale} onMapColourScale={onMapColourScale}/>
<ThemeSwitcher onSubmit={darkLightThemeSwitch} currentTheme={darkLightTheme} />
<DataLayerSwitcher />
{
(showLayerSelection == "enabled") ?
<>
<BoroughSwitcher/>
<ParcelSwitcher/>
<FloodSwitcher/>
<ConservationAreaSwitcher/>
<HistoricMapSwitcher/>
<HistoricDataSwitcher/>
<VistaSwitcher />
<HousingSwitcher />
<CreativeSwitcher />
</>
: <></>
}
{/* TODO change remaining ones*/}
<SearchBox onLocate={handleLocate} />
</>
}
</div>
);
}
function ClickHandler({ onClick }: {onClick: (e) => void}) {
useMapEvent('click', (e) => onClick(e));
return null;
}
function MapBackgroundColor({ theme}: {theme: MapTheme}) {
const map = useMap();
useEffect(() => {
map.getContainer().style.backgroundColor = mapBackgroundColor[theme];
useEffect(() => {
if (map.current) return; // initialize map only once
map.current = new mapboxgl.Map({
container: mapContainer.current,
style: "mapbox://styles/mapbox/streets-v12",
center: [lng, lat],
zoom: zoom,
});
return null;
map.current.addControl(new mapboxgl.NavigationControl());
map.current.on("move", () => {
setLng(map.current.getCenter().lng.toFixed(4));
setLat(map.current.getCenter().lat.toFixed(4));
setZoom(map.current.getZoom().toFixed(2));
});
}, []);
return (
<div
ref={mapContainer}
className="map-container"
style={{
position: "absolute",
top: "0",
bottom: "0",
left: "0",
right: "0",
}}
>
{mode !== "basic" && (
<>
<Legend
mapColourScaleDefinitions={categoryMapDefinitions}
mapColourScale={mapColourScale}
onMapColourScale={onMapColourScale}
/>
<ThemeSwitcher
onSubmit={darkLightThemeSwitch}
currentTheme={darkLightTheme}
/>
<DataLayerSwitcher />
{showLayerSelection == "enabled" ? (
<>
<BoroughSwitcher />
<ParcelSwitcher />
<FloodSwitcher />
<ConservationAreaSwitcher />
<HistoricMapSwitcher />
<HistoricDataSwitcher />
<VistaSwitcher />
<HousingSwitcher />
<CreativeSwitcher />
</>
) : (
<></>
)}
{/* TODO change remaining ones*/}
<SearchBox onLocate={handleLocate} />
</>
)}
</div>
);
};
function ClickHandler({ onClick }: { onClick: (e) => void }) {
useMapEvent("click", (e) => onClick(e));
return null;
}
function MapBackgroundColor({ theme }: { theme: MapTheme }) {
const map = useMap();
useEffect(() => {
map.getContainer().style.backgroundColor = mapBackgroundColor[theme];
});
return null;
}
function MapViewport({
position,
zoom
position,
zoom,
}: {
position: [number, number];
zoom: number;
position: [number, number];
zoom: number;
}) {
const map = useMap();
const map = useMap();
useEffect(() => {
map.setView(position, zoom)
}, [position, zoom]);
useEffect(() => {
map.setView(position, zoom);
}, [position, zoom]);
return null;
return null;
}

View File

@ -93,6 +93,7 @@ function renderHTML(context, data, req, res) {
`<!doctype html>
<html lang="">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charset="utf-8" />
@ -127,6 +128,8 @@ function renderHTML(context, data, req, res) {
font-style: normal;
}
</style>
<link href="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.css" rel="stylesheet">
<script src="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.js"></script>
${
assets.client.css
? `<link rel="stylesheet" href="${assets.client.css}">`
@ -137,6 +140,7 @@ function renderHTML(context, data, req, res) {
? `<script src="${assets.client.js}" defer></script>`
: `<script src="${assets.client.js}" defer crossorigin></script>`
}
</head>
<body>
<div id="root">${markup}</div>

View File

@ -2,6 +2,8 @@
* Load server and listen
*
*/
import http from 'http';
import app from './server';

10785
app/yarn.lock Normal file

File diff suppressed because it is too large Load Diff

View File

@ -18,8 +18,9 @@ osmnx.config(log_console=True, use_cache=True)
# configure the image display
size = 256
# load buildings from about 1.5km² around UCL
point = (51.524498, -0.133874)
# (load buildings from about 1.5km² around UCL)
# Latitude and longitude of the ER building:
point = (45.4962261, -73.5801403)
dist = 612
tags = {"building": True}
gdf = osmnx.features_from_point(point, tags, dist=dist)

View File

@ -6,6 +6,9 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Colouring London</title>
<link rel="stylesheet" href="main.css?v=5ed692a6">
</head>
<body>

6
package-lock.json generated Normal file
View File

@ -0,0 +1,6 @@
{
"name": "colouring-montreal",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}