Skip to content

Commit

Permalink
Merge pull request #41 from GIScience/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
TimMcCauley authored Jul 31, 2018
2 parents 4f17903 + 88ea92d commit 8bd5395
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions openpoiservice/server/api/query_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from geoalchemy2.types import Geography, Geometry
from geoalchemy2.elements import WKBElement, WKTElement
from shapely import wkb
from shapely.geometry import MultiPoint
from openpoiservice.server.db_import.models import Pois, Tags, Categories
from sqlalchemy.sql.expression import type_coerce
from sqlalchemy import func, cast, Integer, ARRAY
Expand Down Expand Up @@ -236,10 +237,12 @@ def generate_geojson_features(cls, query, limit):
"""

geojson_features = []
lat_lngs = []

for q_idx, q in enumerate(query):

geometry = wkb.loads(str(q[3]), hex=True)
lat_lngs.append((geometry.x, geometry.y))

properties = dict(
osm_id=int(q[0]),
Expand All @@ -265,15 +268,14 @@ def generate_geojson_features(cls, query, limit):
properties["osm_tags"] = key_values

geojson_feature = geojson.Feature(geometry=geometry,
properties=properties
)
properties=properties)
geojson_features.append(geojson_feature)

# limit reached
if q_idx == limit - 2:
break

feature_collection = geojson.FeatureCollection(geojson_features)
feature_collection = geojson.FeatureCollection(geojson_features, bbox=MultiPoint(lat_lngs).bounds)

logger.info("Amount of features {}".format(len(geojson_features)))

Expand Down

0 comments on commit 8bd5395

Please sign in to comment.