aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Damani <damani.kumar@gmail.com>2019-03-26 21:30:53 +0000
committerGitHub <noreply@github.com>2019-03-26 21:30:53 +0000
commite25574cb1c6820948d3050d450bb172d91d29e64 (patch)
tree5616e56bf6171905e9f3c3c48b072bf7871e333f
parentdab5626549cffd2be33ab41928a14fa631fffd2b (diff)
parentdbe495f4b3057f476060243503c20f299ac9b385 (diff)
Merge pull request #46 from csc301-winter-2019/fix/25
bring in the data folder inside the web folder as its a hard dependen…
-rw-r--r--web/data/Neighbourhoods.geojson (renamed from data/Neighbourhoods.geojson)0
-rw-r--r--web/routes/index.js2
2 files changed, 1 insertions, 1 deletions
diff --git a/data/Neighbourhoods.geojson b/web/data/Neighbourhoods.geojson
index f17b7c3..f17b7c3 100644
--- a/data/Neighbourhoods.geojson
+++ b/web/data/Neighbourhoods.geojson
diff --git a/web/routes/index.js b/web/routes/index.js
index 0b32d0e..1ecce83 100644
--- a/web/routes/index.js
+++ b/web/routes/index.js
@@ -4,7 +4,7 @@ var Mockpoints = require('../models/mockpoints');
var Points = require('../models/points');
var fs = require("fs");
var GeoJsonGeometriesLookup = require('geojson-geometries-lookup');
-var torontoNeighbourhoords = JSON.parse(fs.readFileSync(__dirname + '/../../data/Neighbourhoods.geojson', "utf8"));
+var torontoNeighbourhoords = JSON.parse(fs.readFileSync(__dirname + '/../data/Neighbourhoods.geojson', "utf8"));
const connections = [];
const glookup = new GeoJsonGeometriesLookup(torontoNeighbourhoords);