Extract EMPTY_RESPONSE
This commit is contained in:
@@ -9,6 +9,8 @@ import json
|
|||||||
PRECISION_PRECISE = 'precise'
|
PRECISION_PRECISE = 'precise'
|
||||||
PRECISION_INTERPOLATED = 'interpolated'
|
PRECISION_INTERPOLATED = 'interpolated'
|
||||||
|
|
||||||
|
EMPTY_RESPONSE = [[], {}]
|
||||||
|
|
||||||
|
|
||||||
def geocoder_metadata(relevance, precision, match_types):
|
def geocoder_metadata(relevance, precision, match_types):
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -4,11 +4,10 @@
|
|||||||
from urlparse import parse_qs
|
from urlparse import parse_qs
|
||||||
|
|
||||||
from exceptions import MalformedResult
|
from exceptions import MalformedResult
|
||||||
from cartodb_services.geocoder import compose_address, geocoder_metadata, PRECISION_PRECISE, PRECISION_INTERPOLATED
|
from cartodb_services.geocoder import compose_address, geocoder_metadata, PRECISION_PRECISE, PRECISION_INTERPOLATED, EMPTY_RESPONSE
|
||||||
from cartodb_services.google.exceptions import InvalidGoogleCredentials
|
from cartodb_services.google.exceptions import InvalidGoogleCredentials
|
||||||
from client_factory import GoogleMapsClientFactory
|
from client_factory import GoogleMapsClientFactory
|
||||||
|
|
||||||
EMPTY_RESPONSE = [[], {}]
|
|
||||||
PARTIAL_FACTOR = 0.8
|
PARTIAL_FACTOR = 0.8
|
||||||
RELEVANCE_BY_LOCATION_TYPE = {
|
RELEVANCE_BY_LOCATION_TYPE = {
|
||||||
'ROOFTOP': 1,
|
'ROOFTOP': 1,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Python client for the Mapbox Geocoder service.
|
|||||||
import json
|
import json
|
||||||
import requests
|
import requests
|
||||||
from mapbox import Geocoder
|
from mapbox import Geocoder
|
||||||
from cartodb_services.geocoder import PRECISION_PRECISE, PRECISION_INTERPOLATED, geocoder_metadata
|
from cartodb_services.geocoder import PRECISION_PRECISE, PRECISION_INTERPOLATED, geocoder_metadata, EMPTY_RESPONSE
|
||||||
from cartodb_services.metrics import Traceable
|
from cartodb_services.metrics import Traceable
|
||||||
from cartodb_services.tools.exceptions import ServiceException
|
from cartodb_services.tools.exceptions import ServiceException
|
||||||
from cartodb_services.tools.qps import qps_retry
|
from cartodb_services.tools.qps import qps_retry
|
||||||
@@ -23,8 +23,6 @@ ENTRY_COORDINATES = 'coordinates'
|
|||||||
ENTRY_TYPE = 'type'
|
ENTRY_TYPE = 'type'
|
||||||
TYPE_POINT = 'Point'
|
TYPE_POINT = 'Point'
|
||||||
|
|
||||||
EMPTY_RESPONSE = [[], {}]
|
|
||||||
|
|
||||||
MATCH_TYPE_BY_MATCH_LEVEL = {
|
MATCH_TYPE_BY_MATCH_LEVEL = {
|
||||||
'poi': 'point_of_interest',
|
'poi': 'point_of_interest',
|
||||||
'poi.landmark': 'point_of_interest',
|
'poi.landmark': 'point_of_interest',
|
||||||
@@ -154,6 +152,7 @@ class MapboxGeocoder(Traceable):
|
|||||||
try:
|
try:
|
||||||
free_search = ';'.join([self._escape(fs) for fs in free_searches])
|
free_search = ';'.join([self._escape(fs) for fs in free_searches])
|
||||||
response = self._geocoder.forward(address=free_search.decode('utf-8'),
|
response = self._geocoder.forward(address=free_search.decode('utf-8'),
|
||||||
|
limit=1,
|
||||||
country=country)
|
country=country)
|
||||||
|
|
||||||
if response.status_code == requests.codes.ok:
|
if response.status_code == requests.codes.ok:
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import json
|
|||||||
import requests
|
import requests
|
||||||
from uritemplate import URITemplate
|
from uritemplate import URITemplate
|
||||||
from math import tanh
|
from math import tanh
|
||||||
from cartodb_services.geocoder import PRECISION_PRECISE, PRECISION_INTERPOLATED, geocoder_metadata
|
from cartodb_services.geocoder import PRECISION_PRECISE, PRECISION_INTERPOLATED, geocoder_metadata, EMPTY_RESPONSE
|
||||||
from cartodb_services.metrics import Traceable
|
from cartodb_services.metrics import Traceable
|
||||||
from cartodb_services.tools.exceptions import ServiceException
|
from cartodb_services.tools.exceptions import ServiceException
|
||||||
from cartodb_services.tools.qps import qps_retry
|
from cartodb_services.tools.qps import qps_retry
|
||||||
@@ -20,7 +20,6 @@ ENTRY_RESULTS = 'results'
|
|||||||
ENTRY_POSITION = 'position'
|
ENTRY_POSITION = 'position'
|
||||||
ENTRY_LON = 'lon'
|
ENTRY_LON = 'lon'
|
||||||
ENTRY_LAT = 'lat'
|
ENTRY_LAT = 'lat'
|
||||||
EMPTY_RESPONSE = [[], {}]
|
|
||||||
|
|
||||||
SCORE_NORMALIZATION_FACTOR = 0.15
|
SCORE_NORMALIZATION_FACTOR = 0.15
|
||||||
PRECISION_SCORE_THRESHOLD = 0.5
|
PRECISION_SCORE_THRESHOLD = 0.5
|
||||||
|
|||||||
Reference in New Issue
Block a user