Added type to PostalAddress. Improved OffStreetParking example.

Author: fbattello

README.md

@@ -257,7 +257,7 @@ client.close()
 
     - Collect incoming data from parking IoT *(ground sensors, cameras)* and the parking system API
     - Clean data, process data and convert to NGSI-LD entities
-    - Create or update entities into the NGSI-LD broker
+    - Create and update entities into the NGSI-LD broker *in real-time*
 
 2. Subscribe to events
 

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

@@ -1,23 +1,23 @@
 {
+    "id": "urn:ngsi-ld:OffStreetParking:porto-ParkingLot-23889",
+    "type": "OffStreetParking",
     "@context": [
-        "iudx:SmartParking",
         "https://raw.githubusercontent.com/smart-data-models/dataModel.Parking/master/context.jsonld"
     ],
-    "id": "urn:ngsi-ld:OffStreetParking:porto-ParkingLot-23889",
-    "type": "OffStreetParking",
     "accessModified": {
         "type": "Property",
         "value": {
             "@type": "DateTime",
             "@value": "2018-09-21T12:00:00Z"
         }
     },
-    "adress": {
+    "address": {
         "type": "Property",
         "value": {
             "streetAddress": "Rua de Fernandes Tomas",
             "addressLocality": "Porto",
-            "addressCountry": "Portugal"
+            "addressCountry": "Portugal",
+            "type": "PostalAddress"
         }
     },
     "allowedVehicleType": {
@@ -43,7 +43,9 @@
     },
     "chargeType": {
         "type": "Property",
-        "value": "temporaryPrice"
+        "value": [
+            "temporaryPrice"
+        ]
     },
     "description": {
         "type": "Property",
@@ -106,7 +108,7 @@
         "type": "Property",
         "value": {
             "@type": "DateTime",
-            "@value": "2018-09-21T12:00:00Z"
+            "@value": "2021-03-11T15:51:02Z"
         }
     },
     "occupancy": {

contrib/examples/smartdatamodels/offstreet_parking/offstreet_parking.md

@@ -6,6 +6,10 @@ Normalized NGSI-LD example from the [Smart Data Models Initiative](https://smart
 
 Smart DataModel [OffstreetParking](https://smart-data-models.github.io/dataModel.Parking/OffStreetParking/examples/example-normalized.jsonld)
 
+## Location
+
+https://github.com/smart-data-models/dataModel.Parking/blob/master/OffStreetParking/examples/example-normalized.jsonld
+
 # Comment
 
 The generated JSON-LD is quite equivalent to the original.<br>

contrib/examples/smartdatamodels/offstreet_parking/offstreet_parking.py

@@ -4,16 +4,13 @@
 obstime = datetime(2018, 9, 21, 12)  # Time of Observation
 
 e = Entity("OffStreetParking", "porto-ParkingLot-23889")
-e.ctx = [
-    "iudx:SmartParking",
-    "https://raw.githubusercontent.com/smart-data-models/dataModel.Parking/master/context.jsonld",
-]
+e.ctx = ["https://raw.githubusercontent.com/smart-data-models/dataModel.Parking/master/context.jsonld"]
 e.tprop("accessModified", obstime)
-e.prop("adress", PostalAddressBuilder().locality("Porto").country("Portugal").street("Rua de Fernandes Tomas").build())
+e.prop("address", PostalAddressBuilder().locality("Porto").country("Portugal").street("Rua de Fernandes Tomas").build())
 e.prop("allowedVehicleType", ["car"])
 e.prop("availableSpotNumber", 132, observedat=obstime)
 e.prop("category", ["underground", "public", "feeCharged", "mediumTerm", "barrierAccess"])
-e.prop("chargeType", "temporaryPrice")
+e.prop("chargeType", ["temporaryPrice"])
 e.prop("description", "Municipal car park located near the Trindade metro station and the Town Hall")
 e.prop("extCategory", ["A"])
 e.prop("fourWheelerSlots", {"availableSpotNumber": 25, "totalSpotNumber": 25, "occupiedSpotNumber": 0})
@@ -36,7 +33,7 @@
     },
 )
 e.prop("name", "Parque de estacionamento Trindade")
-e.tprop("observationDateTime", obstime).prop("occupancy", 0.68).tprop("occupancyModified", obstime)
+e.tprop("observationDateTime", "2021-03-11T15:51:02Z").prop("occupancy", 0.68).tprop("occupancyModified", obstime)
 e.prop("occupiedSpotNumber", 282).prop("parkingSiteID", "P2")
 e.prop("requiredPermit", []).prop("totalSpotNumber", 414)
 e.prop("twoWheelerSlots", {"availableSpotNumber": 20, "totalSpotNumber": 20, "occupiedSpotNumber": 0})

docs/source/generated/ngsildclient.utils.console.rst

@@ -9,14 +9,6 @@
 
 
 
-   .. rubric:: Functions
-
-   .. autosummary::
-   
-      compute
-      compute4
-      example
-   
 
 
 

src/ngsildclient/model/helper/postal.py

@@ -40,6 +40,7 @@ def to_dict(self):
             d["addressRegion"] = self.region
         if self.country:
             d["addressCountry"] = self.country
+        d["type"] = "PostalAddress"
         if not d:
             raise ValueError("PostalAddress is empty")
         return d

tests/data/store_1_many_relationship.json

@@ -16,7 +16,8 @@
             "streetAddress": "Bornholmer Straße 65",
             "addressLocality": "Prenzlauer Berg",
             "postalCode": "10439",
-            "addressRegion": "Berlin"
+            "addressRegion": "Berlin",
+            "type": "PostalAddress"
         },
         "verified": {
             "type": "Property",

tests/smartdatamodels/poi/data/poi.json

@@ -13,7 +13,8 @@
         "type": "Property",
         "value": {
             "addressLocality": "Vilagarcía de Arousa",
-            "addressCountry": "ES"
+            "addressCountry": "ES",
+            "type": "PostalAddress"
         }
     },
     "category": {

tests/smartdatamodels/smartcities/data/building/building.json

@@ -9,7 +9,8 @@
         "value": {
             "streetAddress": "25 Walbrook",
             "addressLocality": "London",
-            "postalCode": "EC4N 8AF"
+            "postalCode": "EC4N 8AF",
+            "type": "PostalAddress"
         }
     },
     "category": {

tests/smartdatamodels/smartcities/data/urbanmobility/transport_stop.json

@@ -30,7 +30,8 @@
             "streetAddress": "C/ La Pereda 14",
             "addressLocality": "Santander",
             "addressRegion": "Cantabria",
-            "addressCountry": "Spain"
+            "addressCountry": "Spain",
+            "type": "PostalAddress"
         }
     },
     "location": {