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

Rename mapzen_geocoder module to mapzen_geocoder_config

Browse Source
This commit is contained in:
Rafa de la Torre 2016-10-03 12:58:15 +02:00
parent b1f3405cd0
commit 86ab3abc53
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/extension/sql/20_geocode_street.sql
View File

@ -148,7 +148,7 @@ RETURNS Geometry AS $$
from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock
from cartodb_services.refactor.storage.redis_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder from cartodb_services.refactor.storage.redis_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder
from cartodb_services.refactor.storage.redis_connection import RedisConnectionBuilder from cartodb_services.refactor.storage.redis_connection import RedisConnectionBuilder
from cartodb_services.refactor.service.mapzen_geocoder import MapzenGeocoderConfigBuilder from cartodb_services.refactor.service.mapzen_geocoder_config import MapzenGeocoderConfigBuilder
from cartodb_services.refactor.core.environment import Environment from cartodb_services.refactor.core.environment import Environment
server_config_storage = InDbServerConfigStorage() server_config_storage = InDbServerConfigStorage()

5
server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder.py → server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder_config.py
View File

@ -1,6 +1,5 @@
from dateutil.parser import parse as date_parse from dateutil.parser import parse as date_parse
# TODO: rename this file
class MapzenGeocoderConfig(object): class MapzenGeocoderConfig(object):
""" """
Value object that represents the configuration needed to operate the mapzen service. Value object that represents the configuration needed to operate the mapzen service.
@ -86,7 +85,7 @@ class MapzenGeocoderConfigBuilder(object):
self._org_conf = org_conf self._org_conf = org_conf
self._username = username self._username = username
self._orgname = orgname self._orgname = orgname
def get(self): def get(self):
mapzen_server_conf = self._server_conf.get('mapzen_conf') mapzen_server_conf = self._server_conf.get('mapzen_conf')
@ -96,7 +95,7 @@ class MapzenGeocoderConfigBuilder(object):
soft_geocoding_limit = self._user_conf.get('soft_geocoding_limit') soft_geocoding_limit = self._user_conf.get('soft_geocoding_limit')
cost_per_hit=0 cost_per_hit=0
period_end_date_str = self._org_conf.get('period_end_date') or self._user_conf.get('period_end_date') period_end_date_str = self._org_conf.get('period_end_date') or self._user_conf.get('period_end_date')
period_end_date = date_parse(period_end_date_str) period_end_date = date_parse(period_end_date_str)