edward/owl-map
1
1
Fork 1
Code Issues 11 Pull requests 1 Packages Projects Releases Wiki Activity

Optional isa_filter for wikidata_isa_counts

Browse source
This commit is contained in:
Edward Betts 2022-04-18 12:25:38 +01:00
parent 87005dea18
commit 302da85e33
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
matcher/api.py
View file

@ -418,7 +418,7 @@ def wikidata_items_count(bounds, isa_filter=None):
return q.count() return q.count()
def wikidata_isa_counts(bounds): def wikidata_isa_counts(bounds, isa_filter=None):
db_bbox = make_envelope(bounds) db_bbox = make_envelope(bounds)
q = ( q = (
@ -426,6 +426,9 @@ def wikidata_isa_counts(bounds):
.filter(func.ST_Covers(db_bbox, model.ItemLocation.location)) .filter(func.ST_Covers(db_bbox, model.ItemLocation.location))
) )
if isa_filter:
q = add_isa_filter(q, isa_filter)
db_items = q.all() db_items = q.all()
counts = get_isa_count(db_items) counts = get_isa_count(db_items)