Merge pull request #3 from NINAnor/hierarchical-layers

Hierarchical layers
NINAnor · Nov 28, 2023 · 30fe5a9 · 30fe5a9
2 parents f3f705d + 2a26fd6
commit 30fe5a9
Show file tree

Hide file tree

Showing 24 changed files with 5,251 additions and 209 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1,24 @@
+module.exports = {
+    root: true,
+    env: { browser: true, es2020: true },
+    extends: [
+      'eslint:recommended',
+      'plugin:react/recommended',
+      'plugin:react/jsx-runtime',
+      'plugin:react-hooks/recommended',
+    ],
+    ignorePatterns: ['dist', '.eslintrc.cjs'],
+    parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+    settings: { react: { version: '18.2' } },
+    plugins: ['react-refresh'],
+    rules: {
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+      'react/prop-types': [
+        'warn',
+      ],
+    },
+  }
+
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,27 @@
 datasets/*/
 !datasets/example-*
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,18 @@
+FROM node:18 as frontend
+WORKDIR /app
+COPY package.json package-lock.json .
+RUN npm i
+COPY src src/
+COPY public public/
+COPY vite.config.js index.html .
+
+CMD ["npm", "run", "dev"]
+
+FROM frontend as build
+RUN npm run build
+
 FROM nginx
 
 COPY nginx/default.conf.template /etc/nginx/templates/
-COPY viewer.html /var/www/
-COPY assets/map.js assets/style.css /var/www/assets/
-
+COPY --from=build /app/dist /var/www/
+RUN mv /var/www/index.html /var/www/viewer.html
diff --git a/assets/map.js b/assets/map.js
diff --git a/assets/style.css b/assets/style.css
diff --git a/datasets/example-nina-offices/metadata.json b/datasets/example-nina-offices/metadata.json
@@ -1,6 +1,32 @@
 {
-  "style": "style.json",
-  "source": "nina.geojson",
+  "style": "/datasets/example-nina-offices/style.json",
   "subtitle": "NINA offices across Norway",
-  "description": "<p>NINA offices across Norway. This is a test dataset.</p>"
+  "description": "<p>NINA offices across Norway. This is a test dataset.</p>",
+  "layers": [
+    {
+      "type": "group",
+      "id": "id1",
+      "name": "Test",
+      "download": "/datasets/example-nina-offices/data.geojson",
+      "children": [
+        {
+          "id": "id2",
+          "name": "Foo",
+          "children": [
+            {
+              "type": "layer",
+              "id": "osm",
+              "name": "osm"
+            }
+          ]
+        },
+        {
+          "type": "layer",
+          "name": "data",
+          "id": "data-layer",
+          "download": "/datasets/example-nina-offices/data.geojson"
+        }
+      ]
+    }
+  ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,13 @@ services:
     image: nginx
     volumes:
       - ./datasets:/var/www/datasets:ro
-      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template:ro
-      - ./viewer.html:/var/www/viewer.html:ro
-      - ./assets:/var/www/assets/:ro
+      - ./nginx/dev.conf.template:/etc/nginx/templates/default.conf.template:ro
+  vite:
+    build:
+      target: frontend
+    volumes:
+      - ./src:/app/src
+    ports:
+      - "3000:3000"
+    profiles:
+      - dev
diff --git a/index.html b/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Viewer</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
diff --git a/nginx/dev.conf.template b/nginx/dev.conf.template
@@ -0,0 +1,39 @@
+server {
+    listen       80;
+    server_name  localhost;
+    root   /var/www;
+    absolute_redirect off;
+    autoindex on;
+
+    location = / {
+        return 307 /datasets/;
+    }
+    location = /datasets/ {
+    }
+
+    location ~* ^/datasets/(.+)/$ {
+        return 307 /viewer.html#$1;
+    }
+
+    location ~* ^/datasets/(.+)/(.+)$ {
+        try_files $uri $uri/;
+    }
+
+    location = /viewer.html {
+        proxy_pass http://vite:3000/index.html;
+    }
+
+    location / {
+        proxy_pass http://vite:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
+