Merge pull request #17 from csc301-winter-2019/fix-master-urgent

Fix master urgent

3 files changed, 30 insertions, 91 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..5e5a303 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -5,48 +5,17 @@
 
 // different basemap
 L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.{ext}', {
-			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,
-			ext: 'png'
+	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: 18,
+	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);
+map.setZoom(13);
diff --git a/web/routes/index.js b/web/routes/index.js
index ffe1c21..df579fc 100644
--- a/web/routes/index.js
+++ b/web/routes/index.js
@@ -7,32 +7,32 @@ var mongoose = require('mongoose');
 var env = process.env.NODE_ENV || 'development';
 var uri;
 if (env === 'development') {
-    uri = 'mongodb://localhost:27017/helpthehome'
-    // use for small testing only if really necessary
-    // uri = 'mongodb+srv://development:dreamteam@cluster0-krnr4.mongodb.net/helpthehome?retryWrites=true'
+	uri = 'mongodb://localhost:27017/helpthehome'
+	// use for small testing only if really necessary
+	// uri = 'mongodb+srv://development:dreamteam@cluster0-krnr4.mongodb.net/helpthehome?retryWrites=true'
 } else if (env === 'qa') {
-    uri = process.env.MONGODB_URI
+	uri = process.env.MONGODB_URI
 } else if (env === 'production') {
-    uri = ''
+	uri = ''
 }
 
 // Mongoose connection to MongoDB
 mongoose.connect(uri, { useNewUrlParser: true }, function (error) {
-    if (error) {
-        console.log(error);
-        console.log("App was not able to connect to the mongo server!");
-        console.log("... double check that the mongo server is running locally");
-    } else {
+	if (error) {
+		console.log(error);
+		console.log("App was not able to connect to the mongo server!");
+		console.log("... double check that the mongo server is running locally");
+	} else {
 	console.log(`connected to ${uri}`);
-    }
+	}
 });
 
 // Mongoose Schema definition
 var Schema = mongoose.Schema;
 var JsonSchema = new Schema({
-    name: String,
-    type: Schema.Types.Mixed,
-    coordinates: Array
+	name: String,
+	type: Schema.Types.Mixed,
+	coordinates: Array
 });
 
 // Mongoose Model definition
@@ -40,22 +40,18 @@ var Json = mongoose.model('Jstring', JsonSchema, 'pointscollection');
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
-  // for now just redirect to /map
-  //res.render('index', { title: 'Welcome' });
-  res.redirect('/map');
+	// for now just redirect to /map
+	//res.render('index', { title: 'Welcome' });
+	res.redirect('/map');
 });
 
 /* 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.
-        res.render('map', {
-            lat : point.coordinates[1],
-            lng : point.coordinates[0]
-        });
-    });
+	// send the view lat, and long. city center
+	res.render('map', {
+		lat : 43.654127,
+		lng : -79.383370
+	});
 });
 
 module.exports = router;