Commit Graph

160 Commits

Author SHA1 Message Date
Andy Eschbacher
2e312464aa fixes geom_ref in where condition 2016-05-24 11:22:39 -04:00
Andy Eschbacher
3f77a384c7 adds missing comma 2016-05-24 11:06:53 -04:00
Andy Eschbacher
1ba7299fe4 adds obs_getmeasurebyid 2016-05-24 11:02:35 -04:00
John Krauss
90aa7c2417 Merge branch 'develop' into remove-geoid-from-obs_getpolygons 2016-05-20 18:00:51 -04:00
john krauss
a1bbd5ace5 Merge pull request #67 from CartoDB/iss66-cast-geom-ids-to-text
cast geom ids to text
2016-05-20 17:59:07 -04:00
Mario de Frutos
00165b17e6 Fixed wrong return for an empty element in _OBS_Get 2016-05-18 09:55:16 +02:00
Andy Eschbacher
a9d357699a Merge branch 'develop' into iss66-cast-geom-ids-to-text 2016-05-17 11:52:48 -04:00
John Krauss
3983967920 Merge branch 'develop' into get_segment_snapshot_fix 2016-05-17 11:20:32 -04:00
Andy Eschbacher
fd483b60f4 Merge branch 'develop' into iss66-cast-geom-ids-to-text 2016-05-17 11:09:10 -04:00
Andy Eschbacher
0d5e45fc98 Merge branch 'develop' into update-total-pop-column-ids 2016-05-17 08:30:02 -04:00
Mario de Frutos
f17dc6d8ff Added return statements when missing 2016-05-17 11:06:43 +02:00
Andy Eschbacher
f0baf48e85 update timespan 2016-05-16 17:50:17 -04:00
Andy Eschbacher
1a51c786d3 Merge branch 'develop' into update-total-pop-column-ids 2016-05-16 16:50:15 -04:00
Andy Eschbacher
a3bf071acb adding more recent defaults and return catches for return query 2016-05-16 16:49:48 -04:00
Andy Eschbacher
57adaf78d6 puts in data_geoid 2016-05-16 14:30:27 -04:00
Andy Eschbacher
60e716878f template geoid 2016-05-16 14:00:04 -04:00
Andy Eschbacher
1e0b0a181c removing geoid from obs_getpolygons 2016-05-16 13:32:55 -04:00
Mario de Frutos
75c8e052a1 Fixed more casts to text 2016-05-16 18:01:53 +02:00
Mario de Frutos
4536de681e Cast aggregate to text 2016-05-16 17:53:58 +02:00
Andy Eschbacher
b074c1194b casting return types to text 2016-05-16 11:50:12 -04:00
Andy Eschbacher
126643b84e casting to text, fixing return catch 2016-05-16 11:15:15 -04:00
Andy Eschbacher
08bbfe190a putting cast in proper place 2016-05-16 10:23:59 -04:00
Andy Eschbacher
73e768d698 cast returned values to text 2016-05-16 10:21:32 -04:00
Stuart Lynn
06204d471e fixing obs_getSegmentSnapshot 2016-05-13 15:40:48 -04:00
Andy Eschbacher
9ff99cbfbd updating total pop column reference 2016-05-13 11:23:10 -04:00
Andy Eschbacher
7e7f572bf1 Merge branch 'develop' into docs-768-obs-docs-structure 2016-05-13 09:36:46 -04:00
Andy Eschbacher
2c10e75af6 cast return value of obs_getboundaryid to text 2016-05-13 06:51:13 -04:00
Andy Eschbacher
4fb79c6bc4 adds missing returns to properly exit function 2016-05-12 21:32:44 -04:00
Andy Eschbacher
18eb4b8e41 casting geom_refs to text 2016-05-12 21:08:58 -04:00
Andy Eschbacher
02a4dbde57 using appropriate operators in format function 2016-05-12 15:13:50 -04:00
John Krauss
aca37666fa Merge remote-tracking branch 'origin/develop' into default-recent-timespan-weighted-geom 2016-05-12 09:51:14 -04:00
John Krauss
8e3c75a94b Merge branch 'develop' into remove-geoid-from-getboundaryid 2016-05-12 09:48:50 -04:00
John Krauss
1152eb542a Merge branch 'iss52-timespan-overuse' into develop 2016-05-12 09:47:47 -04:00
Andy Eschbacher
ebb2af249b adding back missing return; 2016-05-12 08:31:20 -04:00
Andy Eschbacher
9a7c0885bf remove words error when it's a notice 2016-05-12 08:08:13 -04:00
Andy Eschbacher
a6c395e3be remove hard-coded geoid from getgeometryid 2016-05-12 08:03:06 -04:00
John Krauss
506f9ead30 first-pass defaults to latest timespan/boundary_id 2016-05-11 18:17:48 -04:00
John Krauss
ccf61c3583 array typing issues 2016-05-11 17:59:58 -04:00
John Krauss
d1c2598167 fix bug with table alias 2016-05-11 17:57:46 -04:00
John Krauss
b2b34bfe05 default to latest if unspecified timespan/boundary id 2016-05-11 17:55:52 -04:00
John Krauss
011baaacd5 Merge branch 'develop' into default-recent-timespan-weighted-geom 2016-05-11 16:58:14 -04:00
Andy Eschbacher
b656569d51 remove unused normalize type from error reporting 2016-05-11 16:18:14 -04:00
John Krauss
aab24d00dd use data_geoid_colname for data, geom_geoid_colname for geom 2016-05-11 15:47:29 -04:00
John Krauss
56f4d2f256 fix geoid hardcode 2016-05-11 14:58:19 -04:00
Andy Eschbacher
b21ff8a65e adding errors to docs 2016-05-11 14:50:23 -04:00
Andy Eschbacher
4d60a211de fixes timespan mis-naming issue 2016-05-11 13:38:51 -04:00
Andy Eschbacher
9d3bb40877 scratch work to get _obs_columndata to return better defaults 2016-05-11 11:39:23 -04:00
Andy Eschbacher
ec1c2f8dfb removing hard-coded geoid from _obs_getpoints 2016-05-11 11:25:08 -04:00
Andy Eschbacher
7c655dcaa6 converting to point geoms 2016-05-10 15:44:58 -04:00
Andy Eschbacher
f9394129d9 add missing schema to function 2016-05-10 15:21:58 -04:00