aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorKumar Damani <kumar.damani@mail.utoronto.ca>2019-02-27 05:17:53 +0000
committerKumar Damani <kumar.damani@mail.utoronto.ca>2019-02-27 05:17:53 +0000
commit92625bb842d80faa33188306b918f2078c91e848 (patch)
tree59a5139403aa257ff5b9c408ad53e053043379ff /web
parenta844d93b5dd799b202ef476fa151bea5bd125456 (diff)
removed unnecessary db call breaking homepage due to db update
Diffstat (limited to 'web')
-rw-r--r--web/README.md30
-rw-r--r--web/public/javascripts/map.js33
-rw-r--r--web/routes/index.js9
3 files changed, 6 insertions, 66 deletions
diff --git a/web/README.md b/web/README.md
index d470960..b7f02b3 100644
--- a/web/README.md
+++ b/web/README.md
@@ -13,34 +13,8 @@
`docker run -d --name mymongo -p 27017:27017 mongo`
-2. enter inside the container:
-
- `docker exec -it mymongo mongo`
-
-3. run inside the interactive mongo shell:
-
- `use helpthehome`
-
-4. Put in some dummy data to start, run:
-
-```
-db.pointscollection.insert({
- "type": "MultiPoint",
- "name": "points",
- "color": "#0000ff",
- "style": {
- "radius": 8,
- "fillColor": "#00ce00",
- "color": "#008c00",
- "weight": 2,
- "opacity": 1,
- "fillOpacity": 1
- },
- "coordinates": [-73.9580, 40.8003]
-})
-```
-
-5. Now you are ready to start the app:
+
+2. Now you are ready to start the app:
From this directory:
diff --git a/web/public/javascripts/map.js b/web/public/javascripts/map.js
index 44fba38..414efee 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -8,45 +8,14 @@ L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}
attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
subdomains: 'abcd',
minZoom: 0,
- maxZoom: 20,
+ maxZoom: 13,
ext: 'png'
}).addTo(map);
// Create point feature for somewhere downtown
var myDataPoint = L.marker([43.6529, -79.3849]).addTo(map);
-// Create line feature and add style and add to map
-var myDataLine = L.polyline([
- [43.6529, -79.3849],
- [43.6531, -79.3855]],
- {color: 'red', weight: 10}).addTo(map);
-
-// Create area feature add style and add to map
-var myArea = L.polygon([
- [43.650948, -79.385655],
- [43.66, -79.388],
- [43.6634, -79.4011],
- [43.66, -79.4011]],
- {color: 'blue', weight: 4}).addTo(map);
-
// Bind popup to Data Point object
// myDataPoint.bindPopup("This is my city");
// i can add regular html to this too - neat!
myDataPoint.bindPopup("<h3>City Hall (not really)</h3><p>Toronto, ON<br>Information about city hall.</p>");
-
-// Bind popup to area object
-myArea.bindPopup("U of T Campus (not really)");
-
-// Create an Empty Popup
-var popup = L.popup();
-
-// Write function to set Properties of the Popup
-function onMapClick(e) {
- popup
- .setLatLng(e.latlng)
- .setContent("You clicked the map at " + e.latlng.toString())
- .openOn(map);
-}
-
-// Listen for a click event on the Map element
-map.on('click', onMapClick);
diff --git a/web/routes/index.js b/web/routes/index.js
index ffe1c21..3aaee01 100644
--- a/web/routes/index.js
+++ b/web/routes/index.js
@@ -47,13 +47,10 @@ router.get('/', function(req, res, next) {
/* GET Map page. */
router.get('/map', function(req,res) {
- // we can use the database to fetch a point, SELECT coordinates
- Json.findOne({name: "points"}, 'coordinates', function(e,point){
- if (e) return e;
- // send the view lat, and long.
+ // send the view lat, and long. city center
res.render('map', {
- lat : point.coordinates[1],
- lng : point.coordinates[0]
+ lat : 43.654127,
+ lng : -79.383370
});
});
});