From 104608c6d33fc0a08e970cbba014bad94e69454f Mon Sep 17 00:00:00 2001 From: John Krauss Date: Mon, 19 Sep 2016 16:18:43 +0000 Subject: [PATCH] Add point to make sure CA data is present --- src/python/test/autotest.py | 42 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/python/test/autotest.py b/src/python/test/autotest.py index effdf4a..f9c41df 100644 --- a/src/python/test/autotest.py +++ b/src/python/test/autotest.py @@ -62,25 +62,27 @@ SKIP_COLUMNS = set([ u'mx.inegi_columns.POB58', ]) -def default_geometry_id(column_id): - ''' - Returns default test point for the column_id. - ''' - if column_id == 'whosonfirst.wof_disputed_geom': - return 'ST_SetSRID(ST_MakePoint(76.57, 33.78), 4326)' - elif column_id == 'whosonfirst.wof_marinearea_geom': - return 'ST_SetSRID(ST_MakePoint(-68.47, 43.33), 4326)' - elif column_id in ('us.census.tiger.school_district_elementary', - 'us.census.tiger.school_district_secondary', - 'us.census.tiger.school_district_elementary_clipped', - 'us.census.tiger.school_district_secondary_clipped'): - return 'ST_SetSRID(ST_MakePoint(-73.7067, 40.7025), 4326)' - elif column_id.startswith('es.ine'): - return 'ST_SetSRID(ST_MakePoint(-2.51141249535454, 42.8226119029222), 4326)' - elif column_id.startswith('us.zillow'): - return 'ST_SetSRID(ST_MakePoint(-81.3544048197256, 28.3305906291771), 4326)' - else: - return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)' +#def default_geometry_id(column_id): +# ''' +# Returns default test point for the column_id. +# ''' +# if column_id == 'whosonfirst.wof_disputed_geom': +# return 'ST_SetSRID(ST_MakePoint(76.57, 33.78), 4326)' +# elif column_id == 'whosonfirst.wof_marinearea_geom': +# return 'ST_SetSRID(ST_MakePoint(-68.47, 43.33), 4326)' +# elif column_id in ('us.census.tiger.school_district_elementary', +# 'us.census.tiger.school_district_secondary', +# 'us.census.tiger.school_district_elementary_clipped', +# 'us.census.tiger.school_district_secondary_clipped'): +# return 'ST_SetSRID(ST_MakePoint(-73.7067, 40.7025), 4326)' +# elif column_id.startswith('es.ine'): +# return 'ST_SetSRID(ST_MakePoint(-2.51141249535454, 42.8226119029222), 4326)' +# elif column_id.startswith('us.zillow'): +# return 'ST_SetSRID(ST_MakePoint(-81.3544048197256, 28.3305906291771), 4326)' +# elif column_id.startswith('ca.'): +# return '' +# else: +# return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)' def default_point(column_id): @@ -107,6 +109,8 @@ def default_point(column_id): return 'ST_SetSRID(ST_MakePoint(-81.3544048197256, 28.3305906291771), 4326)' elif column_id.startswith('mx.'): return 'ST_SetSRID(ST_MakePoint(-99.17019367218018, 19.41347699386547), 4326)' + elif column_id.startswith('ca.'): + return 'ST_SetSRID(ST_MakePoint(-79.39716339111328, 43.65694347778308), 4326)' else: return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)'