Merge pull request #559 from pelias/master

Merge master into staging

.lgtm

@@ -0,0 +1 @@
+pattern = "(?i):shipit:|:\\+1:|LGTM"

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
 

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",
@@ -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",

routes/legacy.js

@@ -4,8 +4,8 @@ function addRoutes(app, peliasConfig) {
   var sendToLegacy;
 
   if (!peliasConfig.hasOwnProperty('legacyUrl')) {
-    sendToLegacy = function doNothing(req, res, next) {
+    sendToLegacy = function redirectToV1(req, res, next) {
-      next(new Error('Invalid path, no legacy proxy specified'));
+      res.redirect(301, '/v1');
     };
   }
   else {