Skip to content
Snippets Groups Projects
Commit e61b732e authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

added namespace to get/set value of Result class

parent a5fa7272
No related branches found
No related tags found
No related merge requests found
...@@ -73,14 +73,14 @@ class Result(BaseModel): ...@@ -73,14 +73,14 @@ class Result(BaseModel):
if v is not None and not isinstance(v, Point) and not isinstance(v, Polygon): if v is not None and not isinstance(v, Point) and not isinstance(v, Polygon):
raise ValueError("%s is not a " % v) raise ValueError("%s is not a " % v)
def set_value(self, key, value): def set_value(self, namespace, key, value):
temp_all_values = json.loads(self.all_values) temp_all_values = json.loads(self.all_values)
temp_all_values[key] = value temp_all_values["%s.%s" %(namespace, key)] = value
self.all_values = json.dumps(temp_all_values) self.all_values = json.dumps(temp_all_values)
def get_value(self, key): def get_value(self, namespace, key):
temp_all_values = json.loads(self.all_values) temp_all_values = json.loads(self.all_values)
return temp_all_values.get(key) return temp_all_values.get("%s.%s" %(namespace, key))
def set_all_values(self, values_dict): def set_all_values(self, values_dict):
self.all_values = json.dumps(values_dict) self.all_values = json.dumps(values_dict)
......
...@@ -11,7 +11,7 @@ class TestEntities(unittest.TestCase): ...@@ -11,7 +11,7 @@ class TestEntities(unittest.TestCase):
valid_time_start = datetime.fromisoformat("2015-03-01T00:00:00+01:00"), # valid_time_start valid_time_start = datetime.fromisoformat("2015-03-01T00:00:00+01:00"), # valid_time_start
valid_time_end = None, valid_time_end = None,
warning_status = 2, warning_status = 2,
all_values = json.dumps({"TM":2}) all_values = json.dumps({"WEATHER.TM":2})
) )
r = Result( r = Result(
...@@ -20,7 +20,7 @@ class TestEntities(unittest.TestCase): ...@@ -20,7 +20,7 @@ class TestEntities(unittest.TestCase):
warning_status = 2 warning_status = 2
) )
r.set_value("TM",2) r.set_value("WEATHER","TM",2)
def test_weather_elements(self): def test_weather_elements(self):
self.assertEquals("TM",WeatherElements.TEMPERATURE_MEAN) self.assertEquals("TM",WeatherElements.TEMPERATURE_MEAN)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment