From 183741709d684378dd96d8d2aa1f6ed50f13df66 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Thu, 2 Jun 2016 19:15:24 -0700 Subject: [PATCH 1/5] chore(package): update express-http-proxy to version 0.7.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c6f5fc7..7b63cd82 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "elasticsearch": "^11.0.0", "elasticsearch-exceptions": "0.0.4", "express": "^4.8.8", - "express-http-proxy": "^0.6.0", + "express-http-proxy": "^0.7.0", "extend": "3.0.0", "geojson": "^0.3.0", "geojson-extent": "^0.3.1", From c691df2f601c994f0e697d13f78354764402fe08 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Fri, 3 Jun 2016 13:54:45 -0400 Subject: [PATCH 2/5] Reorganize Readme header This moves things around to be a bit more organized: * Puts our standard header with links to pelias/pelias, Mapzen Search, etc first * moves the badges together * The link to the documentation was going to a silly page that just linked to another page, so it's a direct link now. * Adds a small description sentence --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 53074f58..a6ca7b57 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,18 @@ -[![Build Status](https://travis-ci.org/pelias/api.png?branch=master)](https://travis-ci.org/pelias/api) +>This repository is part of the [Pelias](https://github.com/pelias/pelias) +>project. Pelias is an open-source, open-data geocoder built by +>[Mapzen](https://www.mapzen.com/) that also powers [Mapzen Search](https://mapzen.com/projects/search). Our +>official user documentation is [here](https://mapzen.com/documentation/search/). + +# Pelias API Server + +This is the API server for the Pelias project. It's the service that runs to process user HTTP requests and return results as GeoJSON by querying Elasticsearch. -# API [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/pelias/api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://travis-ci.org/pelias/api.png?branch=master)](https://travis-ci.org/pelias/api) ## Documentation -See our [API Documentation](https://github.com/pelias/api/blob/master/public/apiDoc.md). +See the [Mapzen Search documentation](https://mapzen.com/documentation/search/). ## Install Dependencies From c154325f3eb0e49e276b3601559a82df9c4b4078 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Fri, 3 Jun 2016 14:52:52 -0400 Subject: [PATCH 3/5] Redirect to /v1 if no legacy proxy specified For when we have multiple active API versions, we have code to redirect from one running API server to another. Right now, we've disabled the beta/legacy API server and haven't released a V2 yet, so we currently have no proxying configured. Right now the default with no configuration is to simply return an error. However that means that request to http://search.mapzen.com/ return that unfriendly error. We have a nice friendly /v1 page, so in the case of no proxy being set up, it makes sense to redirect to that. --- routes/legacy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/legacy.js b/routes/legacy.js index fc6857b9..1de4986d 100644 --- a/routes/legacy.js +++ b/routes/legacy.js @@ -4,8 +4,8 @@ function addRoutes(app, peliasConfig) { var sendToLegacy; if (!peliasConfig.hasOwnProperty('legacyUrl')) { - sendToLegacy = function doNothing(req, res, next) { - next(new Error('Invalid path, no legacy proxy specified')); + sendToLegacy = function redirectToV1(req, res, next) { + res.redirect(301, '/v1'); }; } else { From e65072cfa428a08edc4dd610d9456c0c2fc998ec Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Tue, 7 Jun 2016 10:56:02 -0700 Subject: [PATCH 4/5] chore(package): update pelias-query to version 7.0.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b63cd82..53c7fab0 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "pelias-config": "^1.0.1", "pelias-logger": "^0.0.8", "pelias-model": "^4.0.0", - "pelias-query": "7.0.0", + "pelias-query": "7.0.1", "pelias-suggester-pipeline": "2.0.4", "pelias-text-analyzer": "^1.0.1", "stats-lite": "1.0.3", From af7a66126c3acb32d0cf3bc9dd3003a80aa9ba71 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 8 Jun 2016 14:41:41 -0400 Subject: [PATCH 5/5] Add LGTM config --- .lgtm | 1 + 1 file changed, 1 insertion(+) create mode 100644 .lgtm diff --git a/.lgtm b/.lgtm new file mode 100644 index 00000000..59a8a38b --- /dev/null +++ b/.lgtm @@ -0,0 +1 @@ +pattern = "(?i):shipit:|:\\+1:|LGTM"