cartodb4/observatory-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #208 from CartoDB/develop

Browse Source 
Release 1.1.1
This commit is contained in:
Mario de Frutos 2016-10-21 12:09:59 +02:00 committed by GitHub
commit c91fcab28c
5 changed files with 2528 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS.md
View File

@ -1,3 +1,9 @@
1.1.1 (2016-10-14)
__Improvements__
* Test points for Canada and France ([#204](https://github.com/CartoDB/observatory-extension/issues/120))
1.1.0 (2016-10-04) 1.1.0 (2016-10-04)
__Bugfixes__ __Bugfixes__

2502
release/observatory--1.1.1.sql Normal file
View File

File diff suppressed because one or more lines are too long

2
release/observatory.control
View File

@ -1,5 +1,5 @@
comment = 'CartoDB Observatory backend extension' comment = 'CartoDB Observatory backend extension'
default_version = '1.1.0' default_version = '1.1.1'
requires = 'postgis, postgres_fdw' requires = 'postgis, postgres_fdw'
superuser = true superuser = true
schema = cdb_observatory schema = cdb_observatory

2
src/pg/observatory.control
View File

@ -1,5 +1,5 @@
comment = 'CartoDB Observatory backend extension' comment = 'CartoDB Observatory backend extension'
default_version = '1.1.0' default_version = '1.1.1'
requires = 'postgis, postgres_fdw' requires = 'postgis, postgres_fdw'
superuser = true superuser = true
schema = cdb_observatory schema = cdb_observatory

19
src/python/test/autotest.py
View File

@ -111,10 +111,27 @@ def default_point(column_id):
elif column_id.startswith('mx.'): elif column_id.startswith('mx.'):
return 'ST_SetSRID(ST_MakePoint(-99.17019367218018, 19.41347699386547), 4326)' return 'ST_SetSRID(ST_MakePoint(-99.17019367218018, 19.41347699386547), 4326)'
elif column_id.startswith('ca.'): elif column_id.startswith('ca.'):
raise SkipTest('Skipping Canada until validation of data complete')
return 'ST_SetSRID(ST_MakePoint(-79.39716339111328, 43.65694347778308), 4326)' return 'ST_SetSRID(ST_MakePoint(-79.39716339111328, 43.65694347778308), 4326)'
elif column_id.startswith('th.'): elif column_id.startswith('th.'):
return 'ST_SetSRID(ST_MakePoint(100.49263000488281, 13.725377712079784), 4326)' return 'ST_SetSRID(ST_MakePoint(100.49263000488281, 13.725377712079784), 4326)'
# cols for French Guyana only
elif column_id in ('fr.insee.P12_RP_CHOS', 'fr.insee.P12_RP_HABFOR'
, 'fr.insee.P12_RP_EAUCH', 'fr.insee.P12_RP_BDWC'
, 'fr.insee.P12_RP_MIDUR', 'fr.insee.P12_RP_CLIM'
, 'fr.insee.P12_RP_MIBOIS', 'fr.insee.P12_RP_CASE'
, 'fr.insee.P12_RP_TTEGOU', 'fr.insee.P12_RP_ELEC'
, 'fr.insee.P12_ACTOCC15P_ILT45D'
, 'fr.insee.P12_RP_CHOS', 'fr.insee.P12_RP_HABFOR'
, 'fr.insee.P12_RP_EAUCH', 'fr.insee.P12_RP_BDWC'
, 'fr.insee.P12_RP_MIDUR', 'fr.insee.P12_RP_CLIM'
, 'fr.insee.P12_RP_MIBOIS', 'fr.insee.P12_RP_CASE'
, 'fr.insee.P12_RP_TTEGOU', 'fr.insee.P12_RP_ELEC'
, 'fr.insee.P12_ACTOCC15P_ILT45D'):
return 'ST_SetSRID(ST_MakePoint(-52.32908248901367, 4.938408371206558), 4326)'
elif column_id.startswith('fr'):
return 'ST_SetSRID(ST_MakePoint(2.3613739013671875, 48.860875144709475), 4326)'
elif column_id.startswith('ca'):
return 'ST_SetSRID(ST_MakePoint(-79.37965393066406, 43.65594991256823), 4326)'
else: else:
return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)' return 'ST_SetSRID(ST_MakePoint(-73.9, 40.7), 4326)'