use API instead of cli for overpass

it's not possible to catch errors with cli because they don't pass to stderr

Author: Haroenv

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- 6
+- 7
 branches:
   only:
   - dev
@@ -15,9 +15,9 @@ env:
   - DEPLOY_BRANCH="dev"
 script:
 - yarn run update
-- curl -s -o src/data/speelterreinen.geojson https://datatank.stad.gent/4/cultuursportvrijetijd/speelterreinen.geojson
-- curl -s -o src/data/clubhuizenvoorsenioren.geojson https://datatank.stad.gent/4/doelgroepen/clubhuizenvoorsenioren.geojson
-- curl -s -o src/data/hondenvoorzieningen.geojson https://datatank.stad.gent/4/infrastructuur/hondenvoorzieningen.geojson
+- curl --fail --silent --show-error -o src/data/speelterreinen.geojson https://datatank.stad.gent/4/cultuursportvrijetijd/speelterreinen.geojson
+- curl --fail --silent --show-error -o src/data/clubhuizenvoorsenioren.geojson https://datatank.stad.gent/4/doelgroepen/clubhuizenvoorsenioren.geojson
+- curl --fail --silent --show-error -o src/data/hondenvoorzieningen.geojson https://datatank.stad.gent/4/infrastructuur/hondenvoorzieningen.geojson
 after_success:
 - yarn run gh-pages-travis
 before_install:

LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+Copyright (c) 2016
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+

package.json

@@ -8,10 +8,8 @@
   },
   "scripts": {
     "gipod": "gipod --type workassignment --query city=gent > src/data/werken.geojson",
-    "studenten": "query-overpass assets/overpass/studenten.ql > src/data/studenten.geojson",
-    "toerisme": "query-overpass assets/overpass/toerisme.ql > src/data/toerisme.geojson",
-    "cafes": "query-overpass assets/overpass/cafes.ql > src/data/cafes.geojson",
-    "update": "npm run gipod & npm run studenten & npm run toerisme & npm run cafes",
+    "overpass": "node src/overpass",
+    "update": "npm run gipod & npm run overpass",
     "serve": "jekyll s --ssl-cert assets/ca.crt --ssl-key assets/ca.key"
   },
   "bugs": {
@@ -23,6 +21,8 @@
     "query-overpass": "^1.1.0"
   },
   "devDependencies": {
+    "fs.promised": "^3.0.0",
     "gh-pages-travis": "^1.0.0"
-  }
+  },
+  "license": "MIT"
 }

src/overpass.js

@@ -0,0 +1,34 @@
+const path = require('path')
+const fs = require('fs.promised');
+const overpass = require('query-overpass');
+
+const data = {
+  studenten: {
+    file: () => path.join(__dirname, '../assets/overpass/studenten.ql'),
+    output: () => path.join(__dirname, './data/studenten.geojson'),
+  },
+  toerisme: {
+    file: () => path.join(__dirname, '../assets/overpass/toerisme.ql'),
+    output: () => path.join(__dirname, './data/toerisme.geojson'),
+  },
+  cafes: {
+    file: () => path.join(__dirname, '../assets/overpass/cafes.ql'),
+    output: () => path.join(__dirname, './data/cafes.geojson'),
+  },
+};
+
+Object.keys(data).forEach((point) => {
+  fs.readFile(data[point].file()).then((query) => {
+    try {
+      overpass(query, (err, res) => {
+        if (!err) {
+          fs.writeFile(data[point].output(), JSON.stringify(res));
+        } else {
+          console.log(err);
+        }
+      });
+    } catch(err) {
+      console.log(err);
+    };
+  });
+});

yarn.lock

@@ -194,6 +194,10 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+fs.promised@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fs.promised/-/fs.promised-3.0.0.tgz#ab77379f7c1ad0939e1262a8c2ced93fa6c39d3b"
+
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"