organicmaps/borders
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix function name

Browse source
This commit is contained in:
Alexey Zakharenkov 2020-11-24 12:08:47 +03:00
parent ee5bb44583
commit baa77bd3a2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/app/borders_api.py
View file

@ -142,7 +142,7 @@ def query_bbox():
borders = fetch_borders(
table=borders_table,
simplify=simplify,
where_clause=geom_inside_bbox_sql(xmin, ymin, xmax, ymax)
where_clause=geom_intersects_bbox_sql(xmin, ymin, xmax, ymax)
)
return jsonify(
status='ok',
@ -166,7 +166,7 @@ def query_small_in_bbox():
FROM (
SELECT id, name, (ST_Dump(geom)).geom AS ring
FROM {borders_table}
WHERE {geom_inside_bbox_sql(xmin, ymin, xmax, ymax)}
WHERE {geom_intersects_bbox_sql(xmin, ymin, xmax, ymax)}
) g
WHERE ST_Area(geography(ring))/1E6 < %s
""", (config.SMALL_KM2,)
@ -729,7 +729,7 @@ def make_osm():
borders_table = config.OTHER_TABLES.get(borders_table, config.BORDERS_TABLE)
borders = fetch_borders(
table=borders_table,
where_clause=geom_inside_bbox_sql(xmin, ymin, xmax, ymax)
where_clause=geom_intersects_bbox_sql(xmin, ymin, xmax, ymax)
)
xml = borders_to_xml(borders)
return Response(xml, mimetype='application/x-osm+xml')
@ -860,8 +860,8 @@ def export_poly():
xmax = request.args.get('xmax') or 'NULL'
ymin = request.args.get('ymin') or 'NULL'
ymax = request.args.get('ymax') or 'NULL'
fetch_borders_args['where_clause'] = geom_inside_bbox_sql(xmin, ymin,
xmax, ymax)
fetch_borders_args['where_clause'] = geom_intersects_bbox_sql(xmin, ymin,
xmax, ymax)
borders = fetch_borders(**fetch_borders_args)
memory_file = io.BytesIO()

2
web/app/borders_api_utils.py
View file

@ -13,7 +13,7 @@ from subregions import (
)
def geom_inside_bbox_sql(xmin, ymin, xmax, ymax):
def geom_intersects_bbox_sql(xmin, ymin, xmax, ymax):
return (f'(geom && ST_MakeBox2D(ST_Point({xmin}, {ymin}),'
f'ST_Point({xmax}, {ymax})))')