Merge branch 'master' into metadata-footer

Author: gkorland

redisgraph/query_result.py

@@ -41,6 +41,7 @@ class ResultSetScalarTypes:
     VALUE_NODE = 8
     VALUE_PATH = 9
     VALUE_MAP = 10
+    VALUE_POINT = 11
 
 
 class QueryResult:
@@ -198,6 +199,14 @@ def parse_map(self, cell):
 
         return m
 
+    def parse_point(self, cell):
+        p = {}
+        # A point is received an array of the form: [latitude, longitude]
+        # It is returned as a map of the form: {"latitude": latitude, "longitude": longitude}
+        p["latitude"] = float(cell[0])
+        p["longitude"] = float(cell[1])
+        return p
+
     def parse_scalar(self, cell):
         scalar_type = int(cell[0])
         value = cell[1]
@@ -242,6 +251,9 @@ def parse_scalar(self, cell):
         elif scalar_type == ResultSetScalarTypes.VALUE_MAP:
             scalar = self.parse_map(value)
 
+        elif scalar_type == ResultSetScalarTypes.VALUE_POINT:
+            scalar = self.parse_point(value)
+
         elif scalar_type == ResultSetScalarTypes.VALUE_UNKNOWN:
             print("Unknown scalar type\n")
 

setup.py

@@ -11,7 +11,7 @@ def read_all(f):
 
 setup(
     name='redisgraph',
-    version='2.2.4',
+    version='2.3.0',
     description='RedisGraph Python Client',
     long_description=read_all("README.md"),
     long_description_content_type='text/markdown',

tests/functional/test_all.py

@@ -115,6 +115,26 @@ def test_map(self):
         # All done, remove graph.
         redis_graph.delete()
 
+    def test_point(self):
+        redis_graph = Graph('map', self.r)
+
+        query = "RETURN point({latitude: 32.070794860, longitude: 34.820751118})"
+        expected_lat = 32.070794860
+        expected_lon = 34.820751118
+        actual = redis_graph.query(query).result_set[0][0]
+        self.assertTrue(abs(actual['latitude'] - expected_lat) < 0.001)
+        self.assertTrue(abs(actual['longitude'] - expected_lon) < 0.001)
+
+        query = "RETURN point({latitude: 32, longitude: 34.0})"
+        expected_lat = 32
+        expected_lon = 34
+        actual = redis_graph.query(query).result_set[0][0]
+        self.assertTrue(abs(actual['latitude'] - expected_lat) < 0.001)
+        self.assertTrue(abs(actual['longitude'] - expected_lon) < 0.001)
+
+        # All done, remove graph.
+        redis_graph.delete()
+
     def test_index_response(self):
         redis_graph = Graph('social', self.r)