Commit Graph

601 Commits

Author SHA1 Message Date
Andy Eschbacher
ea8b212d45 adding missing header formatting for test 2016-05-03 17:04:18 -04:00
Andy Eschbacher
1b3e8f52e1 fixing tests after adding new fixture data 2016-05-03 17:00:15 -04:00
Andy Eschbacher
199f090d7b fix test after adding more fixture data 2016-05-03 16:51:57 -04:00
Andy Eschbacher
59b5a09b32 adding all of brooklyn to segments fixtures 2016-05-03 16:41:08 -04:00
John Krauss
050398bc84 eliminate extra quotes 2016-05-03 16:32:52 -04:00
John Krauss
fe7035c702 Merge branch 'add-boundary-bbox-functions' into eliminate-quotes-in-ids 2016-05-03 16:25:55 -04:00
John Krauss
cccf2a6615 fix slight numeric differences 2016-05-03 15:19:46 -04:00
John Krauss
4125f05b28 fix expectations 2016-05-03 14:31:00 -04:00
John Krauss
998d6e742c fix expectations 2016-05-03 14:29:13 -04:00
John Krauss
47b2227453 fix obs_search signature & tests 2016-05-03 14:27:36 -04:00
John Krauss
685cb21779 fix broken columns metadata fixture and some other expectations 2016-05-03 14:23:26 -04:00
John Krauss
7f2d675602 eliminate quotes in IDs 2016-05-03 14:10:47 -04:00
Andy Eschbacher
c6ad6b3c08 boundary expected test results 2016-05-02 15:42:22 -04:00
Andy Eschbacher
2d635db39b adding tests for boundary functions 2016-05-02 15:40:43 -04:00
Andy Eschbacher
9601aab581 move misplaced todo; add missing declared var 2016-05-02 14:18:53 -04:00
Andy Eschbacher
2200b2e437 extracting getboundariesbybbox to interal, more general function 2016-05-02 12:12:49 -04:00
Andy Eschbacher
57fe6862b0 small edits 2016-05-02 08:55:01 -04:00
Andy Eschbacher
7556e43b22 change return name of boundaries to the_geom 2016-04-29 14:02:00 -07:00
Andy Eschbacher
530ce4e61e changing overlap default to intersects 2016-04-29 08:52:05 -07:00
Andy Eschbacher
ac3574b98b adding user-selected overlap methods 2016-04-28 16:45:41 -07:00
Andy Eschbacher
2325f97684 formatting 2016-04-28 16:33:07 -07:00
Andy Eschbacher
ab93ff4ec0 adding _obs_getgeometrymetadata function 2016-04-28 16:25:10 -07:00
Andy Eschbacher
0ba66c8f31 adding point and radius functions 2016-04-28 12:05:36 -07:00
Andy Eschbacher
1a19e33877 adding boundaries by bbox functions 2016-04-28 11:14:15 -07:00
John Krauss
502ffca6ec increment version 2016-04-28 13:38:01 -04:00
John Krauss
cdf70ea545 fix tests 2016-04-28 13:28:38 -04:00
Andy Eschbacher
d5e67b9fe1 updating getGeometry* to getBoundary* 2016-04-27 13:07:19 -07:00
Andy Eschbacher
6230e52d98 quashing more cdb_latlng 2016-04-27 11:09:47 -07:00
Andy Eschbacher
a9d084e250 removing cdb_latlng from tests 2016-04-27 10:54:54 -07:00
Andy Eschbacher
11df52dc3b remove cartodb dependency 2016-04-27 10:28:53 -07:00
John Krauss
8e38cafe87 fix to work with little area 2016-04-25 19:13:07 -04:00
John Krauss
4ad485984c fix expectations & fixture metadata 2016-04-25 19:08:29 -04:00
John Krauss
236ad00a26 fix bug in drop_fixtures 2016-04-25 18:59:01 -04:00
John Krauss
73ab1ea58a add new fixture 2016-04-25 18:55:29 -04:00
John Krauss
dc66ec40c4 fix nullvalue miscounting 2016-04-25 18:29:10 -04:00
John Krauss
d686b6b436 fix namespace issue 2016-04-25 18:20:26 -04:00
John Krauss
c9c5509f6b more expectation fixes 2016-04-25 18:00:51 -04:00
John Krauss
2152f97c9d fixing some bugs introduced by merge into tests 2016-04-25 17:58:36 -04:00
John Krauss
12610e8a8a adjust getmeasure and getcategory to work with json 2016-04-25 17:55:40 -04:00
John Krauss
f2d71fb5a0 fix signature bugs 2016-04-25 16:40:25 -04:00
John Krauss
647ebf9255 fix signature bugs 2016-04-25 16:39:23 -04:00
John Krauss
10fc4f56f0 fix bug with variable declaration 2016-04-25 16:31:06 -04:00
John Krauss
108fa9cc56 Merge branch 'release_v1_api_functions' into release_v1_api_functions_aug_use 2016-04-25 16:25:11 -04:00
John Krauss
0274337ded include both carriage returns and newlines in test expectation 2016-04-25 16:15:54 -04:00
John Krauss
34e2fdd284 carriage return for multiline 2016-04-25 16:10:10 -04:00
John Krauss
c45b2cfdd5 fixing test errors 2016-04-25 15:49:59 -04:00
John Krauss
972b9b941f Merge branch 'release_v1_api_functions' into release_v1_api_functions_add_boundary_functions 2016-04-25 15:41:32 -04:00
John Krauss
4e87eae904 Merge branch 'release_v1_api_functions' into get_obs_json_version 2016-04-25 15:35:49 -04:00
John Krauss
b93ea03786 update tests for segmentation to work with JSON 2016-04-25 15:31:39 -04:00
John Krauss
3e99b2deeb add in missing test 2016-04-25 15:19:38 -04:00
John Krauss
0d811f6eb3 uncomment some public-facing code 2016-04-25 15:10:09 -04:00
John Krauss
0535d3e305 fixes for first test in 41 2016-04-25 15:00:56 -04:00
John Krauss
82a838ff74 whitespace fixes 2016-04-25 14:56:45 -04:00
Stuart Lynn
21d306898b typo 2016-04-25 13:24:39 -04:00
Stuart Lynn
ace34f6ad8 removing table returning census snapshot function for json returning one for now 2016-04-25 10:45:54 -04:00
Stuart Lynn
20ec7ef25a whitespace fix 2016-04-25 10:18:18 -04:00
Stuart Lynn
511a15d993 removing extra test statment 2016-04-25 10:15:08 -04:00
Stuart Lynn
07b678e448 test for obs get census 2016-04-25 10:12:43 -04:00
Stuart Lynn
68f5bce80b updating get census functions to work with new json internals 2016-04-25 09:52:34 -04:00
Stuart Lynn
6709ce1589 removing extra json in function causing bug 2016-04-25 09:24:25 -04:00
Andy Eschbacher
55bbe55b4a adding tests for getgeometry* 2016-04-22 21:21:18 -04:00
Andy Eschbacher
0ab7982727 adding expected out for getgeometry* functions 2016-04-22 21:20:43 -04:00
Andy Eschbacher
18445d7755 adding better comments and tidying up code 2016-04-22 21:19:55 -04:00
Andy Eschbacher
ebc2c6dec5 adding tests for _obs_searchtables 2016-04-22 21:19:19 -04:00
Andy Eschbacher
54c3407d49 adding fixture to load/drop scripts 2016-04-22 20:55:59 -04:00
Stuart Lynn
aa29a287d1 tests for OBS_GetCategories 2016-04-22 16:49:51 -04:00
Stuart Lynn
0406d493a7 removing extra JSON from testing 2016-04-22 16:49:38 -04:00
Stuart Lynn
a9b22caadf updating OBS_GetCategories to json internals 2016-04-22 16:40:21 -04:00
Stuart Lynn
2c46a72038 bug fix 2016-04-22 16:14:56 -04:00
Stuart Lynn
7782bdeec2 adding tests fro new json returning get methods 2016-04-22 16:10:41 -04:00
Stuart Lynn
69ac0d25f2 Adding tests for new json returning utility functions 2016-04-22 16:10:30 -04:00
Andy Eschbacher
31609e347a adding new fixture 2016-04-22 15:48:07 -04:00
Andy Eschbacher
6fa7bcd871 adding expected for getgeom functions 2016-04-22 15:08:34 -04:00
Stuart Lynn
3394483a45 migrating OBS_GET, OBS_GetPoints, OBS_GetPolygons and OBS_GetMeasure to all use json internals 2016-04-22 14:45:22 -04:00
Stuart Lynn
7659ededaa Changing OBS_GetColumnData to return json and more metadata 2016-04-22 14:43:56 -04:00
John Krauss
a8829e76da fix expectations 2016-04-22 13:55:41 -04:00
John Krauss
7e9047eaf0 first pass getcategories & tests 2016-04-22 13:52:53 -04:00
John Krauss
830a65b93f remove internal use of json 2016-04-22 12:28:16 -04:00
John Krauss
22549206c2 return numeric instead of json for obs_getmeasure and obs_getuscensusmeasure 2016-04-22 12:23:14 -04:00
John Krauss
0baa3b4a33 updating expectations 2016-04-22 12:15:58 -04:00
John Krauss
0221379606 fix missing tabs 2016-04-22 12:01:45 -04:00
John Krauss
893002e6c0 add obs_column_tag and obs_tag fixtures 2016-04-22 11:52:47 -04:00
John Krauss
8268044c2f basic tests 2016-04-21 22:43:00 -04:00
John Krauss
74e4e5877a first pass obs_getuscensusmeasure functioning 2016-04-21 22:40:40 -04:00
Andy Eschbacher
6d30ee352c adding schema 2016-04-21 16:29:27 -04:00
Andy Eschbacher
17267c5894 adding schema hard-coded to function names 2016-04-21 16:22:32 -04:00
Andy Eschbacher
a2a0a6f3b7 harmonizing functions with timespan 2016-04-21 16:19:51 -04:00
Stuart Lynn
1e625ce3ef Updated version of OBS_Get to support json returning 2016-04-21 15:18:39 -04:00
Stuart Lynn
00d43a7812 Updating OBS_ColumnData to support more info 2016-04-21 15:16:04 -04:00
Andy Eschbacher
e119e0ddda make search_tables a table returning function 2016-04-21 15:13:02 -04:00
John Krauss
516ac1e358 Merge branch 'release_v1_api_functions' into release_v1_api_functions_aug_use 2016-04-21 14:22:41 -04:00
John Krauss
5411079553 fix expectations 2016-04-21 14:20:16 -04:00
John Krauss
6fd8a43e44 adding standardizemeasurename 2016-04-21 14:17:31 -04:00
John Krauss
f5e2ae6273 updated expectations 2016-04-21 13:57:08 -04:00
John Krauss
be20b052ce first-pass working denominator for getmeasure 2016-04-21 13:54:09 -04:00
John Krauss
b16a2ca6a8 Merge remote-tracking branch 'origin/release_v1_api_functions' into release_v1_api_functions_aug_use 2016-04-21 12:32:34 -04:00
john krauss
06232b235a Merge pull request #21 from CartoDB/denominator
adding _OBS_GetRelatedColumn function
2016-04-21 12:31:31 -04:00
John Krauss
afd1be30b5 fixing whitespace 2016-04-21 12:30:50 -04:00
John Krauss
90a944070d more test and whitespace fixes 2016-04-21 12:26:55 -04:00
John Krauss
b8148768b8 fix whitespace and bug in test call 2016-04-21 12:22:20 -04:00
Stuart Lynn
6684c67e61 updating function name 2016-04-21 12:14:30 -04:00
John Krauss
06290fedf7 matching expectations 2016-04-21 11:41:52 -04:00
John Krauss
722b9404dc tests for getpopulation 2016-04-21 11:39:44 -04:00
John Krauss
24eeaa787d first-pass obs_getpopulation 2016-04-21 11:33:37 -04:00
Andy Eschbacher
e72583e15c formatting 2016-04-21 09:48:43 -04:00
Andy Eschbacher
16d65d01f3 finishing getgeometrybyid 2016-04-21 09:48:20 -04:00
Stuart Lynn
c10da16d55 adding _OBS_GetRelatedColumn function 2016-04-20 17:24:07 -04:00
john krauss
17db441b6e Merge pull request #19 from CartoDB/add_back_search_functions
Adding OBS_search function and tests
2016-04-20 17:16:45 -04:00
John Krauss
75f4e6d412 add trailing whitespace 2016-04-20 17:11:12 -04:00
John Krauss
1702a392b3 add trailing whitespace 2016-04-20 17:08:56 -04:00
John Krauss
30c1ed08c0 adjusting expectations 2016-04-20 17:05:29 -04:00
John Krauss
39e9ff32e5 missing "and" 2016-04-20 16:57:07 -04:00
John Krauss
851419a927 fix duplicate var name issue 2016-04-20 16:49:41 -04:00
John Krauss
a6655003aa fix duplicate var name issue 2016-04-20 16:47:40 -04:00
John Krauss
6696d4fcf5 adding id to return for obs_search, fixing OBS_GetAvailableBoundaries 2016-04-20 16:45:24 -04:00
John Krauss
594c6b5d80 test_point => TestPoint 2016-04-20 16:23:57 -04:00
John Krauss
73f4a682cf fix whitespace and testpoint 2016-04-20 16:22:13 -04:00
John Krauss
1f6347aa23 adjusting expectations to reflect reality of the situation 2016-04-20 16:18:20 -04:00
John Krauss
d016c4b4bd remove typo in sql def 2016-04-20 16:15:39 -04:00
John Krauss
83119d0720 fix expectation typo 2016-04-20 16:12:23 -04:00
John Krauss
e90a0c1900 tautolotest 2016-04-20 16:03:14 -04:00
John Krauss
5e69297836 first pass obs_getmeasure 2016-04-20 15:51:19 -04:00
Stuart Lynn
b8d42a41dd adding OBS_GetAvailableBoundaries 2016-04-20 15:28:45 -04:00
Andy Eschbacher
8f161c1e68 debugged getgeometry and getgeometryid 2016-04-20 15:13:22 -04:00
Stuart Lynn
a29876f47f making obs_search a bit more secure 2016-04-20 13:42:13 -04:00
Stuart Lynn
6e9f4a03d1 Adding OBS_search function and tests 2016-04-20 13:28:27 -04:00
Rafa de la Torre
d6077457dd Revert "Make OBS_GetDemographicSnapshot return json"
This reverts commit 987cfde7b6.
2016-04-20 11:12:41 +02:00
Rafa de la Torre
987cfde7b6 Make OBS_GetDemographicSnapshot return json 2016-04-19 17:54:56 +02:00
Carla Iriberri
077f8fedf5 Wrap functions in row_to_json 2016-04-19 17:31:08 +02:00
Carla Iriberri
ad55625769 Rename private functions and edit tests 2016-04-19 15:39:31 +02:00
Rafa de la Torre
e9f390526b Make expected values of observatory functions match actual ones 2016-04-19 15:13:18 +02:00
Rafa de la Torre
96b3a085b6 Remove fixture from metadata not present in data 2016-04-19 15:12:00 +02:00
Rafa de la Torre
10a175ed0b Fully qualify function names 2016-04-19 15:09:17 +02:00
Rafa de la Torre
b1b69113a2 Fully qualify function names 2016-04-19 14:59:54 +02:00
Rafa de la Torre
67ae37fb67 Remove search_path modification from tests 2016-04-19 14:44:19 +02:00
Rafa de la Torre
66f89e0728 Fixed observatory utility tests after merge 2016-04-19 14:41:41 +02:00
Rafa de la Torre
a999c6e99c Some test fixes after merging branches 2016-04-19 14:40:11 +02:00
Rafa de la Torre
7a215db14f Merge remote-tracking branch 'origin/QLIK' into qlik-alfa-plproxy
Conflicts:
	src/pg/test/expected/40_observatory_utility_test.out
	src/pg/test/sql/40_observatory_utility_test.sql
2016-04-19 14:26:41 +02:00
Carla Iriberri
7bc37861a5 Make tests work in Postgres 9.3 2016-04-19 14:15:33 +02:00
Rafa de la Torre
55ae84362a Fix utility tests 2016-04-19 14:04:42 +02:00
Rafa de la Torre
a533eb703e Use schema explicitly from within extension 2016-04-19 14:04:12 +02:00
Andy Eschbacher
4977b94281 more robust tests around null island 2016-04-14 16:35:30 -04:00
Andy Eschbacher
c1fb6c3694 adding null cases to augmentation 2016-04-14 16:25:09 -04:00
Andy Eschbacher
f72754e1d5 fixing case where point doesn't intersect so area is null 2016-04-14 16:22:32 -04:00
Andy Eschbacher
c434cacd10 adding null cases 2016-04-14 14:52:23 -04:00
Andy Eschbacher
4b6b311823 augmentation tests 2016-04-14 14:27:56 -04:00
Andy Eschbacher
3ee448016a whitespace 2016-04-14 14:27:34 -04:00
Andy Eschbacher
874a397d3b adding percentile fixtures 2016-04-14 14:26:19 -04:00
Andy Eschbacher
3468d6e5e9 add new fixtures to process 2016-04-14 13:23:40 -04:00
Andy Eschbacher
094b2da61d adding new data fixtures subset 2016-04-14 13:23:04 -04:00
Andy Eschbacher
3beaf710a7 minor changes 2016-04-14 13:22:44 -04:00
Andy Eschbacher
0bb304d43d dropped numbering of fixture processing files 2016-04-14 10:48:11 -04:00
Andy Eschbacher
9c1d761f55 moving to load_fixtures instead of tables 2016-04-14 10:39:05 -04:00
Andy Eschbacher
44645ef1c6 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-14 10:38:26 -04:00
Andy Eschbacher
f91c540bc3 adding fixture processing scripts to test 2016-04-14 10:30:56 -04:00
Andy Eschbacher
48fd02c689 fixing table name 2016-04-14 10:30:07 -04:00
Andy Eschbacher
863f26716e breaking out fixture processing files into two steps 2016-04-14 10:29:32 -04:00
Andy Eschbacher
4597896689 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-14 10:00:20 -04:00
Rafa de la Torre
eeded3d420 Load the rest of the fixtures 2016-04-14 15:53:40 +02:00
Andy Eschbacher
2f8b42e346 adding tables to load 2016-04-14 09:49:09 -04:00
Andy Eschbacher
91e1be0f8a adding tables with data 2016-04-14 09:48:46 -04:00
Rafa de la Torre
06ebc706c0 Deal with test artifacts in .gitignore files 2016-04-14 15:36:32 +02:00
Rafa de la Torre
ace8470b0c Add fixtures loading test closes #5
Avoiding duplicate code.
2016-04-14 15:32:44 +02:00
Andy Eschbacher
4f1d4c4250 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-14 08:10:45 -04:00
Andy Eschbacher
b3b4c8e4c3 adding utils test 2016-04-14 08:10:33 -04:00
John Krauss
e194e91f78 Merge remote-tracking branch 'origin/QLIK' into QLIK 2016-04-13 16:11:45 -04:00
John Krauss
384a63b8a2 fixing bug with segments pulling at wrong geom level by default 2016-04-13 16:11:26 -04:00
Andy Eschbacher
9726053dd6 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 15:54:42 -04:00
Andy Eschbacher
9a398530b3 addding expected results 2016-04-13 15:54:30 -04:00
John Krauss
97f73b11e0 removing pop_5_years_and_over that is missing from block group, stub out land_area 2016-04-13 15:41:47 -04:00
Stuart Lynn
6ee0b99bd4 Fixing overlapping point issue 2016-04-13 15:10:14 -04:00
John Krauss
38a784b15c bring back lost obs_getcolumndata work from 94169e6874f2a79f2b6ed4d58ad0fd542a4ec64e 2016-04-13 14:07:28 -04:00
Andy Eschbacher
ea183c7447 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 11:54:25 -04:00
Andy Eschbacher
7466840148 adding table for testing 2016-04-13 11:54:05 -04:00
Andy Eschbacher
04ab761e21 fix table's schema 2016-04-13 11:52:44 -04:00
John Krauss
c119a66fea segment should default to census tract 2016-04-13 11:28:56 -04:00
John Krauss
ceac78ecd8 remove block-group incompatible quantile cols 2016-04-13 11:19:45 -04:00
Stuart Lynn
69bd3b2605 Merge branch 'QLIK' of github.com:CartoDB/observatory-extension into QLIK 2016-04-13 11:17:27 -04:00
Stuart Lynn
346f381a9c Adding defaults to the OBS_GETDEMOGRAPHICSNAPSHOT 2016-04-13 11:12:29 -04:00
John Krauss
a929f2902e go back to using block_group for demographicsnapshot etc 2016-04-13 11:08:41 -04:00
John Krauss
d14ff607d3 Merge remote-tracking branch 'origin/QLIK' into QLIK 2016-04-13 11:00:34 -04:00
John Krauss
73300b6537 add missing high-income column 2016-04-13 11:00:26 -04:00
Andy Eschbacher
38e20df08b fixing return keyword error 2016-04-13 10:46:28 -04:00
Andy Eschbacher
c051fcca61 updated based on latest metadata 2016-04-13 10:43:59 -04:00
John Krauss
e89582aed5 remove columns from demographicsnapshot that do not appear at BG level 2016-04-13 10:35:53 -04:00
Andy Eschbacher
466554a139 formatting updates 2016-04-13 09:51:31 -04:00
Andy Eschbacher
044e83a40f removing unneeded comments 2016-04-13 09:33:25 -04:00
Andy Eschbacher
d01bfe7900 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 09:31:35 -04:00
Andy Eschbacher
255d13cc77 replacing exceptions with notices; returning nulls 2016-04-13 09:31:19 -04:00
Stuart Lynn
0f588452e0 Merge branch 'QLIK' of github.com:CartoDB/observatory-extension into QLIK 2016-04-12 16:57:05 -04:00
Stuart Lynn
3808ecdbce bug fixes that didn't get carried over 2016-04-12 16:56:42 -04:00
Andy Eschbacher
4892f73bab Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-12 16:13:09 -04:00
Andy Eschbacher
f9e262b210 updated to create tables to specif schema 2016-04-12 16:10:01 -04:00
Stuart Lynn
390ac27425 updating column names 2016-04-12 15:44:33 -04:00
Andy Eschbacher
80b117bd2f adding metadata data sources for tests 2016-04-12 12:59:18 -04:00
Andy Eschbacher
b1cefd8f73 fixing install test 2016-04-12 11:52:24 -04:00
John Krauss
5abb354d7d bugfix 2016-04-11 18:21:08 -04:00
John Krauss
5d9571a954 use sq km, do not filter by bounds, add segment function 2016-04-11 17:54:47 -04:00
John Krauss
e4eaa44c2d default to census tract not block group 2016-04-11 16:33:52 -04:00
John Krauss
d2ece4edd7 narrow OBS_ functions down only to what we need for QLIK 2016-04-11 15:40:14 -04:00
Rafa de la Torre
fba43cf3b5 Initial commit with what I think we need 2016-04-06 20:09:19 +02:00