Merge pull request #639 from pmezard/update-test-ciao-layers

test/ciao: update valid layers list in reference output

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

test/ciao/reverse/boundary_circle_invalid_radius.coffee

@@ -26,14 +26,10 @@ json.features.should.be.instanceof Array
 should.exist json.geocoding.errors
 json.geocoding.errors.should.eql [ 'missing param \'boundary.circle.radius\'' ]
 
-#? expected warnings
-should.exist json.geocoding.warnings
-json.geocoding.warnings.should.eql [ 'boundary.circle is currently unsupported' ]
-
 #? inputs
 # json.geocoding.query['size'].should.eql 10
-# json.geocoding.query['point.lat'].should.eql 40.744243
+json.geocoding.query['point.lat'].should.eql 40.744243
-# json.geocoding.query['point.lon'].should.eql -73.990342
+json.geocoding.query['point.lon'].should.eql -73.990342
-# json.geocoding.query['boundary.circle.lat'].should.eql 40.744243
+should.not.exist json.geocoding.query['boundary.circle.radius']
-# json.geocoding.query['boundary.circle.lon'].should.eql -73.990342
+should.not.exist json.geocoding.query['boundary.circle.lat']
-# should.not.exist json.geocoding.query['boundary.circle.radius']
+should.not.exist json.geocoding.query['boundary.circle.lon']

test/ciao/reverse/boundary_circle_valid_radius.coffee

@@ -25,14 +25,10 @@ json.features.should.be.instanceof Array
 #? expected errors
 should.not.exist json.geocoding.errors
 
-#? expected warnings
-should.exist json.geocoding.warnings
-json.geocoding.warnings.should.eql [ 'boundary.circle is currently unsupported' ]
-
 #? inputs
-# json.geocoding.query['size'].should.eql 10
+json.geocoding.query['size'].should.eql 10
-# json.geocoding.query['point.lat'].should.eql 40.744243
+json.geocoding.query['point.lat'].should.eql 40.744243
-# json.geocoding.query['point.lon'].should.eql -73.990342
+json.geocoding.query['point.lon'].should.eql -73.990342
-# json.geocoding.query['boundary.circle.lat'].should.eql 40.744243
+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.lon'].should.eql -73.990342
-# json.geocoding.query['boundary.circle.radius'].should.eql 999.9
+json.geocoding.query['boundary.circle.radius'].should.eql 999.9

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

test/ciao/search/boundary_rect_valid.coffee

@@ -1,6 +1,6 @@
 
 #> bounding rectangle
-path: '/v1/search?text=a&boundary.rect.min_lat=-40.659&boundary.rect.max_lat=-41.614&boundary.rect.min_lon=174.612&boundary.rect.max_lon=176.333'
+path: '/v1/search?text=a&boundary.rect.max_lat=-40.659&boundary.rect.min_lat=-41.614&boundary.rect.min_lon=174.612&boundary.rect.max_lon=176.333'
 
 #? 200 ok
 response.statusCode.should.be.equal 200
@@ -31,7 +31,7 @@ should.not.exist json.geocoding.warnings
 #? inputs
 json.geocoding.query['text'].should.eql 'a'
 json.geocoding.query['size'].should.eql 10
-json.geocoding.query['boundary.rect.min_lat'].should.eql -40.659
+json.geocoding.query['boundary.rect.min_lat'].should.eql -41.614
-json.geocoding.query['boundary.rect.max_lat'].should.eql -41.614
+json.geocoding.query['boundary.rect.max_lat'].should.eql -40.659
 json.geocoding.query['boundary.rect.min_lon'].should.eql 174.612
 json.geocoding.query['boundary.rect.max_lon'].should.eql 176.333

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