Fix ciao tests

test/ciao/reverse/layers_alias_coarse.coffee

@@ -41,10 +41,5 @@ json.geocoding.query.layers.should.eql [ "continent",
   "macrohood",
   "neighbourhood",
   "microhood",
-  "disputed",
+  "disputed"
-  "admin0",
-  "admin1",
-  "admin2",
-  "neighborhood",
-  "local_admin"
 ]

test/ciao/reverse/layers_invalid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,country,region,address,venue,county,locality,admin0,admin1,admin2,neighborhood,local_admin,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,country,region,county,locality,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/reverse/layers_mix_invalid_valid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,country,region,address,venue,county,locality,admin0,admin1,admin2,neighborhood,local_admin,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,country,region,county,locality,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/reverse/layers_multiple.coffee

@@ -30,4 +30,4 @@ should.not.exist json.geocoding.warnings
 
 #? inputs
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query.layers.should.eql ["country","admin0","region","admin1"]
+json.geocoding.query.layers.should.eql ["country","region"]

test/ciao/reverse/layers_single.coffee

@@ -30,4 +30,4 @@ should.not.exist json.geocoding.warnings
 
 #? inputs
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query.layers.should.eql ["country","admin0"]
+json.geocoding.query.layers.should.eql ["country"]

test/ciao/reverse/sources_invalid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notasource\' is an invalid sources parameter. Valid options: osm,oa,gn,qs,wof,openstreetmap,openaddresses,geonames,quattroshapes,whosonfirst' ]
+json.geocoding.errors.should.eql [ '\'notasource\' is an invalid sources parameter. Valid options: osm,oa,gn,wof,openstreetmap,openaddresses,geonames,whosonfirst' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/reverse/sources_layers_invalid_combo.coffee

@@ -1,6 +1,6 @@
 
 #> sources and layers specified (invalid combo)
-path: '/v1/reverse?point.lat=1&point.lon=2&sources=quattroshapes&layers=address'
+path: '/v1/reverse?point.lat=1&point.lon=2&sources=whosonfirst&layers=address'
 
 #? 200 ok
 response.statusCode.should.be.equal 400
@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ 'You have specified both the `sources` and `layers` parameters in a combination that will return no results: the quattroshapes source has nothing in the address layer' ]
+json.geocoding.errors.should.eql [ 'You have specified both the `sources` and `layers` parameters in a combination that will return no results: the whosonfirst source has nothing in the address layer' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings
@@ -32,4 +32,4 @@ should.not.exist json.geocoding.warnings
 #? inputs
 json.geocoding.query['size'].should.eql 10
 json.geocoding.query.layers.should.eql ["address"]
-json.geocoding.query.sources.should.eql ["quattroshapes"]
+json.geocoding.query.sources.should.eql ["whosonfirst"]

test/ciao/search/layers_alias_coarse.coffee

@@ -42,10 +42,5 @@ json.geocoding.query.layers.should.eql [ "continent",
   "macrohood",
   "neighbourhood",
   "microhood",
-  "disputed",
+  "disputed"
-  "admin0",
-  "admin1",
-  "admin2",
-  "neighborhood",
-  "local_admin"
 ]

test/ciao/search/layers_invalid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,country,region,address,venue,county,locality,admin0,admin1,admin2,neighborhood,local_admin,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,country,region,county,locality,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/search/layers_mix_invalid_valid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,country,region,address,venue,county,locality,admin0,admin1,admin2,neighborhood,local_admin,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,country,region,county,locality,continent,macrocountry,dependency,localadmin,macrohood,neighbourhood,microhood,disputed' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/search/layers_multiple.coffee

@@ -31,4 +31,4 @@ should.not.exist json.geocoding.warnings
 #? inputs
 json.geocoding.query['text'].should.eql 'a'
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query.layers.should.eql ["country","admin0","region","admin1"]
+json.geocoding.query.layers.should.eql ["country","region"]

test/ciao/search/layers_single.coffee

@@ -31,4 +31,4 @@ should.not.exist json.geocoding.warnings
 #? inputs
 json.geocoding.query['text'].should.eql 'a'
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query.layers.should.eql ["country","admin0"]
+json.geocoding.query.layers.should.eql ["country"]

test/ciao/search/sources_invalid.coffee

@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ '\'notasource\' is an invalid sources parameter. Valid options: osm,oa,gn,qs,wof,openstreetmap,openaddresses,geonames,quattroshapes,whosonfirst' ]
+json.geocoding.errors.should.eql [ '\'notasource\' is an invalid sources parameter. Valid options: osm,oa,gn,wof,openstreetmap,openaddresses,geonames,whosonfirst' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/search/sources_layers_invalid_combo.coffee

@@ -1,6 +1,6 @@
 
 #> sources and layers specified (invalid combo)
-path: '/v1/search?text=a&sources=quattroshapes&layers=address'
+path: '/v1/search?text=a&sources=whosonfirst&layers=address'
 
 #? 200 ok
 response.statusCode.should.be.equal 400
@@ -24,7 +24,7 @@ json.features.should.be.instanceof Array
 
 #? expected errors
 should.exist json.geocoding.errors
-json.geocoding.errors.should.eql [ 'You have specified both the `sources` and `layers` parameters in a combination that will return no results: the quattroshapes source has nothing in the address layer' ]
+json.geocoding.errors.should.eql [ 'You have specified both the `sources` and `layers` parameters in a combination that will return no results: the whosonfirst source has nothing in the address layer' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings
@@ -33,5 +33,5 @@ should.not.exist json.geocoding.warnings
 json.geocoding.query['text'].should.eql 'a'
 json.geocoding.query['size'].should.eql 10
 json.geocoding.query.layers.should.eql ["address"]
-json.geocoding.query.sources.should.eql ["quattroshapes"]
+json.geocoding.query.sources.should.eql ["whosonfirst"]
 should.not.exist json.geocoding.query['type']

test/unit/sanitiser/_sources.js

@@ -29,7 +29,7 @@ module.exports.tests.no_sources = function(test, common) {
     };
 
     var expected_error = 'sources parameter cannot be an empty string. ' +
-       'Valid options: osm,oa,gn,qs,wof,openstreetmap,openaddresses,geonames,quattroshapes,whosonfirst';
+       'Valid options: osm,oa,gn,wof,openstreetmap,openaddresses,geonames,whosonfirst';
 
     var messages = sanitize(req.query, req.clean);
 
@@ -104,7 +104,7 @@ module.exports.tests.invalid_sources = function(test, common) {
     var expected_messages = {
       errors: [
         '\'notasource\' is an invalid sources parameter. ' +
-        'Valid options: osm,oa,gn,qs,wof,openstreetmap,openaddresses,geonames,quattroshapes,whosonfirst'
+        'Valid options: osm,oa,gn,wof,openstreetmap,openaddresses,geonames,whosonfirst'
       ],
       warnings: []
     };