dpriskorn/owl-map
1
0
Fork 0
forked from edward/owl-map
Code Pull requests Activity

Add item type filter

Browse source
This commit is contained in:
Edward Betts 2021-07-30 16:02:41 +02:00
parent a791de7a24
commit 9b7f6ee878
3 changed files with 156 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
web_view.py
View file

@ -271,6 +271,10 @@ def old_search_page():
def read_bounds_param():
return [float(i) for i in request.args["bounds"].split(",")]
def read_isa_filter_param():
isa_param = request.args.get('isa')
if isa_param:
return set(qid.strip() for qid in isa_param.upper().split(','))
@app.route("/api/1/location")
def show_user_location():
@ -280,18 +284,30 @@ def show_user_location():
@app.route("/api/1/count")
def api_wikidata_items_count():
t0 = time()
count = api.wikidata_items_count(read_bounds_param())
isa_filter = read_isa_filter_param()
count = api.wikidata_items_count(read_bounds_param(), isa_filter=isa_filter)
t1 = time() - t0
return cors_jsonify(success=True, count=count, duration=t1)
@app.route("/api/1/isa_search")
def api_isa_search():
t0 = time()
search_terms = request.args.get("q")
items = api.isa_incremental_search(search_terms)
t1 = time() - t0
return cors_jsonify(success=True, items=items, duration=t1)
@app.route("/api/1/isa")
def api_wikidata_isa_counts():
t0 = time()
bounds = read_bounds_param()
isa_count = api.wikidata_isa_counts(bounds)
isa_filter = read_isa_filter_param()
isa_count = api.wikidata_isa_counts(bounds, isa_filter=isa_filter)
t1 = time() - t0
return cors_jsonify(success=True, isa_count=isa_count, bounds=bounds, duration=t1)
@ -302,7 +318,9 @@ def api_wikidata_items():
t0 = time()
bounds = read_bounds_param()
ret = api.wikidata_items(bounds)
isa_filter = read_isa_filter_param()
ret = api.wikidata_items(bounds, isa_filter=isa_filter)
t1 = time() - t0
return cors_jsonify(success=True, duration=t1, **ret)
@ -311,7 +329,8 @@ def api_wikidata_items():
@app.route("/api/1/osm")
def api_osm_objects():
t0 = time()
objects = api.get_osm_with_wikidata_tag(read_bounds_param())
isa_filter = read_isa_filter_param()
objects = api.get_osm_with_wikidata_tag(read_bounds_param(), isa_filter=isa_filter)
t1 = time() - t0
return cors_jsonify(success=True, objects=objects, duration=t1)