Merge remote-tracking branch 'origin/develop' into default-recent-timespan-weighted-geom

src/pg/sql/42_observatory_exploration.sql

@@ -89,14 +89,15 @@ DECLARE
   timespan_query TEXT DEFAULT '';
 BEGIN
 
-  IF time_span != null THEN
-    timespan_query = format('AND timespan = %L', time_span);
+  IF timespan != NULL
+  THEN
+    timespan_query = format('AND timespan = %L', timespan);
   END IF;
 
   RETURN QUERY
   EXECUTE
   $string$
-      select
+      SELECT
         column_id,
         obs_column.description,
         timespan,
@@ -109,11 +110,11 @@ BEGIN
         observatory.OBS_column_table.column_id = observatory.obs_column.id AND
         observatory.OBS_column_table.table_id = observatory.obs_table.id
       AND
-        observatory.OBS_column.type='Geometry'
+        observatory.OBS_column.type = 'Geometry'
       AND
         $1 && bounds::box2d
   $string$ || timespan_query
-  USING geom
+  USING geom;
   RETURN;
 END
 $$ LANGUAGE plpgsql;

src/pg/sql/44_observatory_geometries.sql

@@ -113,6 +113,7 @@ AS $$
 DECLARE
   output_id text;
   target_table text;
+  geoid_colname text;
 BEGIN
 
   -- If not point, raise error
@@ -139,21 +140,33 @@ BEGIN
     LIMIT 1;
   END IF;
 
-  -- if no tables are found, raise error
+  -- if no tables are found, raise notice and return null
   IF target_table IS NULL
   THEN
-    RAISE NOTICE 'Error: No boundaries found for ''%''', boundary_id;
+    RAISE NOTICE 'No boundaries found for ''%''', boundary_id;
     RETURN NULL::text;
   END IF;
 
-  RAISE NOTICE 'target_table: %', target_table;
+  EXECUTE
+    format('SELECT ct.colname
+              FROM observatory.obs_column_to_column c2c,
+                   observatory.obs_column_table ct,
+                   observatory.obs_table t
+             WHERE c2c.reltype = ''geom_ref''
+               AND ct.column_id = c2c.source_id
+               AND ct.table_id = t.id
+               AND t.tablename = %L'
+   , target_table)
+  INTO geoid_colname;
+
+  RAISE NOTICE 'target_table: %, geoid_colname: %', target_table, geoid_colname;
 
   -- return name of geometry id column
   EXECUTE format(
-    'SELECT t.geoid
-     FROM observatory.%s As t
-     WHERE ST_Intersects($1, t.the_geom)
-     LIMIT 1', target_table)
+    'SELECT %I
+     FROM observatory.%I
+     WHERE ST_Intersects($1, the_geom)
+     LIMIT 1', geoid_colname, target_table)
   INTO output_id
   USING geom;