From 6280ca5d3618e7693e5ad491b75bb4b40d5ec697 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 22 Dec 2012 10:19:49 -0600 Subject: [PATCH] return geo data in text always (since not all support json) --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 26877506..f1b515dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.1+timestamp.2012.12.22.10.10.12 +Version 2.4.1-alpha.1+timestamp.2012.12.22.10.19.08 diff --git a/gluon/dal.py b/gluon/dal.py index 2a63d12b..8ada281f 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1477,7 +1477,7 @@ class BaseAdapter(ConnectionPool): self._colnames = map(self.expand, fields) def geoexpand(field): if isinstance(field.type,str) and field.type.startswith('geometry'): - field = field.st_asgeojson() + field = field.st_astext() return self.expand(field) sql_f = ', '.join(map(geoexpand, fields)) if query: