Update drawio vocabulary

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/my_drawio.oml

@@ -111,435 +111,401 @@ description <http://ua.be/sdo2l/description/artifacts/my_drawio#> as my_drawio {
     object_diagram:inModel model
   ]
 
-  
-  ci p0_c0 : drawio:Cell [
-    
+  ci p0_cell_0 : drawio:Cell [
     drawio:hasDrawioId "0"
     drawio:isRootOf p0
     object_diagram:inModel model
   ]
-
   
-
   
-
   
+
   
-  ci p0_c1 : drawio:Cell [
-    
+  ci p0_cell_1 : drawio:Cell [
     drawio:hasDrawioId "1"
-    drawio:hasParent p0_c0
+    drawio:hasParent p0_cell_0
     object_diagram:inModel model
   ]
-
   
-
   
-
   
+
   
-  ci p0_c2 : drawio:Cell [
-    drawio:hasCellGeometry drawio:CellGeometry [
-      
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-1 : drawio:Vertex [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-1"
+    drawio:hasValue "Python in-memory abstract syntax of Draw.io"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasVertexGeometry drawio:VertexGeometry [
       drawio:hasX 330
       drawio:hasY 180
       drawio:hasWidth 120
       drawio:hasHeight 60
     ]
     
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-1"
-    drawio:hasValue "Python in-memory abstract syntax of Draw.io"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
   ]
-
   
-
   
-  ci p0_c2_sty_rounded : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-1_sty_rounded : drawio:CellStyleEntry [
     dict:hasKey "rounded"
     dict:hasValue "0"
-    drawio:styleEntryOf p0_c2
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-1
     object_diagram:inModel model
   ]
-  ci p0_c2_sty_whiteSpace : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-1_sty_whiteSpace : drawio:CellStyleEntry [
     dict:hasKey "whiteSpace"
     dict:hasValue "wrap"
-    drawio:styleEntryOf p0_c2
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-1
     object_diagram:inModel model
   ]
-  ci p0_c2_sty_html : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-1_sty_html : drawio:CellStyleEntry [
     dict:hasKey "html"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c2
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-1
     object_diagram:inModel model
   ]
-
   
-  ci p0_c2_attr_vertex : drawio:CellAttribute [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-1_attr_vertex : drawio:CellAttribute [
     dict:hasKey "vertex"
     dict:hasValue "1"
-    drawio:attributeOf p0_c2
+    drawio:attributeOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-1
     object_diagram:inModel model
   ]
+
   
-  ci p0_c3 : drawio:Cell [
-    drawio:hasCellGeometry drawio:CellGeometry [
-      
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-2 : drawio:Vertex [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-2"
+    drawio:hasValue ".drawio file"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasVertexGeometry drawio:VertexGeometry [
       drawio:hasX 120
       drawio:hasY 180
       drawio:hasWidth 120
       drawio:hasHeight 60
     ]
     
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-2"
-    drawio:hasValue ".drawio file"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
   ]
-
   
-
   
-  ci p0_c3_sty_rounded : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-2_sty_rounded : drawio:CellStyleEntry [
     dict:hasKey "rounded"
     dict:hasValue "0"
-    drawio:styleEntryOf p0_c3
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-2
     object_diagram:inModel model
   ]
-  ci p0_c3_sty_whiteSpace : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-2_sty_whiteSpace : drawio:CellStyleEntry [
     dict:hasKey "whiteSpace"
     dict:hasValue "wrap"
-    drawio:styleEntryOf p0_c3
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-2
     object_diagram:inModel model
   ]
-  ci p0_c3_sty_html : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-2_sty_html : drawio:CellStyleEntry [
     dict:hasKey "html"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c3
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-2
     object_diagram:inModel model
   ]
-
   
-  ci p0_c3_attr_vertex : drawio:CellAttribute [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-2_attr_vertex : drawio:CellAttribute [
     dict:hasKey "vertex"
     dict:hasValue "1"
-    drawio:attributeOf p0_c3
+    drawio:attributeOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-2
+    object_diagram:inModel model
+  ]
+
+  
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3 : drawio:Edge [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-3"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasEdgeGeometry drawio:EdgeGeometry [
+      drawio:hasSourcePoint drawio:Point [
+        drawio:hasX 190
+        drawio:hasY 390
+      ]
+      drawio:hasTargetPoint drawio:Point [
+        drawio:hasX 290
+        drawio:hasY 290
+      ]
+    ]
+  ]
+  
+  
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3_sty_shape : drawio:CellStyleEntry [
+    dict:hasKey "shape"
+    dict:hasValue "flexArrow"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-3
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3_sty_endArrow : drawio:CellStyleEntry [
+    dict:hasKey "endArrow"
+    dict:hasValue "classic"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-3
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3_sty_startArrow : drawio:CellStyleEntry [
+    dict:hasKey "startArrow"
+    dict:hasValue "classic"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-3
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3_sty_html : drawio:CellStyleEntry [
+    dict:hasKey "html"
+    dict:hasValue "1"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-3
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-3_sty_rounded : drawio:CellStyleEntry [
+    dict:hasKey "rounded"
+    dict:hasValue "0"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-3
     object_diagram:inModel model
   ]
   
-  ci p0_c4 : drawio:Cell [
-    drawio:hasCellGeometry drawio:CellGeometry [
-      
+
+  
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-4 : drawio:Vertex [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-4"
+    drawio:hasValue "OML"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasVertexGeometry drawio:VertexGeometry [
       drawio:hasX 530
       drawio:hasY 180
       drawio:hasWidth 120
       drawio:hasHeight 60
     ]
     
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-4"
-    drawio:hasValue "OML"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
   ]
-
   
-
   
-  ci p0_c4_sty_rounded : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-4_sty_rounded : drawio:CellStyleEntry [
     dict:hasKey "rounded"
     dict:hasValue "0"
-    drawio:styleEntryOf p0_c4
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-4
     object_diagram:inModel model
   ]
-  ci p0_c4_sty_whiteSpace : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-4_sty_whiteSpace : drawio:CellStyleEntry [
     dict:hasKey "whiteSpace"
     dict:hasValue "wrap"
-    drawio:styleEntryOf p0_c4
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-4
     object_diagram:inModel model
   ]
-  ci p0_c4_sty_html : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-4_sty_html : drawio:CellStyleEntry [
     dict:hasKey "html"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c4
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-4
     object_diagram:inModel model
   ]
-
   
-  ci p0_c4_attr_vertex : drawio:CellAttribute [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-4_attr_vertex : drawio:CellAttribute [
     dict:hasKey "vertex"
     dict:hasValue "1"
-    drawio:attributeOf p0_c4
+    drawio:attributeOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-4
     object_diagram:inModel model
   ]
+
   
-  ci p0_c5 : drawio:Cell [
-    drawio:hasCellGeometry drawio:CellGeometry [
-      
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-5 : drawio:Edge [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-5"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasEdgeGeometry drawio:EdgeGeometry [
+      drawio:hasSourcePoint drawio:Point [
+        drawio:hasX 450
+        drawio:hasY 390
+      ]
+      drawio:hasTargetPoint drawio:Point [
+        drawio:hasX 500
+        drawio:hasY 340
+      ]
+    ]
+  ]
+  
+  
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-5_sty_shape : drawio:CellStyleEntry [
+    dict:hasKey "shape"
+    dict:hasValue "flexArrow"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-5
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-5_sty_endArrow : drawio:CellStyleEntry [
+    dict:hasKey "endArrow"
+    dict:hasValue "classic"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-5
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-5_sty_html : drawio:CellStyleEntry [
+    dict:hasKey "html"
+    dict:hasValue "1"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-5
+    object_diagram:inModel model
+  ]
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-5_sty_rounded : drawio:CellStyleEntry [
+    dict:hasKey "rounded"
+    dict:hasValue "0"
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-5
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7 : drawio:Vertex [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-7"
+    drawio:hasValue "bidirectional"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasVertexGeometry drawio:VertexGeometry [
       drawio:hasX 240
       drawio:hasY 240
       drawio:hasWidth 90
       drawio:hasHeight 30
     ]
     
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-7"
-    drawio:hasValue "bidirectional"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
   ]
-
   
-
   
-  ci p0_c5_sty_shape : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_shape : drawio:CellStyleEntry [
     dict:hasKey "shape"
     dict:hasValue "text"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_html : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_html : drawio:CellStyleEntry [
     dict:hasKey "html"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_align : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_align : drawio:CellStyleEntry [
     dict:hasKey "align"
     dict:hasValue "center"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_verticalAlign : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_verticalAlign : drawio:CellStyleEntry [
     dict:hasKey "verticalAlign"
     dict:hasValue "middle"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_resizable : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_resizable : drawio:CellStyleEntry [
     dict:hasKey "resizable"
     dict:hasValue "0"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_points : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_points : drawio:CellStyleEntry [
     dict:hasKey "points"
     dict:hasValue "[]"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_autosize : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_autosize : drawio:CellStyleEntry [
     dict:hasKey "autosize"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_strokeColor : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_strokeColor : drawio:CellStyleEntry [
     dict:hasKey "strokeColor"
     dict:hasValue "none"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-  ci p0_c5_sty_fillColor : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_sty_fillColor : drawio:CellStyleEntry [
     dict:hasKey "fillColor"
     dict:hasValue "none"
-    drawio:styleEntryOf p0_c5
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
-
   
-  ci p0_c5_attr_vertex : drawio:CellAttribute [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-7_attr_vertex : drawio:CellAttribute [
     dict:hasKey "vertex"
     dict:hasValue "1"
-    drawio:attributeOf p0_c5
+    drawio:attributeOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-7
     object_diagram:inModel model
   ]
+
   
-  ci p0_c6 : drawio:Cell [
-    drawio:hasCellGeometry drawio:CellGeometry [
-      
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8 : drawio:Vertex [
+    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-8"
+    drawio:hasValue "one-way"
+    drawio:hasParent p0_cell_1
+    object_diagram:inModel model
+    drawio:hasVertexGeometry drawio:VertexGeometry [
       drawio:hasX 450
       drawio:hasY 240
       drawio:hasWidth 70
       drawio:hasHeight 30
     ]
     
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-8"
-    drawio:hasValue "one-way"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
   ]
-
   
-
   
-  ci p0_c6_sty_shape : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_shape : drawio:CellStyleEntry [
     dict:hasKey "shape"
     dict:hasValue "text"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_html : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_html : drawio:CellStyleEntry [
     dict:hasKey "html"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_align : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_align : drawio:CellStyleEntry [
     dict:hasKey "align"
     dict:hasValue "center"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_verticalAlign : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_verticalAlign : drawio:CellStyleEntry [
     dict:hasKey "verticalAlign"
     dict:hasValue "middle"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_resizable : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_resizable : drawio:CellStyleEntry [
     dict:hasKey "resizable"
     dict:hasValue "0"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_points : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_points : drawio:CellStyleEntry [
     dict:hasKey "points"
     dict:hasValue "[]"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_autosize : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_autosize : drawio:CellStyleEntry [
     dict:hasKey "autosize"
     dict:hasValue "1"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_strokeColor : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_strokeColor : drawio:CellStyleEntry [
     dict:hasKey "strokeColor"
     dict:hasValue "none"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  ci p0_c6_sty_fillColor : drawio:CellStyleEntry [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_sty_fillColor : drawio:CellStyleEntry [
     dict:hasKey "fillColor"
     dict:hasValue "none"
-    drawio:styleEntryOf p0_c6
+    drawio:styleEntryOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-
   
-  ci p0_c6_attr_vertex : drawio:CellAttribute [
+  ci p0_cell_qRJj-DUdr-XVhgo4Xc_a-8_attr_vertex : drawio:CellAttribute [
     dict:hasKey "vertex"
     dict:hasValue "1"
-    drawio:attributeOf p0_c6
+    drawio:attributeOf p0_cell_qRJj-DUdr-XVhgo4Xc_a-8
     object_diagram:inModel model
   ]
-  
 
   
-  ci p0_e0 : drawio:Edge [
-    drawio:hasEdgeGeometry drawio:EdgeGeometry [
-      drawio:hasSourcePoint drawio:Point [
-        
-        drawio:hasX 190
-        drawio:hasY 390
-      ]
-      drawio:hasTargetPoint drawio:Point [
-        
-        drawio:hasX 290
-        drawio:hasY 290
-      ]
-    ]
-    
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-3"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
-  ]
-
-  
-
-  
-  ci p0_e0_sty_shape : drawio:CellStyleEntry [
-    dict:hasKey "shape"
-    dict:hasValue "flexArrow"
-    drawio:styleEntryOf p0_e0
-    object_diagram:inModel model
-  ]
-  ci p0_e0_sty_endArrow : drawio:CellStyleEntry [
-    dict:hasKey "endArrow"
-    dict:hasValue "classic"
-    drawio:styleEntryOf p0_e0
-    object_diagram:inModel model
-  ]
-  ci p0_e0_sty_startArrow : drawio:CellStyleEntry [
-    dict:hasKey "startArrow"
-    dict:hasValue "classic"
-    drawio:styleEntryOf p0_e0
-    object_diagram:inModel model
-  ]
-  ci p0_e0_sty_html : drawio:CellStyleEntry [
-    dict:hasKey "html"
-    dict:hasValue "1"
-    drawio:styleEntryOf p0_e0
-    object_diagram:inModel model
-  ]
-  ci p0_e0_sty_rounded : drawio:CellStyleEntry [
-    dict:hasKey "rounded"
-    dict:hasValue "0"
-    drawio:styleEntryOf p0_e0
-    object_diagram:inModel model
-  ]
-
-  
-  
-  ci p0_e1 : drawio:Edge [
-    drawio:hasEdgeGeometry drawio:EdgeGeometry [
-      drawio:hasSourcePoint drawio:Point [
-        
-        drawio:hasX 450
-        drawio:hasY 390
-      ]
-      drawio:hasTargetPoint drawio:Point [
-        
-        drawio:hasX 500
-        drawio:hasY 340
-      ]
-    ]
-    
-    drawio:hasDrawioId "qRJj-DUdr-XVhgo4Xc_a-5"
-    drawio:hasParent p0_c1
-    object_diagram:inModel model
-  ]
-
-  
-
-  
-  ci p0_e1_sty_shape : drawio:CellStyleEntry [
-    dict:hasKey "shape"
-    dict:hasValue "flexArrow"
-    drawio:styleEntryOf p0_e1
-    object_diagram:inModel model
-  ]
-  ci p0_e1_sty_endArrow : drawio:CellStyleEntry [
-    dict:hasKey "endArrow"
-    dict:hasValue "classic"
-    drawio:styleEntryOf p0_e1
-    object_diagram:inModel model
-  ]
-  ci p0_e1_sty_html : drawio:CellStyleEntry [
-    dict:hasKey "html"
-    dict:hasValue "1"
-    drawio:styleEntryOf p0_e1
-    object_diagram:inModel model
-  ]
-  ci p0_e1_sty_rounded : drawio:CellStyleEntry [
-    dict:hasKey "rounded"
-    dict:hasValue "0"
-    drawio:styleEntryOf p0_e1
-    object_diagram:inModel model
-  ]
-
-  
-  
 
 }

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/vocabulary/formalisms/drawio.oml

@@ -21,7 +21,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 	// All cells are vertices or edges, except for:
 	//   (1) The root cell of a page
 	//   (2) The cells that represent layers (direct children of the root cell)
-	aspect AbstractCell :> elementWithDrawioId []
+	concept Cell :> elementWithDrawioId []
 
 	scalar property hasValue [
 		domain Cell
@@ -30,8 +30,8 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 	]
 	
 	relation entity HasParentCell :> acyclic:Acyclic, object_diagram:Link [
-		from AbstractCell
-		to AbstractCell
+		from Cell
+		to Cell
 		forward hasParent
 		reverse hasChild
 		asymmetric
@@ -40,7 +40,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 	]
 	
 	relation entity HasProperty :> object_diagram:Link [
-		from AbstractCell
+		from Cell
 		to CellProperty
 		forward hasProperty
 		reverse propertyOf
@@ -49,7 +49,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 		inverse functional
 	]
 	relation entity HasStyleEntry :> object_diagram:Link [
-		from AbstractCell
+		from Cell
 		to CellStyleEntry
 		forward hasStyleEntry
 		reverse styleEntryOf
@@ -58,7 +58,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 		inverse functional
 	]
 	relation entity HasCellAttribute :> object_diagram:Link [
-		from AbstractCell
+		from Cell
 		to CellAttribute
 		forward hasCellAttribute
 		reverse attributeOf
@@ -86,17 +86,17 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 		functional
 	]
 	
-	structure CellGeometry :> Point [
+	structure VertexGeometry :> Point [
 		restricts scalar property hasWidth to exactly 1
 		restricts scalar property hasHeight to exactly 1
 	]
 	scalar property hasWidth :> object_diagram:hasField [
-		domain CellGeometry
+		domain VertexGeometry
 		range xsd:decimal
 		functional
 	]
 	scalar property hasHeight :> object_diagram:hasField [
-		domain CellGeometry
+		domain VertexGeometry
 		range xsd:decimal
 		functional
 	]
@@ -129,12 +129,12 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 		functional
 	]
 	
-	concept Cell :> AbstractCell []
-	concept Edge :> AbstractCell []
+	concept Vertex :> Cell []
+	concept Edge :> Cell []
 	
-	structured property hasCellGeometry [
-		domain Cell
-		range CellGeometry
+	structured property hasVertexGeometry [
+		domain Vertex
+		range VertexGeometry
 		functional
 	]
 	structured property hasEdgeGeometry [
@@ -145,7 +145,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 	
 	relation entity EdgeHasSource [
 		from Edge
-		to Cell
+		to Vertex
 		forward hasSource
 		reverse sourceOf
 		functional
@@ -154,7 +154,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio {
 	]
 	relation entity EdgeHasTarget [
 		from Edge
-		to Cell
+		to Vertex
 		forward hasTarget
 		reverse targetOf
 		functional