Dev fix (#56)

antaresc · web-flow · commit 02fbad323d9b · 2019-07-26T20:55:35.000-07:00
* Fixed get_observation bug

* Fixed key error

* Use new col name
diff --git a/datacommons/populations.py b/datacommons/populations.py
@@ -109,7 +109,7 @@ def get_observations(self,
                      observation_date,
                      measured_property,
                      stats_type=None,
-                     clean_data=True,
+                     clean_data=False,
                      rows=100):
   """Create a new column with values for an observation of the given property.
   The current pandas dataframe should include a column containing population
@@ -179,13 +179,13 @@ def get_observations(self,
   if measurement_method:
     query.add_constraint('?o', 'measurementMethod', measurement_method)
 
-  # Check if data should be cleaned
-  clean_func = None
-  if clean_data:
-    type_func = utils.convert_type(new_col_var, 'float')
-    nan_func = utils.drop_nan(new_col_var)
-    clean_func = utils.compose_process(type_func, nan_func)
-
   # Perform the query and merge the results
-  new_frame = DCFrame(datalog_query=query, labels=labels, process=clean_func, type_hint=type_hint, rows=rows)
+  new_frame = DCFrame(datalog_query=query, labels=labels, type_hint=type_hint, rows=rows)
   self.merge(new_frame)
+
+  # After the merge is performed, check if cleaning needs to be done
+  if clean_data:
+    type_func = utils.convert_type(new_col_name, 'float')
+    nan_func = utils.drop_nan(new_col_name)
+    clean_func = utils.compose_process(type_func, nan_func)
+    self._dataframe = clean_func(self._dataframe)
