Skip to content

Commit

Permalink
Merge branch 'develop' into feature/poi-import
Browse files Browse the repository at this point in the history
  • Loading branch information
olafveerman authored Oct 24, 2017
2 parents 9cad4c4 + 9389bef commit 3a814a6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/utils/overpass.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import osmtogeojson from 'osmtogeojson';
export function query (format, query) {
return promiseRetry((retry, number) => {
console.log('Fetching data from Overpass... Attempt number:', number);
return rp(`http://overpass-api.de/api/interpreter?data=[out:${format}][timeout:900][maxsize:2000000000];${query}`)
return rp(`https://overpass.kumi.systems/api/interpreter?data=[out:${format}][timeout:900][maxsize:2000000000];${query}`)
.catch(err => {
// API calls to Overpass are rate limited. Retry if statusCode is 429
if (err.statusCode === 429) {
Expand Down
13 changes: 13 additions & 0 deletions app/utils/vector-tiles.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
'use strict';
import path from 'path';
import fs from 'fs-extra';
Expand Down Expand Up @@ -33,6 +34,12 @@ const DEBUG = config.debug;
export function createAdminBoundsVT (projId, scId, op, fc) {
const identifier = `p${projId} s${scId} AB VT`;

// Temporary disable vector tiles.
return {
promise: Promise.resolve(),
kill: () => Promise.resolve()
};

// Promisify functions.
const removeP = Promise.promisify(fs.remove);
const writeJsonP = Promise.promisify(fs.writeJson);
Expand Down Expand Up @@ -122,6 +129,12 @@ export function createAdminBoundsVT (projId, scId, op, fc) {
export function createRoadNetworkVT (projId, scId, op, roadNetwork) {
const identifier = `p${projId} s${scId} RN VT`;

// Temporary disable vector tiles.
return {
promise: Promise.resolve(),
kill: () => Promise.resolve()
};

// Promisify functions.
const removeP = Promise.promisify(fs.remove);
const writeFile = Promise.promisify(fs.writeFile);
Expand Down
7 changes: 6 additions & 1 deletion ecs-task-definition.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ rra-postgis:
- /var/lib/postgresql/data:/var/lib/postgresql/data
rra-api:
image: wbtransport/rra-api
environment:
DEBUG: true
ports:
- 80:4000
command: node index.js
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /tmp:/tmp
links:
- rra-postgis
- rra-postgis

0 comments on commit 3a814a6

Please sign in to comment.