From d764f7446f54096fd784aaabec11ab9c030642e9 Mon Sep 17 00:00:00 2001 From: mehak-sachdeva Date: Thu, 9 Mar 2017 09:39:22 -0500 Subject: [PATCH] adding the spatial lag function --- src/pg/sql/21_spatial_lag.sql | 3 +-- src/py/crankshaft/crankshaft/spatial_lag/spatial_lag.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pg/sql/21_spatial_lag.sql b/src/pg/sql/21_spatial_lag.sql index 1df69cb..25acadb 100644 --- a/src/pg/sql/21_spatial_lag.sql +++ b/src/pg/sql/21_spatial_lag.sql @@ -7,11 +7,10 @@ CREATE OR REPLACE FUNCTION num_ngbrs INT, geom_col TEXT, id_col TEXT) -RETURNS TABLE (lag NUMERIC, rowid INT) +RETURNS TABLE (spatial_lag NUMERIC, rowid INT) AS $$ from crankshaft.spatial_lag import Spatial spatial = Spatial() - # TODO: use named parameters or a dictionary return spatial.spatial_lag(subquery, column_name, w_type, num_ngbrs, geom_col, id_col) $$ LANGUAGE plpythonu; diff --git a/src/py/crankshaft/crankshaft/spatial_lag/spatial_lag.py b/src/py/crankshaft/crankshaft/spatial_lag/spatial_lag.py index 947e009..4712677 100644 --- a/src/py/crankshaft/crankshaft/spatial_lag/spatial_lag.py +++ b/src/py/crankshaft/crankshaft/spatial_lag/spatial_lag.py @@ -41,6 +41,6 @@ class Spatial: # calculate spatial_lag values - lag = ps.weights.spatial_lag.lag_spatial(weight, attr_vals) + spatial_lag = ps.weights.spatial_lag.lag_spatial(weight, attr_vals) - return zip(lag, weight.id_order) + return zip(spatial_lag, weight.id_order)