Merge branch 'fix-place-es-queries-for-type'

controller/place.js

@@ -19,13 +19,8 @@ function setup( backend ){
         /*
          * some gids aren't resolvable to a single type (ex: osmnode and osmway
          * both have source osm and layer venue), so expect an array of
-         * possible values. It's important to use `type` here instead of
-         * `_type`, as the former actually queries against the type, and thus
-         * can accept multiple match values.  `_type`, on the other hand,
-         * simply changes the actual URL of the query sent to Elasticsearch to
-         * contain a type, which obviously can only take a single type.
-         */
-        type: id.types,
+         * possible values. */
+        _type: id.types,
         _id: id.id
       };
     });

test/unit/controller/place.js

@@ -41,7 +41,7 @@ module.exports.tests.functional_success = function(test, common) {
 
   test('functional success', function(t) {
     var backend = mockBackend( 'client/mget/ok/1', function( cmd ){
-      t.deepEqual(cmd, { body: { docs: [ { _id: 123, _index: 'pelias', type: [ 'a' ] } ] } }, 'correct backend command');
+      t.deepEqual(cmd, { body: { docs: [ { _id: 123, _index: 'pelias', _type: [ 'a' ] } ] } }, 'correct backend command');
     });
     var controller = setup( backend );
     var res = {
@@ -70,7 +70,7 @@ module.exports.tests.functional_success = function(test, common) {
 module.exports.tests.functional_failure = function(test, common) {
   test('functional failure', function(t) {
     var backend = mockBackend( 'client/mget/fail/1', function( cmd ){
-      t.deepEqual(cmd, { body: { docs: [ { _id: 123, _index: 'pelias', type: [ 'b' ] } ] } }, 'correct backend command');
+      t.deepEqual(cmd, { body: { docs: [ { _id: 123, _index: 'pelias', _type: [ 'b' ] } ] } }, 'correct backend command');
     });
     var controller = setup( backend );
     var req = { clean: { ids: [ {'id' : 123, types: [ 'b' ] } ] }, errors: [], warnings: [] };