Merge branch 'development' into bug/ch102254/ibicarto1-issues-when-geocoding-through-cartoframes
This commit is contained in:
commit
f2dcd4453c
3
.github/workflows/main.yml
vendored
3
.github/workflows/main.yml
vendored
@ -12,6 +12,9 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
|
|
||||||
|
- name: Set CLOUDSDK_PYTHON path
|
||||||
|
run: echo '::set-env name=CLOUDSDK_PYTHON::/usr/bin/python'
|
||||||
|
|
||||||
- name: Setup gcloud authentication
|
- name: Setup gcloud authentication
|
||||||
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
|
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
|
||||||
with:
|
with:
|
||||||
|
@ -280,18 +280,18 @@ class TestBulkStreetFunctions(TestStreetFunctionsSetUp):
|
|||||||
def test_templating_geocoding(self):
|
def test_templating_geocoding(self):
|
||||||
query = "SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
|
query = "SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
|
||||||
"cdb_dataservices_client.cdb_bulk_geocode_street_point(" \
|
"cdb_dataservices_client.cdb_bulk_geocode_street_point(" \
|
||||||
"'select 1 as cartodb_id, ''Logroño'' as city', " \
|
"'select 1 as cartodb_id, ''Valladolid'' as city', " \
|
||||||
"'city || '', '' || ''Spain''') " \
|
"'city || '', '' || ''Spain''') " \
|
||||||
"UNION " \
|
"UNION " \
|
||||||
"SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
|
"SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
|
||||||
"cdb_dataservices_client.cdb_bulk_geocode_street_point(" \
|
"cdb_dataservices_client.cdb_bulk_geocode_street_point(" \
|
||||||
"'select 2 as cartodb_id, ''Logroño'' as city', " \
|
"'select 2 as cartodb_id, ''Valladolid'' as city', " \
|
||||||
"'city || '', '' || ''Argentina''')"
|
"'city || '', '' || ''Mexico''')"
|
||||||
response = self._run_authenticated(query)
|
response = self._run_authenticated(query)
|
||||||
|
|
||||||
points_by_cartodb_id = {
|
points_by_cartodb_id = {
|
||||||
1: self.fixture_points['Logroño, Spain'],
|
1: self.fixture_points['Valladolid, Spain'],
|
||||||
2: self.fixture_points['Logroño, Argentina']
|
2: self.fixture_points['Valladolid, Mexico']
|
||||||
}
|
}
|
||||||
self.assert_close_points(self._x_y_by_cartodb_id(response), points_by_cartodb_id)
|
self.assert_close_points(self._x_y_by_cartodb_id(response), points_by_cartodb_id)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user