Compare commits

..

13 Commits

Author SHA1 Message Date
Antonio Carlón
eca8d1b428 Merge pull request #603 from CartoDB/development
Change HERE batch URL
2020-09-23 12:06:26 +02:00
Antonio Carlón
e1e85e2391 Merge pull request #602 from CartoDB/antoniocarlon/null/bump_version
Bump Python library version
2020-09-23 11:43:54 +02:00
antoniocarlon
0f8e946461 Bump Python library version 2020-09-23 11:33:47 +02:00
Antonio Carlón
ad8a40129a Merge pull request #600 from CartoDB/bug/ch102254/ibicarto1-issues-when-geocoding-through-cartoframes
Change HERE batch endpoint
2020-09-23 11:24:34 +02:00
antoniocarlon
f2dcd4453c Merge branch 'development' into bug/ch102254/ibicarto1-issues-when-geocoding-through-cartoframes 2020-09-23 11:15:45 +02:00
Antonio Carlón
48c3718235 Merge pull request #601 from CartoDB/antoniocarlon/null/Fix_tests
Fix broken tests
2020-09-23 11:15:13 +02:00
antoniocarlon
2a1d751cf5 Change city for geocoding 2020-09-23 10:57:15 +02:00
antoniocarlon
7f87fc2e25 Define CLOUDSDK_PYTHON environment variable 2020-09-23 10:16:46 +02:00
antoniocarlon
b793c02415 hardcode GCP version 2020-09-23 09:56:28 +02:00
antoniocarlon
95bd089366 hardcode GCP version 2020-09-23 09:46:06 +02:00
antoniocarlon
dbb7248f67 hardcode GCP version 2020-09-23 09:44:04 +02:00
antoniocarlon
d527b10f22 Define CLOUDSDK_PYTHON environment variable 2020-09-23 09:18:30 +02:00
antoniocarlon
37d72b333a Change HERE batch endpoint 2020-09-23 08:18:20 +02:00
5 changed files with 15 additions and 7 deletions

View File

@@ -12,6 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Set CLOUDSDK_PYTHON path
run: echo '::set-env name=CLOUDSDK_PYTHON::/usr/bin/python'
- name: Setup gcloud authentication
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
with:

View File

@@ -1,3 +1,8 @@
Sep 23th, 2020
==============
* Version `0.23.3` of the Python library
* Change HERE batch geocoding URL
Apr 7th, 2020
=============
* Version `0.30.0` of the client extension

View File

@@ -18,7 +18,7 @@ HereJobStatus = namedtuple('HereJobStatus', 'total_count processed_count status'
class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder):
MAX_BATCH_SIZE = 1000000 # From the docs
MIN_BATCHED_SEARCH = 100 # Under this, serial will be used
BATCH_URL = 'https://batch.geocoder.cit.api.here.com/6.2/jobs'
BATCH_URL = 'https://batch.geocoder.api.here.com/6.2/jobs'
# https://developer.here.com/documentation/batch-geocoder/topics/read-batch-request-output.html
META_COLS = ['relevance', 'matchType', 'matchCode', 'matchLevel', 'matchQualityStreet']
MAX_STALLED_RETRIES = 100

View File

@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
setup(
name='cartodb_services',
version='0.23.2',
version='0.23.3',
description='CartoDB Services API Python Library',

View File

@@ -280,18 +280,18 @@ class TestBulkStreetFunctions(TestStreetFunctionsSetUp):
def test_templating_geocoding(self):
query = "SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
"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''') " \
"UNION " \
"SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \
"cdb_dataservices_client.cdb_bulk_geocode_street_point(" \
"'select 2 as cartodb_id, ''Logroño'' as city', " \
"'city || '', '' || ''Argentina''')"
"'select 2 as cartodb_id, ''Valladolid'' as city', " \
"'city || '', '' || ''Mexico''')"
response = self._run_authenticated(query)
points_by_cartodb_id = {
1: self.fixture_points['Logroño, Spain'],
2: self.fixture_points['Logroño, Argentina']
1: self.fixture_points['Valladolid, Spain'],
2: self.fixture_points['Valladolid, Mexico']
}
self.assert_close_points(self._x_y_by_cartodb_id(response), points_by_cartodb_id)