From 819ff6c8ec630da7e6dec36961b97e4ab562dcc1 Mon Sep 17 00:00:00 2001 From: Daniel Wiesmann Date: Tue, 18 Dec 2018 13:19:38 +0000 Subject: [PATCH] Added synchronous flag as argument to aggregate function. --- tesselate/aggregation.py | 6 +++--- tesselate/tesselate.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tesselate/aggregation.py b/tesselate/aggregation.py index 1636756..293cdd0 100644 --- a/tesselate/aggregation.py +++ b/tesselate/aggregation.py @@ -5,7 +5,7 @@ from tesselate.utils import layers_dict -def aggregate(client, area, composite, formula, grouping='continuous', zoom=None): +def aggregate(client, area, composite, formula, grouping='continuous', zoom=None, synchronous=True): """ Request aggregation data. """ @@ -35,8 +35,8 @@ def aggregate(client, area, composite, formula, grouping='continuous', zoom=None return result[0] else: # If valuecount has not been precomputed, do it now synchronously. - logging.info('Value count not precomputed, requesting synchronous calculation.') - return client.post('valuecountresult?synchronous=True', data=post_params) + logging.info('Value count not precomputed, requesting {} calculation.'.format('synchronous' if synchronous else 'asynchronous')) + return client.post('valuecountresult{}'.format('?synchronous' if synchronous else ''), data=post_params) def regional_aggregate(valuecounts): diff --git a/tesselate/tesselate.py b/tesselate/tesselate.py index 248bb30..656ea5f 100644 --- a/tesselate/tesselate.py +++ b/tesselate/tesselate.py @@ -63,8 +63,8 @@ def predictedlayer(self, id=None, **filters): def export(self, region, composite, formula, file_path, tilez=14): export(self.client, region, composite, formula, file_path, tilez=tilez) - def aggregate(self, area, composite, formula, grouping='continuous', zoom=None): - return aggregate(self.client, area, composite, formula, grouping, zoom) + def aggregate(self, area, composite, formula, grouping='continuous', zoom=None, synchronous=True): + return aggregate(self.client, area, composite, formula, grouping, zoom, synchronous) def build(self, compositebuild): return build(self.client, compositebuild)