adam/maps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some style stuff

Browse source
This commit is contained in:
Adam 2023-04-26 15:50:15 -04:00
parent fa8b5af1ea
commit a4b8c463fb
13 changed files with 172 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lightning/package.json
View file

@ -7,17 +7,17 @@
}, },
"type": "module", "type": "module",
"devDependencies": { "devDependencies": {
"@types/node": "^18.16.0", "@types/node": "^18.16.1",
"esbuild": "^0.14.54", "esbuild": "^0.14.54",
"postcss": "^8.4.23", "postcss": "^8.4.23",
"solid-start-node": "^0.2.26", "solid-start-node": "^0.2.26",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"vite": "^4.3.2" "vite": "^4.3.3"
}, },
"dependencies": { "dependencies": {
"@deck.gl/layers": "^8.9.9", "@deck.gl/layers": "^8.9.10",
"@deck.gl/mapbox": "^8.9.9", "@deck.gl/mapbox": "^8.9.10",
"@deck.gl/mesh-layers": "^8.9.9", "@deck.gl/mesh-layers": "^8.9.10",
"@solidjs/meta": "^0.28.4", "@solidjs/meta": "^0.28.4",
"@solidjs/router": "^0.8.2", "@solidjs/router": "^0.8.2",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -27,7 +27,7 @@
"solid-js": "^1.7.3", "solid-js": "^1.7.3",
"solid-map-gl": "^1.7.2", "solid-map-gl": "^1.7.2",
"solid-start": "^0.2.26", "solid-start": "^0.2.26",
"tailwindcss": "^3.3.1", "tailwindcss": "^3.3.2",
"undici": "^5.22.0" "undici": "^5.22.0"
}, },
"engines": { "engines": {

153
lightning/pnpm-lock.yaml generated
View file

@ -2,14 +2,14 @@ lockfileVersion: '6.0'
dependencies: dependencies:
'@deck.gl/layers': '@deck.gl/layers':
specifier: ^8.9.9 specifier: ^8.9.10
version: 8.9.9(@deck.gl/core@8.9.9)(@loaders.gl/core@3.3.3)(@luma.gl/core@8.5.19) version: 8.9.10(@deck.gl/core@8.9.10)(@loaders.gl/core@3.3.3)(@luma.gl/core@8.5.19)
'@deck.gl/mapbox': '@deck.gl/mapbox':
specifier: ^8.9.9 specifier: ^8.9.10
version: 8.9.9(@deck.gl/core@8.9.9) version: 8.9.10(@deck.gl/core@8.9.10)
'@deck.gl/mesh-layers': '@deck.gl/mesh-layers':
specifier: ^8.9.9 specifier: ^8.9.10
version: 8.9.9(@deck.gl/core@8.9.9)(@loaders.gl/images@3.3.3)(@luma.gl/core@8.5.19)(@luma.gl/engine@8.5.19)(@luma.gl/gltools@8.5.19)(@luma.gl/webgl@8.5.19) version: 8.9.10(@deck.gl/core@8.9.10)(@loaders.gl/images@3.3.3)(@luma.gl/core@8.5.19)(@luma.gl/engine@8.5.19)(@luma.gl/gltools@8.5.19)(@luma.gl/webgl@8.5.19)
'@solidjs/meta': '@solidjs/meta':
specifier: ^0.28.4 specifier: ^0.28.4
version: 0.28.4(solid-js@1.7.3) version: 0.28.4(solid-js@1.7.3)
@ -36,18 +36,18 @@ dependencies:
version: 1.7.2(empty-npm-package@1.0.0) version: 1.7.2(empty-npm-package@1.0.0)
solid-start: solid-start:
specifier: ^0.2.26 specifier: ^0.2.26
version: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.2) version: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.3)
tailwindcss: tailwindcss:
specifier: ^3.3.1 specifier: ^3.3.2
version: 3.3.1(postcss@8.4.23) version: 3.3.2
undici: undici:
specifier: ^5.22.0 specifier: ^5.22.0
version: 5.22.0 version: 5.22.0
devDependencies: devDependencies:
'@types/node': '@types/node':
specifier: ^18.16.0 specifier: ^18.16.1
version: 18.16.0 version: 18.16.1
esbuild: esbuild:
specifier: ^0.14.54 specifier: ^0.14.54
version: 0.14.54 version: 0.14.54
@ -56,16 +56,21 @@ devDependencies:
version: 8.4.23 version: 8.4.23
solid-start-node: solid-start-node:
specifier: ^0.2.26 specifier: ^0.2.26
version: 0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.2) version: 0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.3)
typescript: typescript:
specifier: ^4.9.5 specifier: ^4.9.5
version: 4.9.5 version: 4.9.5
vite: vite:
specifier: ^4.3.2 specifier: ^4.3.3
version: 4.3.2(@types/node@18.16.0) version: 4.3.3(@types/node@18.16.1)
packages: packages:
/@alloc/quick-lru@5.2.0:
resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
engines: {node: '>=10'}
dev: false
/@ampproject/remapping@2.2.1: /@ampproject/remapping@2.2.1:
resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
engines: {node: '>=6.0.0'} engines: {node: '>=6.0.0'}
@ -1173,8 +1178,8 @@ packages:
'@babel/helper-validator-identifier': 7.19.1 '@babel/helper-validator-identifier': 7.19.1
to-fast-properties: 2.0.0 to-fast-properties: 2.0.0
/@deck.gl/core@8.9.9: /@deck.gl/core@8.9.10:
resolution: {integrity: sha512-hUe7cEA98FjVXYa2UWIOo+Y74UJXWY8DY7ySyaWJc2aRt8dI/ijoTItQU9rm57KOtjnXOnJNutYS/1fke8hIOw==} resolution: {integrity: sha512-1EzKjpxhbmn6+fHsCkL2Cd60FBNp/DKksijNNPkdzrkzkbXo52pCtQPT3W1cPMdGwk0JiAwGZmQTVpdPvcuarw==}
dependencies: dependencies:
'@loaders.gl/core': 3.3.3 '@loaders.gl/core': 3.3.3
'@loaders.gl/images': 3.3.3 '@loaders.gl/images': 3.3.3
@ -1192,14 +1197,14 @@ packages:
mjolnir.js: 2.7.1 mjolnir.js: 2.7.1
dev: false dev: false
/@deck.gl/layers@8.9.9(@deck.gl/core@8.9.9)(@loaders.gl/core@3.3.3)(@luma.gl/core@8.5.19): /@deck.gl/layers@8.9.10(@deck.gl/core@8.9.10)(@loaders.gl/core@3.3.3)(@luma.gl/core@8.5.19):
resolution: {integrity: sha512-9hMUTgG7MneJzQCQxDU/+nnh61Tc5wm4qrjQiaPHeg9iYRgyuedc4g7oagDXuMfiYHj5wMH+MMSUlP/k+10rgg==} resolution: {integrity: sha512-fQn0AuPz4E3KulI1Sg2l5KrVbbi1oWBcSP97IKccI/YVTtlrBKj5Rdzfu4OmiNN3cF2fBB2KZkujwluVFxzDUA==}
peerDependencies: peerDependencies:
'@deck.gl/core': ^8.0.0 '@deck.gl/core': ^8.0.0
'@loaders.gl/core': ^3.0.0 '@loaders.gl/core': ^3.0.0
'@luma.gl/core': ^8.0.0 '@luma.gl/core': ^8.0.0
dependencies: dependencies:
'@deck.gl/core': 8.9.9 '@deck.gl/core': 8.9.10
'@loaders.gl/core': 3.3.3 '@loaders.gl/core': 3.3.3
'@loaders.gl/images': 3.3.3 '@loaders.gl/images': 3.3.3
'@loaders.gl/schema': 3.3.3 '@loaders.gl/schema': 3.3.3
@ -1212,22 +1217,22 @@ packages:
earcut: 2.2.4 earcut: 2.2.4
dev: false dev: false
/@deck.gl/mapbox@8.9.9(@deck.gl/core@8.9.9): /@deck.gl/mapbox@8.9.10(@deck.gl/core@8.9.10):
resolution: {integrity: sha512-HDZoR7iIcM4kXC4GfK/+VcEF2/eq+Zr7s2FvSSn+LTOh7adK9EBJTw1Jiutia3nsivO8y9629DMrhNBNeaeAVA==} resolution: {integrity: sha512-k683gU30N0Gyh6YTqf+eXdJIRzUa0uACQvK5Xas/NsRRlMqwQruLfJWFGItYICyjASW182U43+jGMPUZB78ZTg==}
peerDependencies: peerDependencies:
'@deck.gl/core': ^8.0.0 '@deck.gl/core': ^8.0.0
dependencies: dependencies:
'@deck.gl/core': 8.9.9 '@deck.gl/core': 8.9.10
'@types/mapbox-gl': 2.7.10 '@types/mapbox-gl': 2.7.10
dev: false dev: false
/@deck.gl/mesh-layers@8.9.9(@deck.gl/core@8.9.9)(@loaders.gl/images@3.3.3)(@luma.gl/core@8.5.19)(@luma.gl/engine@8.5.19)(@luma.gl/gltools@8.5.19)(@luma.gl/webgl@8.5.19): /@deck.gl/mesh-layers@8.9.10(@deck.gl/core@8.9.10)(@loaders.gl/images@3.3.3)(@luma.gl/core@8.5.19)(@luma.gl/engine@8.5.19)(@luma.gl/gltools@8.5.19)(@luma.gl/webgl@8.5.19):
resolution: {integrity: sha512-MmbdKfprqL3IQd9mPjTkgteUeyCfKKYnJtOQukJjC3vw4fH7ECfESgnBhsEFED7W+ZJVniASiz2fUZ05ZJqz4w==} resolution: {integrity: sha512-LxUdENKg0lh6GXQCJmznjf70SguldtjmUChkgbkTn/sKMUvV5siKmdHVNjGAHLlE/vSUeeYwaMPsJ2WwFtgxUw==}
peerDependencies: peerDependencies:
'@deck.gl/core': ^8.0.0 '@deck.gl/core': ^8.0.0
'@luma.gl/core': ^8.0.0 '@luma.gl/core': ^8.0.0
dependencies: dependencies:
'@deck.gl/core': 8.9.9 '@deck.gl/core': 8.9.10
'@loaders.gl/gltf': 3.3.3 '@loaders.gl/gltf': 3.3.3
'@luma.gl/constants': 8.5.19 '@luma.gl/constants': 8.5.19
'@luma.gl/core': 8.5.19 '@luma.gl/core': 8.5.19
@ -1813,7 +1818,7 @@ packages:
'@babel/types': 7.21.4 '@babel/types': 7.21.4
'@types/babel__generator': 7.6.4 '@types/babel__generator': 7.6.4
'@types/babel__template': 7.4.1 '@types/babel__template': 7.4.1
'@types/babel__traverse': 7.18.3 '@types/babel__traverse': 7.18.4
/@types/babel__generator@7.6.4: /@types/babel__generator@7.6.4:
resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
@ -1826,8 +1831,8 @@ packages:
'@babel/parser': 7.21.4 '@babel/parser': 7.21.4
'@babel/types': 7.21.4 '@babel/types': 7.21.4
/@types/babel__traverse@7.18.3: /@types/babel__traverse@7.18.4:
resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==} resolution: {integrity: sha512-TLG7CsGZZmX9aDF78UuJxnNTfQyRUFU0OYIVyIblr0/wd/HvsIo8wmuB90CszeD2MtLLAE9Tt4cWvk+KVkyGIw==}
dependencies: dependencies:
'@babel/types': 7.21.4 '@babel/types': 7.21.4
@ -1863,8 +1868,8 @@ packages:
'@types/pbf': 3.0.2 '@types/pbf': 3.0.2
dev: false dev: false
/@types/node@18.16.0: /@types/node@18.16.1:
resolution: {integrity: sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==} resolution: {integrity: sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==}
/@types/offscreencanvas@2019.7.0: /@types/offscreencanvas@2019.7.0:
resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==} resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
@ -2033,7 +2038,7 @@ packages:
hasBin: true hasBin: true
dependencies: dependencies:
caniuse-lite: 1.0.30001481 caniuse-lite: 1.0.30001481
electron-to-chromium: 1.4.371 electron-to-chromium: 1.4.372
node-releases: 2.0.10 node-releases: 2.0.10
update-browserslist-db: 1.0.11(browserslist@4.21.5) update-browserslist-db: 1.0.11(browserslist@4.21.5)
@ -2232,8 +2237,8 @@ packages:
/ee-first@1.1.1: /ee-first@1.1.1:
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
/electron-to-chromium@1.4.371: /electron-to-chromium@1.4.372:
resolution: {integrity: sha512-jlBzY4tFcJaiUjzhRTCWAqRvTO/fWzjA3Bls0mykzGZ7zvcMP7h05W6UcgzfT9Ca1SW2xyKDOFRyI0pQeRNZGw==} resolution: {integrity: sha512-MrlFq/j+TYHOjeWsWGYfzevc25HNeJdsF6qaLFrqBTRWZQtWkb1myq/Q2veLWezVaa5OcSZ99CFwTT4aF4Mung==}
/emoji-regex@8.0.0: /emoji-regex@8.0.0:
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@ -3058,9 +3063,9 @@ packages:
'@polka/url': 1.0.0-next.21 '@polka/url': 1.0.0-next.21
trouter: 3.2.1 trouter: 3.2.1
/postcss-import@14.1.0(postcss@8.4.23): /postcss-import@15.1.0(postcss@8.4.23):
resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
engines: {node: '>=10.0.0'} engines: {node: '>=14.0.0'}
peerDependencies: peerDependencies:
postcss: ^8.0.0 postcss: ^8.0.0
dependencies: dependencies:
@ -3080,9 +3085,9 @@ packages:
postcss: 8.4.23 postcss: 8.4.23
dev: false dev: false
/postcss-load-config@3.1.4(postcss@8.4.23): /postcss-load-config@4.0.1(postcss@8.4.23):
resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
engines: {node: '>= 10'} engines: {node: '>= 14'}
peerDependencies: peerDependencies:
postcss: '>=8.0.9' postcss: '>=8.0.9'
ts-node: '>=9.0.0' ts-node: '>=9.0.0'
@ -3094,11 +3099,11 @@ packages:
dependencies: dependencies:
lilconfig: 2.1.0 lilconfig: 2.1.0
postcss: 8.4.23 postcss: 8.4.23
yaml: 1.10.2 yaml: 2.2.2
dev: false dev: false
/postcss-nested@6.0.0(postcss@8.4.23): /postcss-nested@6.0.1(postcss@8.4.23):
resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
engines: {node: '>=12.0'} engines: {node: '>=12.0'}
peerDependencies: peerDependencies:
postcss: ^8.2.14 postcss: ^8.2.14
@ -3138,11 +3143,6 @@ packages:
/queue-microtask@1.2.3: /queue-microtask@1.2.3:
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
/quick-lru@5.1.1:
resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
engines: {node: '>=10'}
dev: false
/quickselect@2.0.0: /quickselect@2.0.0:
resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==} resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==}
dev: false dev: false
@ -3327,7 +3327,7 @@ packages:
'@babel/types': 7.21.4 '@babel/types': 7.21.4
solid-js: 1.7.3 solid-js: 1.7.3
/solid-start-node@0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.2): /solid-start-node@0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.3):
resolution: {integrity: sha512-8vciTGoQV+lIlCUSVHJPazlaoKDRfBowDkPeBr/EZdmtbcMOKoJYf/APPQWFspylF+nhzunMf0+zJP90VtMEYg==} resolution: {integrity: sha512-8vciTGoQV+lIlCUSVHJPazlaoKDRfBowDkPeBr/EZdmtbcMOKoJYf/APPQWFspylF+nhzunMf0+zJP90VtMEYg==}
peerDependencies: peerDependencies:
solid-start: '*' solid-start: '*'
@ -3341,14 +3341,14 @@ packages:
polka: 1.0.0-next.22 polka: 1.0.0-next.22
rollup: 3.21.0 rollup: 3.21.0
sirv: 2.0.3 sirv: 2.0.3
solid-start: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.2) solid-start: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.3)
terser: 5.17.1 terser: 5.17.1
undici: 5.22.0 undici: 5.22.0
vite: 4.3.2(@types/node@18.16.0) vite: 4.3.3(@types/node@18.16.1)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
/solid-start@0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.2): /solid-start@0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.3)(solid-start-node@0.2.26)(vite@4.3.3):
resolution: {integrity: sha512-kne2HZlnSMzsirdnvNs1CsDqBl0L0uvKKt1t4de1CH7JIngyqoMcER97jTE0Ejr84KknANaKAdvJAzZcL7Ueng==} resolution: {integrity: sha512-kne2HZlnSMzsirdnvNs1CsDqBl0L0uvKKt1t4de1CH7JIngyqoMcER97jTE0Ejr84KknANaKAdvJAzZcL7Ueng==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@ -3411,12 +3411,12 @@ packages:
set-cookie-parser: 2.6.0 set-cookie-parser: 2.6.0
sirv: 2.0.3 sirv: 2.0.3
solid-js: 1.7.3 solid-js: 1.7.3
solid-start-node: 0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.2) solid-start-node: 0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.3)
terser: 5.17.1 terser: 5.17.1
undici: 5.22.0 undici: 5.22.0
vite: 4.3.2(@types/node@18.16.0) vite: 4.3.3(@types/node@18.16.1)
vite-plugin-inspect: 0.7.24(rollup@3.21.0)(vite@4.3.2) vite-plugin-inspect: 0.7.24(rollup@3.21.0)(vite@4.3.3)
vite-plugin-solid: 2.7.0(solid-js@1.7.3)(vite@4.3.2) vite-plugin-solid: 2.7.0(solid-js@1.7.3)(vite@4.3.3)
wait-on: 6.0.1(debug@4.3.4) wait-on: 6.0.1(debug@4.3.4)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -3504,16 +3504,14 @@ packages:
resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
/tailwindcss@3.3.1(postcss@8.4.23): /tailwindcss@3.3.2:
resolution: {integrity: sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g==} resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==}
engines: {node: '>=12.13.0'} engines: {node: '>=14.0.0'}
hasBin: true hasBin: true
peerDependencies:
postcss: ^8.0.9
dependencies: dependencies:
'@alloc/quick-lru': 5.2.0
arg: 5.0.2 arg: 5.0.2
chokidar: 3.5.3 chokidar: 3.5.3
color-name: 1.1.4
didyoumean: 1.2.2 didyoumean: 1.2.2
dlv: 1.1.3 dlv: 1.1.3
fast-glob: 3.2.12 fast-glob: 3.2.12
@ -3526,13 +3524,12 @@ packages:
object-hash: 3.0.0 object-hash: 3.0.0
picocolors: 1.0.0 picocolors: 1.0.0
postcss: 8.4.23 postcss: 8.4.23
postcss-import: 14.1.0(postcss@8.4.23) postcss-import: 15.1.0(postcss@8.4.23)
postcss-js: 4.0.1(postcss@8.4.23) postcss-js: 4.0.1(postcss@8.4.23)
postcss-load-config: 3.1.4(postcss@8.4.23) postcss-load-config: 4.0.1(postcss@8.4.23)
postcss-nested: 6.0.0(postcss@8.4.23) postcss-nested: 6.0.1(postcss@8.4.23)
postcss-selector-parser: 6.0.11 postcss-selector-parser: 6.0.11
postcss-value-parser: 4.2.0 postcss-value-parser: 4.2.0
quick-lru: 5.1.1
resolve: 1.22.2 resolve: 1.22.2
sucrase: 3.32.0 sucrase: 3.32.0
transitivePeerDependencies: transitivePeerDependencies:
@ -3665,7 +3662,7 @@ packages:
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'} engines: {node: '>= 0.8'}
/vite-plugin-inspect@0.7.24(rollup@3.21.0)(vite@4.3.2): /vite-plugin-inspect@0.7.24(rollup@3.21.0)(vite@4.3.3):
resolution: {integrity: sha512-XyrhTxYF+5X8CH0PFmYJhs8WGJMOa2UxwUftTaT0FiMm24VfUp+UsAh7xDZI3doPOiB5GxKEizDGxdU98Ay+Vg==} resolution: {integrity: sha512-XyrhTxYF+5X8CH0PFmYJhs8WGJMOa2UxwUftTaT0FiMm24VfUp+UsAh7xDZI3doPOiB5GxKEizDGxdU98Ay+Vg==}
engines: {node: '>=14'} engines: {node: '>=14'}
peerDependencies: peerDependencies:
@ -3677,12 +3674,12 @@ packages:
fs-extra: 11.1.1 fs-extra: 11.1.1
picocolors: 1.0.0 picocolors: 1.0.0
sirv: 2.0.3 sirv: 2.0.3
vite: 4.3.2(@types/node@18.16.0) vite: 4.3.3(@types/node@18.16.1)
transitivePeerDependencies: transitivePeerDependencies:
- rollup - rollup
- supports-color - supports-color
/vite-plugin-solid@2.7.0(solid-js@1.7.3)(vite@4.3.2): /vite-plugin-solid@2.7.0(solid-js@1.7.3)(vite@4.3.3):
resolution: {integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==} resolution: {integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==}
peerDependencies: peerDependencies:
solid-js: ^1.7.2 solid-js: ^1.7.2
@ -3695,13 +3692,13 @@ packages:
merge-anything: 5.1.5 merge-anything: 5.1.5
solid-js: 1.7.3 solid-js: 1.7.3
solid-refresh: 0.5.2(solid-js@1.7.3) solid-refresh: 0.5.2(solid-js@1.7.3)
vite: 4.3.2(@types/node@18.16.0) vite: 4.3.3(@types/node@18.16.1)
vitefu: 0.2.4(vite@4.3.2) vitefu: 0.2.4(vite@4.3.3)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
/vite@4.3.2(@types/node@18.16.0): /vite@4.3.3(@types/node@18.16.1):
resolution: {integrity: sha512-9R53Mf+TBoXCYejcL+qFbZde+eZveQLDYd9XgULILLC1a5ZwPaqgmdVpL8/uvw2BM/1TzetWjglwm+3RO+xTyw==} resolution: {integrity: sha512-MwFlLBO4udZXd+VBcezo3u8mC77YQk+ik+fbc0GZWGgzfbPP+8Kf0fldhARqvSYmtIWoAJ5BXPClUbMTlqFxrA==}
engines: {node: ^14.18.0 || >=16.0.0} engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@ -3725,14 +3722,14 @@ packages:
terser: terser:
optional: true optional: true
dependencies: dependencies:
'@types/node': 18.16.0 '@types/node': 18.16.1
esbuild: 0.17.18 esbuild: 0.17.18
postcss: 8.4.23 postcss: 8.4.23
rollup: 3.21.0 rollup: 3.21.0
optionalDependencies: optionalDependencies:
fsevents: 2.3.2 fsevents: 2.3.2
/vitefu@0.2.4(vite@4.3.2): /vitefu@0.2.4(vite@4.3.3):
resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
peerDependencies: peerDependencies:
vite: ^3.0.0 || ^4.0.0 vite: ^3.0.0 || ^4.0.0
@ -3740,7 +3737,7 @@ packages:
vite: vite:
optional: true optional: true
dependencies: dependencies:
vite: 4.3.2(@types/node@18.16.0) vite: 4.3.3(@types/node@18.16.1)
/vt-pbf@3.1.3: /vt-pbf@3.1.3:
resolution: {integrity: sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==} resolution: {integrity: sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==}
@ -3788,9 +3785,9 @@ packages:
/yallist@3.1.1: /yallist@3.1.1:
resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
/yaml@1.10.2: /yaml@2.2.2:
resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} resolution: {integrity: sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==}
engines: {node: '>= 6'} engines: {node: '>= 14'}
dev: false dev: false
/yargs-parser@21.1.1: /yargs-parser@21.1.1:

16
lightning/src/components/AccordionTest.tsx
View file

@ -4,6 +4,8 @@ import { ErrorBoundary, For, Show, } from 'solid-js';
import type { JSX } from 'solid-js'; import type { JSX } from 'solid-js';
import { useStationsContext } from './StationsContext'; import { useStationsContext } from './StationsContext';
import { useMapContext } from './MapContext';
import { Viewport } from 'solid-map-gl';
function ChevronUpIcon(props: JSX.IntrinsicElements['svg']) { function ChevronUpIcon(props: JSX.IntrinsicElements['svg']) {
@ -25,6 +27,19 @@ function ChevronUpIcon(props: JSX.IntrinsicElements['svg']) {
export default function AccordionTest() { export default function AccordionTest() {
const [stations, { setStationsRequest }] = useStationsContext(); const [stations, { setStationsRequest }] = useStationsContext();
const [viewport, { setViewport }] = useMapContext();
function clickHandler(station) {
setViewport({
...viewport(),
center: {
lng: station.Loc.Coordinates[1],
lat: station.Loc.Coordinates[0]
},
zoom: 18,
pitch: 30,
} as Viewport)
};
return ( return (
<Show when={stations()} fallback="Loading Stations..."> <Show when={stations()} fallback="Loading Stations...">
@ -34,6 +49,7 @@ export default function AccordionTest() {
{(station) => (<AccordionItem value={station}> {(station) => (<AccordionItem value={station}>
<AccordionHeader> <AccordionHeader>
<AccordionButton <AccordionButton
onClick={() => clickHandler(station)}
as="div" as="div"
class=" class="
flex flex

3
lightning/src/components/StationsContext.tsx
View file

@ -1,6 +1,5 @@
import { createSignal, createContext, createResource, useContext } from "solid-js"; import { createSignal, createContext, createResource, useContext } from "solid-js";
type ChargingStation = { type ChargingStation = {
Name: string Name: string
PhoneNumer: string PhoneNumer: string
@ -38,8 +37,8 @@ type StationResponse = {
Loc: Location Loc: Location
}; };
export const StationsContext = createContext();
export const StationsContext = createContext();
export function StationsProvider(props: any) { export function StationsProvider(props: any) {
const [stationsRequest, setStationsRequest] = createSignal<StationRequest>() const [stationsRequest, setStationsRequest] = createSignal<StationRequest>()

6
lightning/src/components/Toolbox.tsx
View file

@ -8,6 +8,8 @@ export function Toolbox() {
return ( return (
<ul> <ul>
<h3>Toolbox</h3> <h3>Toolbox</h3>
<hr />
<br />
<li> <li>
<button onClick={() => setViewport<Viewport>({ <button onClick={() => setViewport<Viewport>({
@ -16,7 +18,7 @@ export function Toolbox() {
zoom: 15.5, zoom: 15.5,
bearing: 160, bearing: 160,
pitch: 60, pitch: 60,
})} > Boston </button> })} > Fly To Boston </button>
</li> </li>
<li> <li>
@ -26,7 +28,7 @@ export function Toolbox() {
zoom: 15.5, zoom: 15.5,
bearing: 10, bearing: 10,
pitch: 60, pitch: 60,
})} > NYC </button> })} > Fly To NYC </button>
</li> </li>
</ul> </ul>
) as JSX.Element; ) as JSX.Element;

3
lightning/src/components/map/BadassMap.tsx
View file

@ -1,7 +1,7 @@
import MapGL, { Viewport } from 'solid-map-gl'; import MapGL, { Viewport } from 'solid-map-gl';
import * as maplibre from 'maplibre-gl'; import * as maplibre from 'maplibre-gl';
import MapControls from './MapControls'; import MapControls from './MapControls';
import { createSignal } from 'solid-js'; import MapMarkerLayer from './MapMarkerLayer.tsx';
import type { MapOptions } from 'maplibre-gl'; import type { MapOptions } from 'maplibre-gl';
import type { JSX } from 'solid-js'; import type { JSX } from 'solid-js';
@ -37,6 +37,7 @@ export default function BadassMap(props: any) {
<MapScatLayer /> <MapScatLayer />
<MapArcLayer /> <MapArcLayer />
<MapMarkerLayer />
<MapControls /> <MapControls />
</MapGL > </MapGL >

13
lightning/src/components/map/MapMarkerLayer.tsx Normal file
View file

@ -0,0 +1,13 @@
import { Marker, Popup } from 'solid-map-gl';
import type { NavigationOptions, GeolocateOptions, AttributionOptions, ScaleOptions, } from 'maplibre-gl';
import type { JSX } from 'solid-js';
export default function MapControls() {
return (
<>
</>
) as JSX.Element;
};

11
lightning/src/components/map/MapScatLayer.tsx
View file

@ -43,10 +43,17 @@ export default function MapScatLayer(props: any) {
id: 'deckgl-scatterplot', id: 'deckgl-scatterplot',
type: ScatterplotLayer, type: ScatterplotLayer,
data: scats(), data: scats(),
pickable: true,
stroked: false,
lineWidthMaxPixels: 0,
radiusMinPixels: 1,
radiusMaxPixels: 100,
radiusUnits: 'meters',
getRadius: 1,
radiusScale: 10,
getPosition: (d: any) => d.coordinates, getPosition: (d: any) => d.coordinates,
getRadius: 90, antialiasing: false,
getFillColor: [255, 140, 0], getFillColor: [255, 140, 0],
getLineColor: [0, 0, 0,],
} as any)} /> } as any)} />
</Show> </Show>
) as JSX.Element; ) as JSX.Element;

31
lightning/src/root.css
View file

@ -3,7 +3,7 @@
@tailwind utilities; @tailwind utilities;
body { body {
color: white; color: #DEE;
padding-top: 5px; padding-top: 5px;
padding-left: 10px; padding-left: 10px;
max-width: 400px; max-width: 400px;
@ -15,36 +15,41 @@ body {
a { a {
margin-right: 1rem; margin-right: 1rem;
text-decoration: underline;
}
button {
text-decoration: underline;
} }
main { main {
max-height: 90vh; max-height: 75vh;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
background-color: rgba(0,0,0,0.9); background-color: rgba(0,0,0,0.75);
border-radius: 20px; border-radius: 5px;
padding: 10px; margin: 1rem;
margin-top: 1rem; padding: 0.5rem;
box-shadow: 5px 5px 15px 10px black; box-shadow: 1px 1px 25px 1px rgba(0,0,0,1);
} }
/* width */ /* width */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 10px; width: 8px;
} }
/* Track */ /* Track */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
box-shadow: inset 0 0 5px #333; box-shadow: inset 0 0 5px #333;
border-radius: 10px; border-radius: 10px;
} }
/* Handle */ /* Handle */
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: #666; background: #666;
border-radius: 10px; border-radius: 10px;
} }
/* Handle on hover */ /* Handle on hover */
::-webkit-scrollbar-thumb:hover { ::-webkit-scrollbar-thumb:hover {
background: #999; background: #999;
} }

11
lightning/src/root.tsx
View file

@ -22,17 +22,18 @@ export default function Root() {
<Body> <Body>
<ErrorBoundary> <ErrorBoundary>
<StationsProvider> <MapContextProvider>
<MapContextProvider> <StationsProvider>
<BadassMap />
<A href="/">Map</A> <A href="/">Map</A>
<A href="/stations">Stations</A> <A href="/stations">Stations</A>
<A href="/about">About</A> <A href="/about">About</A>
<A href="/tools">Tools</A>
<Routes> <Routes>
<FileRoutes /> <FileRoutes />
</Routes> </Routes>
<BadassMap /> </StationsProvider>
</MapContextProvider> </MapContextProvider>
</StationsProvider>
</ErrorBoundary> </ErrorBoundary>
<Scripts /> <Scripts />
</Body> </Body>

5
lightning/src/routes/about.tsx
View file

@ -9,6 +9,8 @@ export default function Home() {
<Title>About Lightning</Title> <Title>About Lightning</Title>
<h1>About</h1> <h1>About</h1>
<hr />
<br />
<ul> <ul>
@ -48,6 +50,9 @@ export default function Home() {
<img src='5Q14.gif' /> <img src='5Q14.gif' />
<p> <a href="https://github.com/kevin-fwu/EVChargerFinder" target="_blank">
github.com/kevin-fwu/EVChargerFinder
</a> </p>
<p> <a href="https://github.com/adoyle0/maps" target="_blank"> <p> <a href="https://github.com/adoyle0/maps" target="_blank">
github.com/adoyle0/maps github.com/adoyle0/maps
</a> </p> </a> </p>

2
lightning/src/routes/index.tsx
View file

@ -1,14 +1,12 @@
import { Title, } from 'solid-start'; import { Title, } from 'solid-start';
import type { JSX } from 'solid-js'; import type { JSX } from 'solid-js';
import { Toolbox } from '~/components/Toolbox';
export default function Home() { export default function Home() {
return ( return (
<> <>
<Title>Ride the Lightning</Title> <Title>Ride the Lightning</Title>
<Toolbox />
</> </>
) as JSX.Element; ) as JSX.Element;
}; };

17
lightning/src/routes/tools.tsx Normal file
View file

@ -0,0 +1,17 @@
import { Title, } from 'solid-start';
import type { JSX } from 'solid-js';
import { Toolbox } from '~/components/Toolbox';
export default function Stations() {
return (
<main>
<Title>Ride the Lightning</Title>
<Toolbox />
</main>
) as JSX.Element;
};