diff --git a/IV/Makefile b/IV/Makefile index 61858b9..f5f4dbf 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -282,10 +282,6 @@ salvis-wm-vw-chaikin-50k_2COLOR = orange salvis-wm-vw-chaikin-50k_3LINESTYLE = dotted -salvis-wm-dp-chaikin-50k_1SELECT = - -salvis-wm-vw-chaikin-50k_1SELECT = - .faux_db_pre: db init.sql bash db start bash db -f init.sql diff --git a/IV/layer2img.py b/IV/layer2img.py index a4b9348..a6b6b10 100644 --- a/IV/layer2img.py +++ b/IV/layer2img.py @@ -64,6 +64,7 @@ def read_layer(select, width, maybe_quadrant): conn = psycopg2.connect(PSQL_CREDS) sql = "SELECT {way} as way1 FROM {select}".format(way=way, select=select) + return geopandas.read_postgis(sql, con=conn, geom_col='way1')