Skip to content

Serialize extra statistics #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2018
Merged

Serialize extra statistics #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f421b23
Serialize extra statistics
mflaxman10 Apr 3, 2018
da0f874
Added test for extra stats api output.
yellowcap Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion raster_aggregation/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ class ValueCountResultSerializer(serializers.ModelSerializer):
max = serializers.FloatField(source='stats_max', read_only=True)
avg = serializers.FloatField(source='stats_avg', read_only=True)
std = serializers.FloatField(source='stats_std', read_only=True)
pcount = serializers.FloatField(source='stats_cumsum_t0', read_only=True)
psum = serializers.FloatField(source='stats_cumsum_t1', read_only=True)
psumsq = serializers.FloatField(source='stats_cumsum_t2', read_only=True)

class Meta:
model = ValueCountResult
fields = (
'id', 'aggregationarea', 'rasterlayers', 'formula', 'layer_names',
'zoom', 'units', 'grouping', 'value', 'created', 'status',
'min', 'max', 'avg', 'std',
'min', 'max', 'avg', 'std', 'pcount', 'psum', 'psumsq',
)
read_only_fields = ('id', 'value', 'created', 'status', 'rasterlayers',)

Expand Down
3 changes: 3 additions & 0 deletions tests/test_aggregation_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ def test_aggregation_api_stats(self):
self.assertEqual(result['max'], 225)
self.assertEqual(result['avg'], 27.4032615692726)
self.assertEqual(result['std'], 39.3484035359834)
self.assertEqual(result['pcount'], 41943)
self.assertEqual(result['psum'], 1149375)
self.assertEqual(result['psumsq'], 96436839)

def test_aggregation_api_count_explicit_zoom(self):
self.data['zoom'] = 11
Expand Down