From 9856adb7ce6ed9d254473b629ec8603f276e74e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Wed, 4 Jul 2018 12:32:52 +0200 Subject: [PATCH] Explicit NotImplementedError --- .../python/cartodb_services/cartodb_services/geocoder.py | 8 +++++++- .../cartodb_services/here/bulk_geocoder.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/geocoder.py b/server/lib/python/cartodb_services/cartodb_services/geocoder.py index d82768a..d3c1c60 100644 --- a/server/lib/python/cartodb_services/cartodb_services/geocoder.py +++ b/server/lib/python/cartodb_services/cartodb_services/geocoder.py @@ -47,7 +47,7 @@ StreetGeocoderSearch = namedtuple('StreetGeocoderSearch', 'id address city state class StreetPointBulkGeocoder: """ Classes extending StreetPointBulkGeocoder should implement: - * _bulk_geocode(decoded_searches) + * _bulk_geocode(street_geocoder_searches) """ SEARCH_KEYS = ['id', 'address', 'city', 'state', 'country'] @@ -74,3 +74,9 @@ class StreetPointBulkGeocoder: StreetGeocoderSearch(search_id, address, city, state, country)) return self._bulk_geocode(street_geocoder_searches) + + def _bulk_geocode(self, street_geocoder_searches): + """ + Subclasses must implement _bulk_geocode + """ + raise NotImplementedError('Subclasses must implement _bulk_geocode') diff --git a/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py b/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py index 3a28968..dfc017b 100644 --- a/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py +++ b/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py @@ -16,12 +16,12 @@ HereJobStatus = namedtuple('HereJobStatus', 'total_count processed_count status' class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder): BATCH_URL = 'https://batch.geocoder.cit.api.here.com/6.2/jobs' - MAX_BATCH_SIZE = 1000000 # From the docs + MAX_BATCH_SIZE = 1000000 # From the docs # https://developer.here.com/documentation/batch-geocoder/topics/read-batch-request-output.html META_COLS = ['relevance', 'matchType', 'matchCode', 'matchLevel', 'matchQualityStreet'] MAX_STALLED_RETRIES = 100 BATCH_RETRY_SLEEP_S = 5 - MIN_BATCHED_SEARCH = 100 # Under this, serial will be used + MIN_BATCHED_SEARCH = 100 # Under this, serial will be used JOB_FINAL_STATES = ['completed', 'cancelled', 'deleted', 'failed'] def __init__(self, app_id, app_code, logger, service_params=None, maxresults=HereMapsGeocoder.DEFAULT_MAXRESULTS):