diff --git a/README.md b/README.md index 7773335f462fd75d31b6a8f98d71628e64e101a4..176f2495b1d231ef04ab8cbea97b6ef02a1faee4 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,17 @@ Execute these commands on your server as a normal user to prepare the dependenci npm install bower grunt-cli node_modules/.bin/bower install +# Building + +Just run the following command from the meshviewer directory: + + node_modules/.bin/grunt + +This will generate `build/` containing all required files. + # Configure -Copy `config.js.example` to `config.js` and change it to match your community. +Copy `config.json.example` to `build/config.json` and change it to match your community. ## dataPath (string) @@ -133,12 +141,4 @@ Examples for `globalInfos`: In order to have global statistics available, you have to run the backend with parameter `--with-rrd` (this only creates globalGraph.png) or generate them in other ways. -# Building - -Just run the following command from the meshviewer directory: - - node_modules/.bin/grunt - -This will generate `build/` containing all required files. - [CORS enabled]: http://enable-cors.org/server.html diff --git a/app.js b/app.js index 71c87e6886ad32c220c4ca297074d40786ae46cc..e848121f76fe2755dde6eb7a404569fd96aa70a5 100644 --- a/app.js +++ b/app.js @@ -32,5 +32,5 @@ require.config({ }) require(["main", "helper"], function (main) { - main() + getJSON("config.json").then(main) }) diff --git a/config.js.example b/config.json.example similarity index 97% rename from config.js.example rename to config.json.example index fff1db5f32e6679a5fac9cb15e5f1e2fd39f4659..8d7e9edd2c12e3133f2b9901c92f843f44092242 100644 --- a/config.js.example +++ b/config.json.example @@ -1,4 +1,4 @@ -define({ +{ "dataPath": "https://map.luebeck.freifunk.net/data/", "siteName": "Freifunk Lübeck", "mapSigmaScale": 0.5, @@ -18,4 +18,4 @@ define({ "name": "Stamen.TonerLite" } ] -}) +} diff --git a/lib/main.js b/lib/main.js index bb2e7404f4c1df86c3bfb05069052a30739d6805..c517768e22f863e9be79e8266fe0e6f8839a1670 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,6 +1,6 @@ -define(["../config", "moment", "router", "leaflet", "gui", "numeral"], -function (config, moment, Router, L, GUI, numeral) { - return function () { +define(["moment", "router", "leaflet", "gui", "numeral"], +function (moment, Router, L, GUI, numeral) { + return function (config) { function handleData(data) { var dataNodes = data[0] var dataGraph = data[1]