Merge branch 'qa' of github.com:csc301-winter-2019/project-team-02 into qa

1 files changed, 9 insertions, 7 deletions

diff --git a/web/public/javascripts/map.js b/web/public/javascripts/map.js
index 5e5a303..190307d 100644
--- a/web/public/javascripts/map.js
+++ b/web/public/javascripts/map.js
@@ -12,10 +12,12 @@ L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}
 	ext: 'png'
 }).addTo(map);
 
-// Create point feature for somewhere downtown
-var myDataPoint = L.marker([43.6529, -79.3849]).addTo(map);
-
-// Bind popup to Data Point object
-myDataPoint.bindPopup("<h3>City Hall (not really)</h3><p>Toronto, ON<br>Information about city hall.</p>");
-
-map.setZoom(13);
+L.geoJson(points, {
+	pointToLayer: function (feature, latlng) {
+		//return L.circleMarker(latlng);
+		return L.marker(latlng);
+	}
+}).bindPopup(function (layer) {
+	// layer.feature.geometry gives you access to all the fields
+	return "<p>" + JSON.stringify(layer.feature.geometry) + "</p>";
+}).addTo(map)