Skip to content

F
flask-admin
Commit cd9304d3 authored by Serge S. Koval's avatar Serge S. Koval
Browse files
Options

Merge pull request #1035 from jmagnusson/remove-geoa-flask-sqlalchemy-dependency 

Remove Flask-SQLAlchemy dependency
parents aced0e83 6631906f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
flask_admin/contrib/geoa/typefmt.py
View file @ cd9304d3
from flask_admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS from flask_admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS
import json
from jinja2 import Markup from jinja2 import Markup
from wtforms.widgets import html_params from wtforms.widgets import html_params
from geoalchemy2.shape import to_shape from geoalchemy2.shape import to_shape
from geoalchemy2.elements import WKBElement from geoalchemy2.elements import WKBElement
from sqlalchemy import func from sqlalchemy import func
from flask import current_app
def geom_formatter(view, value): def geom_formatter(view, value):
...@@ -18,9 +16,8 @@ def geom_formatter(view, value): ...@@ -18,9 +16,8 @@ def geom_formatter(view, value):
"data-zoom": 15, "data-zoom": 15,
}) })
if value.srid is -1: if value.srid is -1:
geojson = current_app.extensions['sqlalchemy'].db.session.scalar(func.ST_AsGeoJson(value)) value.srid = 4326
else: geojson = view.model.query.with_entities(func.ST_AsGeoJSON(value)).scalar()
geojson = current_app.extensions['sqlalchemy'].db.session.scalar(func.ST_AsGeoJson(value.ST_Transform( 4326)))
return Markup('<textarea %s>%s</textarea>' % (params, geojson)) return Markup('<textarea %s>%s</textarea>' % (params, geojson))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment