2024 map app

emfcamp · Mar 3, 2024 · 17977c4 · 17977c4
1 parent bcc7409
commit 17977c4
Show file tree

Hide file tree

Showing 297 changed files with 9,806 additions and 15,271 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 output/
 tegola-cache/
 web-assets/
+.vscode
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -5,6 +5,7 @@ services:
     build: ../buildmap
     volumes:
       - ../buildmap:/buildmap
+      - ../powerplan:/powerplan
   web:
     build:
       context: ./web

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,17 +4,17 @@ services:
     image: "ghcr.io/emfcamp/buildmap:latest"
     volumes: 
       - .:/config
-      - ../gis-2022:/gis-2022
+      - ../gis-2024:/gis-2024
       - ./output:/output
       - ./web-assets:/web
-    command: "/gis-2022/map.json /config/local.conf.json"
+    command: "/gis-2024/map.json /config/local.conf.json"
     networks:
       - default
     depends_on:
       - db
 
   db:
-    image: "postgis/postgis:13-3.2-alpine"
+    image: "postgis/postgis:15-3.4-alpine"
     networks:
       - default
     environment:
@@ -23,7 +23,7 @@ services:
     restart: unless-stopped
 
   tegola:
-    image: "gospatial/tegola:v0.14.0"
+    image: "gospatial/tegola:v0.19.0"
     ports:
       - 127.0.0.1:8888:8080
     volumes:

diff --git a/web/.eslintrc.json b/web/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": ["@typescript-eslint"],
+    "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+    "rules": {
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/no-explicit-any": "off"
+    },
+    "env": {
+        "browser": true,
+        "es2021": true
+    }
+}
diff --git a/web/.gitignore b/web/.gitignore
@@ -1,2 +1,7 @@
 node_modules
 dist
+
+public/pwa-*.png
+public/maskable-icon-*.png
+public/apple-touch-icon-*.png
+public/favicon.ico
diff --git a/web/.prettierrc.js b/web/.prettierrc.js
@@ -0,0 +1,10 @@
+/** @type {import("prettier").Options} */
+const config = {
+    trailingComma: "es5",
+    tabWidth: 4,
+    semi: false,
+    singleQuote: true,
+    printWidth: 110,
+};
+
+export default config;
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:17-alpine
+FROM node:18-slim
 
 WORKDIR /app
 

diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:17
+FROM node:18-slim
 
 # Source mounted into /app
 WORKDIR /app

diff --git a/web/export_style.ts b/web/export_style.ts
@@ -0,0 +1,17 @@
+import path from 'node:path'
+import fs from 'node:fs'
+import generateStyle from './src/style'
+
+const styles_path = path.join('./public', 'styles')
+
+fs.mkdirSync(styles_path, { recursive: true })
+
+fs.writeFileSync(
+    path.join(styles_path, 'style-basic.json'),
+    JSON.stringify(generateStyle('basic', 'https://map.emfcamp.org', '/'))
+)
+
+fs.writeFileSync(
+    path.join(styles_path, 'style-basic-dark.json'),
+    JSON.stringify(generateStyle('basic', 'https://map.emfcamp.org', '/', 'dark'))
+)
diff --git a/web/index.html b/web/index.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <script type="module" rel="preload" src="/src/index.ts"></script>
+        <meta
+            name="viewport"
+            content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no"
+        />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="description" content="Electromagnetic Field 2024 Map" />
+        <meta name="theme-color" content="#171123" />
+        <link rel="icon" href="/favicon.ico" sizes="48x48" />
+        <link rel="icon" href="/icon.svg" sizes="any" type="image/svg+xml" />
+        <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
+        <title>Electromagnetic Field 2024 Map</title>
+    </head>
+    <body>
+        <noscript>You need Javascript enabled to view this map.</noscript>
+        <div id="map">
+            <header>
+                <h1>Electromagnetic Field 2024</h1>
+                <div id="subtitle">Eastnor Castle Deer Park, Herefordshire, UK</div>
+            </header>
+        </div>
+        <div id="distance" class="distance-container"></div>
+    </body>
+</html>
diff --git a/web/map.code-workspace b/web/map.code-workspace
@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		},
+		{
+			"path": "../../buildmap"
+		}
+	],
+	"settings": {}
+}