Added optional precision to Entity.loc()

Author: fbattello

contrib/examples/smartdatamodels/offstreet_parking/offstreet_parking.generated.jsonld

@@ -76,8 +76,8 @@
         "value": {
             "type": "Point",
             "coordinates": [
-                -8.609612,
-                41.150692
+                -8.60961198807,
+                41.150691773
             ]
         }
     },

contrib/examples/smartdatamodels/offstreet_parking/offstreet_parking.py

@@ -15,7 +15,7 @@
 e.prop("extCategory", ["A"])
 e.prop("fourWheelerSlots", {"availableSpotNumber": 25, "totalSpotNumber": 25, "occupiedSpotNumber": 0})
 e.prop("layout", ["multiLevel"])
-e.loc(41.150691773, -8.60961198807)
+e.loc(41.150691773, -8.60961198807, precision=11)
 e.prop("maximumParkingDuration", "PT8H")
 e.prop(
     "municipalityInfo",

src/ngsildclient/model/attr/geo.py

@@ -32,12 +32,12 @@ def value(self):
         return geojson.loads(str(self["value"]))
 
     @value.setter
-    def value(self, v: Union[Tuple, Geometry]):
+    def value(self, v: Union[Tuple, Geometry], precision: int = 6):
         if self["type"] != "GeoProperty":
             raise ValueError("Attribute type MUST be GeoProperty")
         if isinstance(v, Tuple) and len(v) == 2:
             lat, lon = v
-            v = Point((lon, lat))
+            v = Point((lon, lat), precision=precision)
         self["value"] = v
 
     @property

src/ngsildclient/model/entity.py

@@ -465,16 +465,17 @@ def gprop(
         nested: bool = False,
         datasetid: str = None,
         observedat: Union[str, datetime] = None,
+        precision: int = 6,
     ) -> Entity:
-        property = NgsiDict.mkgprop(value, datasetid=datasetid, observedat=observedat)
+        property = NgsiDict.mkgprop(value, datasetid=datasetid, observedat=observedat, precision=precision)
         self._update_entity(name, property, nested)
         return self
 
-    def loc(self, *coord, **kwargs) -> Entity:
+    def loc(self, *coord, precision: int = 6, **kwargs) -> Entity:
         if len(coord) == 1 and isinstance(coord, Tuple):
             coord = coord[0]
         if len(coord) == 2:
-            return self.gprop("location", coord, **kwargs)
+            return self.gprop("location", coord, precision=precision, **kwargs)
         raise ValueError("lat,lon tuple expected")
 
     """ A helper method to set the frequently used "location" geoproperty.

src/ngsildclient/model/ngsidict.py

@@ -187,13 +187,14 @@ def mkgprop(
         datasetid: str = None,
         observedat: Union[str, datetime] = None,
         attrname: str = None,
+        precision: int = 6,
     ) -> AttrGeoValue:
         from ngsildclient.model.attr.geo import AttrGeoValue
 
         if isinstance(value, Tuple):
             if len(value) == 2:
                 lat, lon = value
-                value = Point((lon, lat))
+                value = Point((lon, lat), precision=precision)
             else:
                 raise ValueError("lat, lon tuple expected")
         attrvalue = AttrValue(value, datasetid, observedat)

tests/test_entity.py

@@ -54,6 +54,17 @@ def test_loc_2_float():
     }
 
 
+def test_loc_high_precision():
+    e = Entity("OffStreetParking", "porto-ParkingLot-23889")
+    e.loc(41.150691773, -8.60961198807, precision=11)  # default precision is 6 (geojson default)
+    assert e.to_dict() == {
+        "id": "urn:ngsi-ld:OffStreetParking:porto-ParkingLot-23889",
+        "type": "OffStreetParking",
+        "@context": ["https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"],
+        "location": {"type": "GeoProperty", "value": {"coordinates": [-8.60961198807, 41.150691773], "type": "Point"}},
+    }
+
+
 def test_constructor_type_and_id_fully_qualified():
     e = Entity("AirQualityObserved", "urn:ngsi-ld:AirQualityObserved:RZ:Obsv4567")
     assert e.type == "AirQualityObserved"