Updating ciao tests to reflect current status in master to make them run

test/ciao/autocomplete/layers_alias_coarse.coffee

@@ -32,6 +32,7 @@ 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 [ "continent",
+  "empire",
   "country",
   "dependency",
   "macroregion",
@@ -45,5 +46,7 @@ json.geocoding.query.layers.should.eql [ "continent",
   "neighbourhood",
   "microhood",
   "disputed",
-  "postalcode"
+  "postalcode",
+  "ocean",
+  "marinearea"
 ]

test/ciao/autocomplete/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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/autocomplete/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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/reverse/boundary_circle_valid_radius_coarse.coffee

@@ -26,14 +26,31 @@ json.features.should.be.instanceof Array
 should.not.exist json.geocoding.errors
 
 #? expected warnings
-should.exist json.geocoding.warnings
+should.not.exist json.geocoding.warnings
-json.geocoding.warnings.should.eql [ 'boundary.circle.radius is not applicable for coarse reverse' ]
 
 #? inputs
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query['layers'].should.eql 'coarse'
 json.geocoding.query['point.lat'].should.eql 40.744243
 json.geocoding.query['point.lon'].should.eql -73.990342
 json.geocoding.query['boundary.circle.lat'].should.eql 40.744243
 json.geocoding.query['boundary.circle.lon'].should.eql -73.990342
 json.geocoding.query['boundary.circle.radius'].should.eql 999.9
+json.geocoding.query['layers'].should.eql [ "continent",
+  "empire",
+  "country",
+  "dependency",
+  "macroregion",
+  "region",
+  "locality",
+  "localadmin",
+  "macrocounty",
+  "county",
+  "macrohood",
+  "borough",
+  "neighbourhood",
+  "microhood",
+  "disputed",
+  "postalcode",
+  "ocean",
+  "marinearea"
+]

test/ciao/reverse/layers_alias_coarse.coffee

@@ -31,6 +31,7 @@ should.not.exist json.geocoding.warnings
 #? inputs
 json.geocoding.query['size'].should.eql 10
 json.geocoding.query.layers.should.eql [ "continent",
+  "empire",
   "country",
   "dependency",
   "macroregion",
@@ -44,5 +45,7 @@ json.geocoding.query.layers.should.eql [ "continent",
   "neighbourhood",
   "microhood",
   "disputed",
-  "postalcode"
+  "postalcode",
+  "ocean",
+  "marinearea"
 ]

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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? 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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings

test/ciao/reverse/sources_multiple.coffee

@@ -1,6 +1,6 @@
 
 #> sources filter
-path: '/v1/reverse?point.lat=1&point.lon=2&sources=openstreetmap,geonames'
+path: '/v1/reverse?point.lat=1&point.lon=2&sources=openstreetmap,openaddresses'
 
 #? 200 ok
 response.statusCode.should.be.equal 200
@@ -30,4 +30,4 @@ should.not.exist json.geocoding.warnings
 
 #? inputs
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query.sources.should.eql ["openstreetmap", "geonames"]
+json.geocoding.query.sources.should.eql ["openstreetmap", "openaddresses"]

test/ciao/search/layers_alias_coarse.coffee

@@ -32,6 +32,7 @@ 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 [ "continent",
+  "empire",
   "country",
   "dependency",
   "macroregion",
@@ -45,5 +46,7 @@ json.geocoding.query.layers.should.eql [ "continent",
   "neighbourhood",
   "microhood",
   "disputed",
-  "postalcode"
+  "postalcode",
+  "ocean",
+  "marinearea"
 ]

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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? 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,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,dependency,macrocounty,macrohood,microhood,disputed,postalcode' ]
+json.geocoding.errors.should.eql [ '\'notlayer\' is an invalid layers parameter. Valid options: coarse,address,venue,street,country,macroregion,region,county,localadmin,locality,borough,neighbourhood,continent,empire,dependency,macrocounty,macrohood,microhood,disputed,postalcode,ocean,marinearea' ]
 
 #? expected warnings
 should.not.exist json.geocoding.warnings