cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #603 from CartoDB/development

Browse Source 
Change HERE batch URL
This commit is contained in:
Antonio Carlón 2020-09-23 12:06:26 +02:00 committed by GitHub
commit eca8d1b428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/main.yml vendored
View File

@ -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:

5
NEWS.md
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 Apr 7th, 2020
============= =============
* Version `0.30.0` of the client extension * Version `0.30.0` of the client extension

2
server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py
View File

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

2
server/lib/python/cartodb_services/setup.py
View File

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

10
test/integration/test_street_functions.py
View File

@ -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)