lightning/Dockerfile

@@ -1,6 +0,0 @@
-# syntax=docker/dockerfile:experimental
-
-FROM node:alpine
-COPY . .
-CMD npm run start
-EXPOSE 3000

lightning/build

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pnpm install &&
-pnpm run build &&
-docker build -t lightning .

lightning/package.json

@@ -7,28 +7,28 @@
     },
     "type": "module",
     "devDependencies": {
-        "@types/node": "^18.19.3",
+        "@types/node": "^18.16.12",
         "esbuild": "^0.14.54",
-        "postcss": "^8.4.32",
-        "solid-start-node": "^0.2.32",
+        "postcss": "^8.4.23",
+        "solid-start-node": "^0.2.26",
         "typescript": "^4.9.5",
-        "vite": "^4.5.1"
+        "vite": "^4.3.7"
     },
     "dependencies": {
-        "@deck.gl/layers": "^8.9.33",
-        "@deck.gl/mapbox": "^8.9.33",
-        "@deck.gl/mesh-layers": "^8.9.33",
-        "@solidjs/meta": "^0.28.7",
-        "@solidjs/router": "^0.8.4",
-        "autoprefixer": "^10.4.16",
+        "@deck.gl/layers": "^8.9.15",
+        "@deck.gl/mapbox": "^8.9.15",
+        "@deck.gl/mesh-layers": "^8.9.15",
+        "@solidjs/meta": "^0.28.5",
+        "@solidjs/router": "^0.8.2",
+        "autoprefixer": "^10.4.14",
         "mapbox-gl": "npm:empty-npm-package@^1.0.0",
         "maplibre-gl": "^2.4.0",
         "solid-headless": "^0.13.1",
-        "solid-js": "^1.8.7",
-        "solid-map-gl": "^1.10.2",
-        "solid-start": "^0.2.32",
-        "tailwindcss": "^3.3.6",
-        "undici": "^5.28.2"
+        "solid-js": "^1.7.5",
+        "solid-map-gl": "^1.7.2",
+        "solid-start": "^0.2.26",
+        "tailwindcss": "^3.3.2",
+        "undici": "^5.22.1"
     },
     "engines": {
         "node": ">=16.8"

lightning/src/components/map/BadassMap.tsx

@@ -14,6 +14,7 @@ const MapIconLayer = unstable_clientOnly(() => import('~/components/map/MapIconL
 import 'maplibre-gl/dist/maplibre-gl.css';
 import StyleJson from '~/style/style.json';
 
+export const [mapIcons, setMapIcons] = createSignal([]);
 
 export const [mapRotate, setMapRotate] = createSignal(false);
 createEffect(() => console.log('Rotate:', mapRotate()));

lightning/src/components/map/MapIconLayer.tsx

@@ -15,11 +15,6 @@ export default function MapIconLayer(props: any) {
 
     createEffect(() => console.log("Watch me update but not trigger a render!", stations()));
 
-    function deezCompare() {
-        console.log('comparing');
-        return false
-    }
-    
     return (
         <Show when={stations()}>
             <Layer customLayer={
@@ -35,8 +30,6 @@ export default function MapIconLayer(props: any) {
                     getPosition: d => [d.Loc.Coordinates[1], d.Loc.Coordinates[0]],
                     getSize: d => 3,
                     getColor: d => [d.Dist * 100, 140 - (d.Dist * 50), 0],
-                    dataComparator: deezCompare,
-                    _dataDiff: () => console.log('datadiff'),
                     parameters: {
                         depthTest: false,
                     },

marteen/setup

@@ -29,8 +29,8 @@ fi
 cd ../dist
 if [ ! -f martin ]; then
     echo Downloading and extracting martin...
-    wget -c https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-unknown-linux-gnu.tar.gz &&
-        tar -xzvf martin-x86_64-unknown-linux-gnu.tar.gz
+    wget -c https://github.com/maplibre/martin/releases/latest/download/martin-Linux-x86_64.tar.gz &&
+        tar -xzvf martin-Linux-x86_64.tar.gz
 else
     echo martin already exists
 fi

readme.md

@@ -1,11 +0,0 @@
-# Maps
-
-[lightning.doordesk.net](https://lightning.doordesk.net)
-
-Some data vis about EV charging stations using 
-[EVChargerFinder](https://github.com/kevin-fwu/EVChargerFinder) 
-made by my friend [Kevin](https://github.com/kevin-fwu).
-
-
-It mainly leans on the [MapLibre Project](https://maplibre.org) 
-and [DeckGL](https://deck.gl)