fm: adjust holzhandel_sequenz.puml,

add example data for beobachtung, waldweg

demos/demo_example_finale/demo_beobachtung.py

+from demos.demo_example_finale.utils import save_and_print_aas_obj
+from model.generic_model import Beobachtung
+from model.models import Umring, Koordinate
+
+if __name__ == '__main__':
+    coord1 = Koordinate(x=12.132925613639593, y=49.04954714847827, crs="EPSG:4326")  # todo implement CRS
+    coord2 = Koordinate(x=12.114363040065479, y=49.04887650011801, crs="EPSG:4326")
+    coord3 = Koordinate(x=12.112590150688762, y=49.03921011545453, crs="EPSG:4326")
+    coord4 = Koordinate(x=12.08947871627966, y=49.03784924275019, crs="EPSG:4326")
+    coord5 = Koordinate(x=12.132925613639593, y=49.04954714847827, crs="EPSG:4326")
+    coords = [coord1, coord2, coord3, coord4, coord5]
+
+    umring = Umring(name="Umring Name", koordinaten=coords, beschreibung="Umring Beschreibung")
+
+    beobachtung = Beobachtung(id_="1",  # todo what to fill in in id_? -> random uuid?
+                              name="Beobachtung Name",
+                              beschreibung="Beschreibung Name",
+                              umring=umring,
+                              )
+
+    save_and_print_aas_obj("Beobachtung", beobachtung)

demos/demo_example_finale/demo_waldweg.py

+from datetime import date
+
+from demos.demo_example_finale.utils import save_and_print_aas_obj
+from model.generic_model import Waldweg
+from model.models import Koordinate, Standort
+
+if __name__ == '__main__':
+    coord1 = Koordinate(x=12.132925613639593, y=49.04954714847827, crs="EPSG:4326")  # todo implement CRS
+    coord2 = Koordinate(x=12.114363040065479, y=49.04887650011801, crs="EPSG:4326")
+    coord3 = Koordinate(x=12.112590150688762, y=49.03921011545453, crs="EPSG:4326")
+    coord4 = Koordinate(x=12.08947871627966, y=49.03784924275019, crs="EPSG:4326")
+    coord_wendepunkt = Koordinate(x=12.111363040065479, y=49.04837650011801, crs="EPSG:4326")
+
+    standort_coord1 = Standort(coord1)
+    standort_coord2 = Standort(coord2)
+    standort_coord3 = Standort(coord3)
+    standort_coord4 = Standort(coord4)
+    standort_wendepunkt = Standort(coord_wendepunkt)
+
+    wegpunkte = Waldweg.Wegpunkte(standort=[standort_coord1, standort_coord2, standort_coord3, standort_coord4])
+    wendepunkte = Waldweg.Wendepunkte(standort=standort_wendepunkt)
+    beschreibung = Waldweg.Beschreibung(value="Das ist ein Waldweg")
+    erstellungsdatum = date.fromtimestamp(1692620103)
+    aktualisierungsdatum = date.fromtimestamp(1692620122)
+    breite = float(3)  # in metres
+
+    waldweg = Waldweg(id_="1",  # todo what to fill in in id_? -> random uuid?
+                      wegpunkte=wegpunkte,
+                      wendepunkte=wendepunkte,
+                      beschreibung=beschreibung,
+                      erstellungsdatum=erstellungsdatum,
+                      aktualisierungsdatum=aktualisierungsdatum,
+                      breite=breite,
+                      )
+    save_and_print_aas_obj("Waldweg", waldweg)

demos/demo_example_finale/output/Beobachtung.json

+{"idShort": "Beobachtung", "modelType": "Submodel", "id": "1", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Beobachtung/0/1"}]}, "submodelElements": [{"idShort": "Name", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Beobachtung/0/1/Name"}]}, "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "Beobachtung Name", "valueType": "xs:string"}, {"idShort": "Beschreibung", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Beobachtung/0/1/Beschreibung"}]}, "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "Beschreibung Name", "valueType": "xs:string"}, {"idShort": "Umring", "modelType": "SubmodelElementCollection", "value": [{"idShort": "Name", "modelType": "Property", "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "Umring Name", "valueType": "xs:string"}, {"idShort": "Beschreibung", "modelType": "Property", "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "Umring Beschreibung", "valueType": "xs:string"}, {"idShort": "Koordinaten", "modelType": "SubmodelElementList", "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "orderRelevant": true, "typeValueListElement": "SubmodelElementCollection", "value": [{"idShort": "Koordinate1", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.132925613639593", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04954714847827", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Koordinate2", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.114363040065479", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04887650011801", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Koordinate3", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.112590150688762", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.03921011545453", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Koordinate4", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.08947871627966", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.03784924275019", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Koordinate5", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.132925613639593", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04954714847827", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}]}]}]}
\ No newline at end of file

demos/demo_example_finale/output/Waldweg.json

+{"idShort": "Waldweg", "modelType": "Submodel", "id": "1", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1"}]}, "submodelElements": [{"idShort": "Beschreibung", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Beschreibung"}]}, "qualifiers": [{"value": "One", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "Das ist ein Waldweg", "valueType": "xs:string"}, {"idShort": "Erstellungsdatum", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Erstellungsdatum"}]}, "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "2023-08-21", "valueType": "xs:date"}, {"idShort": "Aktualisierungsdatum", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Aktualisierungsdatum"}]}, "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "2023-08-21", "valueType": "xs:date"}, {"idShort": "Breite", "modelType": "Property", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Breite"}]}, "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "3.0", "valueType": "xs:double"}, {"idShort": "Wegpunkte", "modelType": "SubmodelElementList", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Wegpunkte"}]}, "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "orderRelevant": true, "typeValueListElement": "SubmodelElementCollection", "value": [{"idShort": "Standort0", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "Koordinate", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.132925613639593", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04954714847827", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Notiz", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:string"}]}, {"idShort": "Standort1", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "Koordinate", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.114363040065479", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04887650011801", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Notiz", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:string"}]}, {"idShort": "Standort2", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "Koordinate", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.112590150688762", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.03921011545453", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Notiz", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:string"}]}, {"idShort": "Standort3", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "Koordinate", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.08947871627966", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.03784924275019", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Notiz", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:string"}]}]}, {"idShort": "Wendepunkte", "modelType": "SubmodelElementList", "semanticId": {"type": "GlobalReference", "keys": [{"type": "GlobalReference", "value": "https://admin-shell.io/kwh40/forestml40/Waldweg/0/1/Wendepunkte"}]}, "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "orderRelevant": true, "typeValueListElement": "SubmodelElementCollection", "value": [{"idShort": "Standort", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "Koordinate", "modelType": "SubmodelElementCollection", "qualifiers": [{"value": "OneToMany", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": [{"idShort": "x", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "12.111363040065479", "valueType": "xs:double"}, {"idShort": "y", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "49.04837650011801", "valueType": "xs:double"}, {"idShort": "alt", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:double"}, {"idShort": "crs", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "value": "EPSG:4326", "valueType": "xs:string"}]}, {"idShort": "Notiz", "modelType": "Property", "qualifiers": [{"value": "ZeroToOne", "kind": "ConceptQualifier", "valueType": "xs:string", "type": "Cardinality"}], "valueType": "xs:string"}]}]}]}
\ No newline at end of file

demos/demo_example_finale/utils.py

+import basyx
+from basyx.aas.adapter.json import AASToJsonEncoder
+
+
+def save_and_print_aas_obj(desc: str, obj):
+    encoder = AASToJsonEncoder()
+    json_string = encoder.encode(obj)
+    # print
+    print("{0}: {1}".format(desc, json_string))
+    # to file
+    with open("output/{0}.json".format(desc), 'w') as outfile:
+        outfile.write(json_string)

modellierung/holzhandel_sequenz.puml

@@ -36,6 +36,9 @@ end box
 Waldbesitzer -> WaldmanagerApp: Beobachtung eintragen
 activate WaldmanagerApp
     WaldmanagerApp -> DZ_Wald: Speichern der Beobachtung
+    note over DZ_Wald #00FF00
+    -> FM: wie in Modellierung, Beispiel in demos/demo_example_finale
+    end note
     activate DZ_Wald
     DZ_Wald --> WaldmanagerApp: gespeichert
     deactivate DZ_Wald
@@ -47,6 +50,9 @@ Waldbesitzer -> WaldmanagerApp: Waldweg abgehen
 activate WaldmanagerApp
 Waldbesitzer -> WaldmanagerApp: Wendepunkt anlegen        
     WaldmanagerApp -> DZ_Wald: Speichern des Waldweges
+    note over DZ_Wald #00FF00
+    -> FM: wie in Modellierung, Beispiel in demos/demo_example_finale
+    end note
     activate DZ_Wald
     DZ_Wald --> WaldmanagerApp: gespeichert
     deactivate DZ_Wald
@@ -154,6 +160,9 @@ DZ_Wald --> WaldmanagerApp: S3I-ServiceReply "ok"
 note over DZ_Wald #FF0000
 TODO: Welches Rückgabeformat bevorzugt ForestManager?
 end note
+note over DZ_Wald #00FF00
+-> FM: JSON wie oben OK
+end note
 deactivate DZ_Wald
 WaldmanagerApp --> Waldbesitzer: UI-Anzeige des Holzpreisbereichs in ForestManager
 deactivate WaldmanagerApp