aboutsummaryrefslogtreecommitdiff
path: root/web/public/javascripts
diff options
context:
space:
mode:
authorKumar Damani <damani.kumar@gmail.com>2019-04-19 01:23:24 +0000
committerGitHub <noreply@github.com>2019-04-19 01:23:24 +0000
commit912609ca035415d40b400fa6fe9988f2ebae3f18 (patch)
tree94b62eb6146104989561e2ac08c9478a863be8ff /web/public/javascripts
parent2556455ab286d7ceb5cefbb081cc8e2c6ca5cb73 (diff)
parent14f3642f1ea4d32c17d56ffebf5cfd14fb5f5f2c (diff)
Merge pull request #74 from csc301-winter-2019/web-homepage
web ui updates
Diffstat (limited to 'web/public/javascripts')
-rw-r--r--web/public/javascripts/map.js21
1 files changed, 11 insertions, 10 deletions
diff --git a/web/public/javascripts/map.js b/web/public/javascripts/map.js
index f957223..a121e75 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -15,10 +15,11 @@ const Races = {
const PendingIcon = new L.Icon({
iconAnchor: [ 12, 41 ],
- iconUrl: "../assets/orange-icon.png",
+ iconUrl: "../images/orange-icon.png",
iconSize: [ 25, 41 ],
popupAnchor: [ 1, -34 ],
shadowSize: [ 41, 41 ],
+ shadowUrl: "../images/marker-shadow.png",
tooltipAnchor: [ 16, -28 ]
});
@@ -45,22 +46,22 @@ function plotPointsOnMap(points) {
function showDetails(e) {
if(currPoint !== undefined) {
if (currPoint.feature.geometry.status === "new") {
- currPoint._icon.src = '../assets/blue-icon.png';
+ currPoint._icon.src = '../images/blue-icon.png';
}
else if (currPoint.feature.geometry.status === "pending") {
- currPoint._icon.src = '../assets/orange-icon.png';
+ currPoint._icon.src = '../images/orange-icon.png';
}
}
// layer.feature.geometry gives you access to all the fields
let layer = e.layer;
currPoint = layer;
-
+
if (currPoint.feature.geometry.status === "new") {
- currPoint._icon.src = '../assets/blue-icon-focused.png';
+ currPoint._icon.src = '../images/blue-icon-focused.png';
}
else if (currPoint.feature.geometry.status === "pending") {
- currPoint._icon.src = '../assets/orange-icon-focused.png';
+ currPoint._icon.src = '../images/orange-icon-focused.png';
}
const pointBounds = [currPoint.getLatLng()];
@@ -129,13 +130,13 @@ function markAsPending(e) {
let currPointId = currPointDetails._id;
if (currPointDetails.status === "pending") return;
- currPoint._icon.src = '../assets/orange-icon-focused.png';
+ currPoint._icon.src = '../images/orange-icon-focused.png';
currPointDetails.status = "pending";
updatePointStatusInDb(currPointId, "pending")
.then(function(responseJson) {
alert("Your change has been saved.");
- currPoint._icon.src = '../assets/orange-icon-focused.png';
+ currPoint._icon.src = '../images/orange-icon-focused.png';
})
.catch(function(error) {
alert(error);
@@ -164,10 +165,10 @@ function closeDetails(e) {
details.style.visibility = 'hidden';
if (currPoint.feature.geometry.status === "pending") {
- currPoint._icon.src = '../assets/orange-icon.png';
+ currPoint._icon.src = '../images/orange-icon.png';
}
else if (currPoint.feature.geometry.status === "new") {
- currPoint._icon.src = '../assets/blue-icon.png';
+ currPoint._icon.src = '../images/blue-icon.png';
}
}