aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/package-lock.json104
-rw-r--r--web/public/assets/blue-icon.pngbin2586 -> 0 bytes
-rw-r--r--web/public/assets/orange-icon.pngbin7382 -> 0 bytes
-rw-r--r--web/public/javascripts/map.js24
-rw-r--r--web/public/stylesheets/style.css29
-rw-r--r--web/views/map.pug6
6 files changed, 75 insertions, 88 deletions
diff --git a/web/package-lock.json b/web/package-lock.json
index 0c7f4d6..f2472bd 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@types/babel-types": {
- "version": "7.0.6",
- "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.6.tgz",
- "integrity": "sha512-8zYZyy2kgwBXdz2j8Ix7LOghGiZbOiHf6vqmmBX1r76FdAzVNv7cODyJTEglUWiOdRnXh0s/o58neUwv5vaitQ=="
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.5.tgz",
+ "integrity": "sha512-0t0R7fKAXT/P++S98djRkXbL9Sxd9NNtfNg3BNw2EQOjVIkiMBdmO55N2Tp3wGK3mylmM7Vck9h5tEoSuSUabA=="
},
"@types/babylon": {
"version": "6.16.5",
@@ -56,6 +56,11 @@
"repeat-string": "^1.5.2"
}
},
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+ },
"array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -162,11 +167,12 @@
}
},
"clean-css": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
- "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+ "version": "3.4.28",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+ "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
"requires": {
- "source-map": "~0.6.0"
+ "commander": "2.8.x",
+ "source-map": "0.4.x"
}
},
"cliui": {
@@ -179,6 +185,14 @@
"wordwrap": "0.0.2"
}
},
+ "commander": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+ "requires": {
+ "graceful-readlink": ">= 1.0.0"
+ }
+ },
"constantinople": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz",
@@ -343,6 +357,11 @@
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
+ "graceful-readlink": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+ },
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -646,18 +665,18 @@
}
},
"pug": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz",
- "integrity": "sha1-ccuoJTfJWl6rftBGluQiH1Oqh44=",
+ "version": "2.0.0-beta11",
+ "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-beta11.tgz",
+ "integrity": "sha1-Favmr1AEx+LPRhPksnRlyVRrXwE=",
"requires": {
- "pug-code-gen": "^2.0.1",
- "pug-filters": "^3.1.0",
- "pug-lexer": "^4.0.0",
- "pug-linker": "^3.0.5",
- "pug-load": "^2.0.11",
- "pug-parser": "^5.0.0",
- "pug-runtime": "^2.0.4",
- "pug-strip-comments": "^1.0.3"
+ "pug-code-gen": "^1.1.1",
+ "pug-filters": "^2.1.1",
+ "pug-lexer": "^3.0.0",
+ "pug-linker": "^2.0.2",
+ "pug-load": "^2.0.5",
+ "pug-parser": "^2.0.2",
+ "pug-runtime": "^2.0.3",
+ "pug-strip-comments": "^1.0.2"
}
},
"pug-attrs": {
@@ -671,16 +690,16 @@
}
},
"pug-code-gen": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz",
- "integrity": "sha1-CVHsgyJddNjPxHan+Zolm199BQw=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.1.tgz",
+ "integrity": "sha1-HPcnRO8qA56uajNAyqoRBYcSWOg=",
"requires": {
"constantinople": "^3.0.1",
"doctypes": "^1.1.0",
"js-stringify": "^1.0.1",
- "pug-attrs": "^2.0.3",
+ "pug-attrs": "^2.0.2",
"pug-error": "^1.3.2",
- "pug-runtime": "^2.0.4",
+ "pug-runtime": "^2.0.3",
"void-elements": "^2.0.1",
"with": "^5.0.0"
}
@@ -691,23 +710,23 @@
"integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY="
},
"pug-filters": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz",
- "integrity": "sha1-JxZVVbwEwjbkqisDZiRt+gIbYm4=",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
+ "integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
"requires": {
- "clean-css": "^4.1.11",
+ "clean-css": "^3.3.0",
"constantinople": "^3.0.1",
"jstransformer": "1.0.0",
"pug-error": "^1.3.2",
- "pug-walk": "^1.1.7",
+ "pug-walk": "^1.1.5",
"resolve": "^1.1.6",
"uglify-js": "^2.6.1"
}
},
"pug-lexer": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz",
- "integrity": "sha1-IQwYRX7y4XYCQnQMXmR715TOwng=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
+ "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
"requires": {
"character-parser": "^2.1.1",
"is-expression": "^3.0.0",
@@ -715,12 +734,12 @@
}
},
"pug-linker": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz",
- "integrity": "sha1-npp65ABWgtAn3uuWsAD4juuDoC8=",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-2.0.3.tgz",
+ "integrity": "sha1-szH/olc33eacEntWwQ/xf652bco=",
"requires": {
"pug-error": "^1.3.2",
- "pug-walk": "^1.1.7"
+ "pug-walk": "^1.1.2"
}
},
"pug-load": {
@@ -733,9 +752,9 @@
}
},
"pug-parser": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz",
- "integrity": "sha1-45Stmz/KkxI5QK/4hcBuRKt+aOQ=",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-2.0.2.tgz",
+ "integrity": "sha1-U6aAz9BQOdywwn0CkJS8SnkmibA=",
"requires": {
"pug-error": "^1.3.2",
"token-stream": "0.0.1"
@@ -891,9 +910,12 @@
"integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
},
"source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "requires": {
+ "amdefine": ">=0.0.4"
+ }
},
"sparse-bitfield": {
"version": "3.0.3",
diff --git a/web/public/assets/blue-icon.png b/web/public/assets/blue-icon.png
deleted file mode 100644
index e4abba3..0000000
--- a/web/public/assets/blue-icon.png
+++ /dev/null
Binary files differ
diff --git a/web/public/assets/orange-icon.png b/web/public/assets/orange-icon.png
deleted file mode 100644
index dd725de..0000000
--- a/web/public/assets/orange-icon.png
+++ /dev/null
Binary files differ
diff --git a/web/public/javascripts/map.js b/web/public/javascripts/map.js
index 544da9e..8d4fc3b 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -2,7 +2,6 @@
// L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
// attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
// }).addTo(map);
-let currPoint;
const Races = {
"White" : "European or White",
@@ -32,8 +31,7 @@ function plotPointsOnMap(points) {
function showDetails(e) {
// layer.feature.geometry gives you access to all the fields
let layer = e.layer;
- currPoint = layer;
-
+
let sideBar = document.getElementById('sidebar');
if (getComputedStyle(sideBar).visibility === 'hidden') {
@@ -82,27 +80,13 @@ function showDetails(e) {
let extraText = document.createTextNode(layer.feature.geometry['extra']);
extraTextSpan.appendChild(extraText);
- let pendingBtn = document.getElementById('pending-btn');
- pendingBtn.addEventListener('click', markAsPending);
-
- let completedBtn = document.getElementById('completed-btn');
- completedBtn.addEventListener('click', markAsCompleted);
-
- let closeBtn = document.getElementById('close-btn');
- closeBtn.addEventListener('click', closeDetails);
-}
-
-function markAsPending(e) {
- currPoint._icon.src = '../assets/orange-icon.png';
-}
-
-function markAsCompleted(e) {
- map.removeLayer(currPoint);
+ let closeBtn = document.getElementById('close-btn')
+ closeBtn.addEventListener('click', closeDetails)
}
function closeDetails(e) {
let details = document.getElementById('sidebar')
- details.style.visibility = 'hidden';
+ details.style.visibility = 'hidden'
}
// different basemap
diff --git a/web/public/stylesheets/style.css b/web/public/stylesheets/style.css
index 5f39fcf..ece8da4 100644
--- a/web/public/stylesheets/style.css
+++ b/web/public/stylesheets/style.css
@@ -64,37 +64,20 @@ a {
overflow-wrap: break-word;
word-wrap: break-word;
}
-#btn-container {
+#close-btn-container {
height: 30px;
top: 250px;
background-color: lightgrey;
width: 350px;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
- text-align: center;
-}
-.details-btn {
- position: relative;
- margin-top: 4px;
- margin-bottom: 4px;
- border-radius: 10px;
- font-size: 18px;
- padding: 10px;
-}
-#pending-btn {
- background-color: orange;
- float: left;
- margin-left: 10px;
-}
-
-#completed-btn {
- background-color: #2bbd2b;
- float: left;
- margin-left: 10px;
}
-
#close-btn {
background-color: red;
+ position: relative;
+ margin-top: 4px;
float: right;
- margin-right: 10px;
+ margin-right: 20px;
+ border-radius: 10px;
+ width: 100px;
}
diff --git a/web/views/map.pug b/web/views/map.pug
index af97f6c..484899c 100644
--- a/web/views/map.pug
+++ b/web/views/map.pug
@@ -14,10 +14,8 @@ block content
span#report-other
strong Distinctive Features
span#report-distinctive
- #btn-container
- button.details-btn#pending-btn Pending
- button.details-btn#completed-btn Completed
- button.details-btn#close-btn Close
+ #close-btn-container
+ button#close-btn Close
#map
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 06:58:01 +0000