From d718e984d3244ba6846c2826ec5ccfde811747ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9line=20Souchet?= <celine.souchet@bonitasoft.com>
Date: Wed, 30 Sep 2020 17:11:57 +0200
Subject: [PATCH] Fix label position

---
 test/e2e/mxGraph.model.test.ts                |  55 ++--------
 .../bpmn/model-complete-semantic.bpmn         | 103 ++----------------
 2 files changed, 16 insertions(+), 142 deletions(-)

diff --git a/test/e2e/mxGraph.model.test.ts b/test/e2e/mxGraph.model.test.ts
index 3a96d711e9..461147588e 100644
--- a/test/e2e/mxGraph.model.test.ts
+++ b/test/e2e/mxGraph.model.test.ts
@@ -753,45 +753,23 @@ describe('mxGraph model', () => {
 
     // activity
     // Task
-    expectModelContainsShape('task_id', {
-      kind: ShapeBpmnElementKind.TASK,
-      font: {
-        isBold: false,
-        isItalic: false,
-        isStrikeThrough: false,
-        isUnderline: true,
-        name: 'Arial',
-        size: 11.0,
-      },
-      label: 'Task',
-    });
+    expectModelContainsShape('task_id', { kind: ShapeBpmnElementKind.TASK, label: 'Task' });
     expectModelContainsShape('task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK,
-      font: {
-        isBold: false,
-        isItalic: false,
-        isStrikeThrough: false,
-        isUnderline: true,
-        name: 'Arial',
-        size: 11.0,
-      },
       label: 'Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK,
-      font: {
-        isBold: false,
-        isItalic: false,
-        isStrikeThrough: false,
-        isUnderline: true,
-        name: 'Arial',
-        size: 11.0,
-      },
       label: 'Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('task_with_parallel_multi_instance_id', {
+      kind: ShapeBpmnElementKind.TASK,
+      label: 'Task With Parallel Multi-instance',
+      markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
+    });
+    expectModelContainsShape('task_with_flows_id', {
       kind: ShapeBpmnElementKind.TASK,
       font: {
         isBold: false,
@@ -801,27 +779,23 @@ describe('mxGraph model', () => {
         name: 'Arial',
         size: 11.0,
       },
-      label: 'Task With Parallel Multi-instance',
-      markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
+      label: 'Task with Flows',
     });
 
     // Service Task
     expectModelContainsShape('service_task_id', { kind: ShapeBpmnElementKind.TASK_SERVICE, font: expectedBoldFont, label: 'Service Task' });
     expectModelContainsShape('service_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_SERVICE,
-      font: expectedBoldFont,
       label: 'Service Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('service_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SERVICE,
-      font: expectedBoldFont,
       label: 'Service Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('service_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SERVICE,
-      font: expectedBoldFont,
       label: 'Service Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
@@ -830,19 +804,16 @@ describe('mxGraph model', () => {
     expectModelContainsShape('user_task_id', { kind: ShapeBpmnElementKind.TASK_USER, font: expectedBoldFont, label: 'User Task' });
     expectModelContainsShape('user_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_USER,
-      font: expectedBoldFont,
       label: 'User Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('user_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_USER,
-      font: expectedBoldFont,
       label: 'User Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('user_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_USER,
-      font: expectedBoldFont,
       label: 'User Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
@@ -893,19 +864,16 @@ describe('mxGraph model', () => {
     expectModelContainsShape('send_task_id', { kind: ShapeBpmnElementKind.TASK_SEND, font: expectedBoldFont, label: 'Send Task' });
     expectModelContainsShape('send_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_SEND,
-      font: expectedBoldFont,
       label: 'Send Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('send_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SEND,
-      font: expectedBoldFont,
       label: 'Send Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('send_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SEND,
-      font: expectedBoldFont,
       label: 'Send Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
@@ -914,19 +882,16 @@ describe('mxGraph model', () => {
     expectModelContainsShape('manual_task_id', { kind: ShapeBpmnElementKind.TASK_MANUAL, font: expectedBoldFont, label: 'Manual Task' });
     expectModelContainsShape('manual_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_MANUAL,
-      font: expectedBoldFont,
       label: 'Manual Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('manual_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_MANUAL,
-      font: expectedBoldFont,
       label: 'Manual Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('manual_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_MANUAL,
-      font: expectedBoldFont,
       label: 'Manual Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
@@ -935,19 +900,16 @@ describe('mxGraph model', () => {
     expectModelContainsShape('script_task_id', { kind: ShapeBpmnElementKind.TASK_SCRIPT, font: expectedBoldFont, label: 'Script Task' });
     expectModelContainsShape('script_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_SCRIPT,
-      font: expectedBoldFont,
       label: 'Script Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('script_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SCRIPT,
-      font: expectedBoldFont,
       label: 'Script Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('script_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_SCRIPT,
-      font: expectedBoldFont,
       label: 'Script Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
@@ -956,19 +918,16 @@ describe('mxGraph model', () => {
     expectModelContainsShape('business_rule_task_id', { kind: ShapeBpmnElementKind.TASK_BUSINESS_RULE, font: expectedBoldFont, label: 'Business Rule Task' });
     expectModelContainsShape('business_rule_task_with_loop_id', {
       kind: ShapeBpmnElementKind.TASK_BUSINESS_RULE,
-      font: expectedBoldFont,
       label: 'Business Rule Task With Loop',
       markers: [ShapeBpmnMarkerKind.LOOP],
     });
     expectModelContainsShape('business_rule_task_with_sequential_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_BUSINESS_RULE,
-      font: expectedBoldFont,
       label: 'Business Rule Task With Sequential Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_SEQUENTIAL],
     });
     expectModelContainsShape('business_rule_task_with_parallel_multi_instance_id', {
       kind: ShapeBpmnElementKind.TASK_BUSINESS_RULE,
-      font: expectedBoldFont,
       label: 'Business Rule Task With Parallel Multi-instance',
       markers: [ShapeBpmnMarkerKind.MULTI_INSTANCE_PARALLEL],
     });
diff --git a/test/fixtures/bpmn/model-complete-semantic.bpmn b/test/fixtures/bpmn/model-complete-semantic.bpmn
index da82602d9d..9ece8ef41c 100644
--- a/test/fixtures/bpmn/model-complete-semantic.bpmn
+++ b/test/fixtures/bpmn/model-complete-semantic.bpmn
@@ -515,138 +515,90 @@
       <bpmndi:BPMNShape id="shape_expanded_call_activity_id" bpmnElement="expanded_call_activity_id" isExpanded="true">
         <dc:Bounds x="2855" y="1400" width="370" height="200"/>
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
+          <dc:Bounds x="2910" y="1410" width="200" height="50"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_expanded_call_activity_with_loop_id" bpmnElement="expanded_call_activity_with_loop_id" isExpanded="true">
         <dc:Bounds x="2855" y="1150" width="370" height="200"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_expanded_call_activity_with_sequential_multi_instance_id" bpmnElement="expanded_call_activity_with_sequential_multi_instance_id"
                         isExpanded="true">
         <dc:Bounds x="2855" y="910" width="370" height="200"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_expanded_call_activity_with_parallel_multi_instance_id" bpmnElement="expanded_call_activity_with_parallel_multi_instance_id" isExpanded="true">
         <dc:Bounds x="2855" y="660" width="370" height="200"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Collapsed -->
       <bpmndi:BPMNShape id="shape_collapsed_call_activity_id" bpmnElement="collapsed_call_activity_id" isExpanded="false">
         <dc:Bounds x="2970" y="2175" width="140" height="90"/>
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
+          <dc:Bounds x="3000" y="2200" width="100" height="70"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_collapsed_call_activity_with_loop_id" bpmnElement="collapsed_call_activity_with_loop_id" isExpanded="false">
         <dc:Bounds x="2970" y="2035" width="140" height="90"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_collapsed_call_activity_with_sequential_multi_instance_id" bpmnElement="collapsed_call_activity_with_sequential_multi_instance_id"
                         isExpanded="false">
         <dc:Bounds x="2970" y="1905" width="140" height="90"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_collapsed_call_activity_with_parallel_multi_instance_id" bpmnElement="collapsed_call_activity_with_parallel_multi_instance_id" isExpanded="false">
         <dc:Bounds x="2970" y="1768" width="140" height="90"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="440.18" width="72.5" height="25"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Task -->
       <bpmndi:BPMNShape id="shape_task_with_flows_id" bpmnElement="task_with_flows_id">
         <dc:Bounds x="1018" y="1026" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_underline_id">
-          <dc:Bounds x="263.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="1020" y="1040" width="72.48293963254594" height="12.804751171875008"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_task_id" bpmnElement="task_id">
         <dc:Bounds x="2328" y="1926" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_underline_id">
-          <dc:Bounds x="263.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_task_with_loop_id" bpmnElement="task_with_loop_id">
         <dc:Bounds x="2128" y="1926" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_underline_id">
-          <dc:Bounds x="263.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_task_with_sequential_multi_instance_id" bpmnElement="task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1926" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_underline_id">
-          <dc:Bounds x="263.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_task_with_parallel_multi_instance_id" bpmnElement="task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1926" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_underline_id">
-          <dc:Bounds x="263.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Service Task -->
       <bpmndi:BPMNShape id="shape_service_task_id" bpmnElement="service_task_id">
         <dc:Bounds x="2328" y="1746" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="395.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1760" width="72.48293963254594" height="12.804751171875008"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_service_task_with_loop_id" bpmnElement="service_task_with_loop_id">
         <dc:Bounds x="2128" y="1746" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="395.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_service_task_with_sequential_multi_instance_id" bpmnElement="service_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1746" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="395.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_service_task_with_parallel_multi_instance_id" bpmnElement="service_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1746" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="395.3333333333333" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- User Task -->
       <bpmndi:BPMNShape id="shape_user_task_id" bpmnElement="user_task_id">
         <dc:Bounds x="2328" y="1576" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1590" width="72.48293963254594" height="12.804751171875008"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_user_task_with_loop_id" bpmnElement="user_task_with_loop_id">
         <dc:Bounds x="2128" y="1576" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_user_task_with_sequential_multi_instance_id" bpmnElement="user_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1576" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_user_task_with_parallel_multi_instance_id" bpmnElement="user_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1576" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Receive Task: Non-instantiating -->
@@ -681,104 +633,68 @@
       <bpmndi:BPMNShape id="shape_send_task_id" bpmnElement="send_task_id">
         <dc:Bounds x="2328" y="1476" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1490" width="75" height="60"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_send_task_with_loop_id" bpmnElement="send_task_with_loop_id">
         <dc:Bounds x="2128" y="1476" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_send_task_with_sequential_multi_instance_id" bpmnElement="send_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1476" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_send_task_with_parallel_multi_instance_id" bpmnElement="send_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1476" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Manual Task -->
       <bpmndi:BPMNShape id="shape_manual_task_id" bpmnElement="manual_task_id">
         <dc:Bounds x="2328" y="1260" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1275" width="75" height="65"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_manual_task_with_loop_id" bpmnElement="manual_task_with_loop_id">
         <dc:Bounds x="2128" y="1260" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_manual_task_with_sequential_multi_instance_id" bpmnElement="manual_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1260" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_manual_task_with_parallel_multi_instance_id" bpmnElement="manual_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1260" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Script Task -->
       <bpmndi:BPMNShape id="shape_script_task_id" bpmnElement="script_task_id">
         <dc:Bounds x="2328" y="1140" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1155" width="75" height="65"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_script_task_with_loop_id" bpmnElement="script_task_with_loop_id">
         <dc:Bounds x="2128" y="1140" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_script_task_with_sequential_multi_instance_id" bpmnElement="script_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1140" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_script_task_with_parallel_multi_instance_id" bpmnElement="script_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1140" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Business Rule Task -->
       <bpmndi:BPMNShape id="shape_business_rule_task_id" bpmnElement="business_rule_task_id">
         <dc:Bounds x="2328" y="1020" width="100" height="80"/>
         <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
+          <dc:Bounds x="2340" y="1035" width="75" height="65"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_business_rule_task_with_loop_id" bpmnElement="business_rule_task_with_loop_id">
         <dc:Bounds x="2128" y="1020" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_business_rule_task_with_sequential_multi_instance_id" bpmnElement="business_rule_task_with_sequential_multi_instance_id">
         <dc:Bounds x="1948" y="1020" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="shape_business_rule_task_with_parallel_multi_instance_id" bpmnElement="business_rule_task_with_parallel_multi_instance_id">
         <dc:Bounds x="1768" y="1020" width="100" height="80"/>
-        <bpmndi:BPMNLabel labelStyle="font_bold_id">
-          <dc:Bounds x="527.3333333333334" y="344.5818763825664" width="72.48293963254594" height="12.804751171875008"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
 
       <!-- Embedded Sub-Process -->
@@ -1402,7 +1318,6 @@
       <bpmndi:BPMNShape id="shape_lane_4_2_id_di" bpmnElement="lane_4_2_id" isHorizontal="true">
         <dc:Bounds x="1270" y="250" width="570" height="80"/>
       </bpmndi:BPMNShape>
-
     </bpmndi:BPMNPlane>
 
     <!-- BPMN Label Styles -->