better way to create event

app.py

@@ -61,13 +61,11 @@ def create_XML(full_pred, text_mapping, scale):
     }
     
     size_elements = {
-        'start': (43.2, 43.2),
+        'event': (43.2, 43.2),
         'task': (120, 96),
         'message': (43.2, 43.2),
         'messageEvent': (43.2, 43.2),
-        'end': (43.2, 43.2),
         'exclusiveGateway': (60, 60),
-        'event': (43.2, 43.2),
         'parallelGateway': (60, 60),
         'dataObject': (48, 72),
         'dataStore': (72, 72),

modules/toXML.py

@@ -11,8 +11,7 @@ def rescale(scale, boxes):
 
 def create_BPMN_id(data):
     enums = {
-        'end_event': 1,
-        'start_event': 1,
+        'event': 1,
         'task': 1,
         'sequenceFlow': 1,
         'messageFlow': 1,
@@ -29,25 +28,20 @@ def create_BPMN_id(data):
     BPMN_name = [class_dict[label] for label in data['labels']]
 
     for idx, Bpmn_id in enumerate(BPMN_name):
-        if Bpmn_id == 'event':
-            if data['links'][idx][0] is not None and data['links'][idx][1] is None:
-                key = 'end_event'
-            elif data['links'][idx][0] is None and data['links'][idx][1] is not None:
-                key = 'start_event'
-        else:
-            key = {
-                'task': 'task',
-                'dataObject': 'dataObject',
-                'sequenceFlow': 'sequenceFlow',
-                'messageFlow': 'messageFlow',
-                'messageEvent': 'message_event',
-                'exclusiveGateway': 'exclusiveGateway',
-                'parallelGateway': 'parallelGateway',
-                'dataAssociation': 'dataAssociation',
-                'pool': 'pool',
-                'dataStore': 'dataStore',
-                'timerEvent': 'timerEvent'
-            }.get(Bpmn_id, None)
+        key = {
+            'event': 'event',
+            'task': 'task',
+            'dataObject': 'dataObject',
+            'sequenceFlow': 'sequenceFlow',
+            'messageFlow': 'messageFlow',
+            'messageEvent': 'message_event',
+            'exclusiveGateway': 'exclusiveGateway',
+            'parallelGateway': 'parallelGateway',
+            'dataAssociation': 'dataAssociation',
+            'pool': 'pool',
+            'dataStore': 'dataStore',
+            'timerEvent': 'timerEvent'
+        }.get(Bpmn_id, None)
 
         if key:
             data['BPMN_id'][idx] = f'{key}_{enums[key]}'
@@ -139,9 +133,16 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
         x, y = positions[i][:2]
 
         # Start Event
-        if element_type == 'start':
-            element = ET.SubElement(process, 'bpmn:startEvent', id=element_id, name=text_mapping[element_id])
-            add_diagram_elements(bpmnplane, element_id, x, y, size['start'][0], size['start'][1])
+        if element_type == 'event':
+            status = check_status(links[i], keep_elements)
+            if status == 'start':
+                element = ET.SubElement(process, 'bpmn:startEvent', id=element_id, name=text_mapping[element_id])
+            elif status == 'middle':
+                element = ET.SubElement(process, 'bpmn:intermediateCatchEvent', id=element_id, name=text_mapping[element_id])
+            elif status == 'end':
+                element = ET.SubElement(process, 'bpmn:endEvent', id=element_id, name=text_mapping[element_id])
+
+            add_diagram_elements(bpmnplane, element_id, x, y, size['event'][0], size['event'][1])
 
         # Task
         elif element_type == 'task':
@@ -204,11 +205,6 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
             ET.SubElement(element, 'bpmn:messageEventDefinition', id=f'MessageEventDefinition_{i+1}')
             add_diagram_elements(bpmnplane, element_id, x, y, size['message'][0], size['message'][1])
 
-        # End Event
-        elif element_type == 'end':
-            element = ET.SubElement(process, 'bpmn:endEvent', id=element_id, name=text_mapping[element_id])
-            add_diagram_elements(bpmnplane, element_id, x, y, size['end'][0], size['end'][1])
-
         # Gateways (Exclusive, Parallel)
         elif element_type in ['exclusiveGateway', 'parallelGateway']:
             gateway_type = 'exclusiveGateway' if element_type == 'exclusiveGateway' else 'parallelGateway'