This is an automated email from the ASF dual-hosted git repository.
nchung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-edge.git
The following commit(s) were added to refs/heads/master by this push:
new ac76b71 SDAP-195 Updates to quality control flagging fields for winds
in SAMOS node.
new 20f63f6 Merge pull request #4 from jelya/master
ac76b71 is described below
commit ac76b71fc7834435ddfbe39cd39b61180c180602
Author: Jocelyn Elya <[email protected]>
AuthorDate: Fri Jun 14 12:17:59 2019 -0400
SDAP-195 Updates to quality control flagging fields for winds in SAMOS node.
---
src/main/python/plugins/samos/json/Writer.py | 4 ++--
src/main/python/plugins/samos/json/template.json | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/python/plugins/samos/json/Writer.py
b/src/main/python/plugins/samos/json/Writer.py
index 12c5318..b0a10ab 100644
--- a/src/main/python/plugins/samos/json/Writer.py
+++ b/src/main/python/plugins/samos/json/Writer.py
@@ -69,8 +69,8 @@ class Writer(SolrTemplateResponseWriter):
elif parameters['variable'].lower() == 'sst':
filterQueries.append('(SST_quality:[*%20TO%20'+value+'])')
elif parameters['variable'].lower() == 'wind':
-
filterQueries.append('(wind_quality:[*%20TO%20'+value+'])')
-
filterQueries.append('(wind_direction_quality:[*%20TO%20'+value+'])')
+
filterQueries.append('(wind_speed_quality:[*%20TO%20'+value+'])')
+
filterQueries.append('(wind_component_quality:[*%20TO%20'+value+'])')
elif key == 'platform':
if type(value) is list:
filterQueries.append('platform:(' + '+OR+'.join(value)
+ ')')
diff --git a/src/main/python/plugins/samos/json/template.json
b/src/main/python/plugins/samos/json/template.json
index e3afe3d..8270e64 100755
--- a/src/main/python/plugins/samos/json/template.json
+++ b/src/main/python/plugins/samos/json/template.json
@@ -15,8 +15,8 @@
"eastward_wind": {{ doc['wind_u'] | jsonify }},
"northward_wind": {{ doc['wind_v'] | jsonify }},
"wind_depth": {{ doc['wind_depth'] | jsonify }},
-"wind_speed_quality": {% if doc['wind_quality'] == False %}0{% elif
doc['wind_quality'] == True %}1{% else %}9{% endif %},
-"wind_component_quality": {% if doc['wind_component_quality'] == False %}0{%
elif doc['wind_component_quality'] == True %}1{% else %}9{% endif %},
+"wind_speed_quality": {{ doc['wind_speed_quality'] | jsonify }},
+"wind_component_quality": {{ doc['wind_component_quality'] | jsonify }},
"sea_water_salinity": {{ doc['SSS'] | jsonify }},
"sea_water_salinity_depth": {{ doc['SSS_depth'] | jsonify }},
"sea_water_salinity_quality": {% if doc['SSS_quality'] == False %}0{% elif
doc['SSS_quality'] == True %}1{% else %}9{% endif %},
