@nanobpm/nano-workforce 0.186.0 → 0.186.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/SPEC.md +14 -3
  3. package/app/contracts.ts +8 -1
  4. package/app/deliveryHuman.test.ts +123 -0
  5. package/app/deliveryHuman.ts +29 -0
  6. package/app/mergeLoopBehaviour.test.ts +90 -0
  7. package/app/mergeableWait.test.ts +42 -1
  8. package/app/mergeableWait.ts +23 -0
  9. package/app/pollUserTasks.test.ts +56 -0
  10. package/app/service.ts +28 -3
  11. package/package.json +1 -1
  12. package/resources/forms/delivery-human-generic.form +3 -32
  13. package/resources/processes/merge-loop.bpmn +291 -235
  14. package/workers/merge-stall-probe/worker.ts +10 -6
package/resources/processes/merge-loop.bpmn CHANGED
@@ -155,8 +155,16 @@
155
155
  </zeebe:ioMapping>
156
156
  </bpmn:extensionElements>
157
157
  <bpmn:incoming>f_mw_stall</bpmn:incoming>
158
+ <bpmn:incoming>f_mrp_probe</bpmn:incoming>
158
159
  <bpmn:outgoing>f_msp_gate</bpmn:outgoing>
159
160
  </bpmn:serviceTask>
161
+ <bpmn:intermediateCatchEvent id="wait-mergeable-repoll" name="Re-poll: mergeability settling">
162
+ <bpmn:incoming>f_m_mWaiting</bpmn:incoming>
163
+ <bpmn:outgoing>f_mrp_probe</bpmn:outgoing>
164
+ <bpmn:timerEventDefinition id="ted_mergeableRepoll">
165
+ <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=mergeableRepollInterval</bpmn:timeDuration>
166
+ </bpmn:timerEventDefinition>
167
+ </bpmn:intermediateCatchEvent>
160
168
  <bpmn:exclusiveGateway id="gw-merge-stall" name="stall rounds within budget?" default="f_msp_giveup">
161
169
  <bpmn:incoming>f_msp_gate</bpmn:incoming>
162
170
  <bpmn:outgoing>f_msp_rederive</bpmn:outgoing>
@@ -168,6 +176,8 @@
168
176
  <bpmn:outgoing>f_m_mReady</bpmn:outgoing>
169
177
  <bpmn:outgoing>f_m_mCiFix</bpmn:outgoing>
170
178
  <bpmn:outgoing>f_m_mRebase</bpmn:outgoing>
179
+ <bpmn:outgoing>f_m_mWaiting</bpmn:outgoing>
180
+ <bpmn:outgoing>f_m_mDraft</bpmn:outgoing>
171
181
  <bpmn:outgoing>f_m_mBlocked</bpmn:outgoing>
172
182
  </bpmn:exclusiveGateway>
173
183
  <bpmn:serviceTask id="attempt-merge" name="Merge PR">
@@ -247,10 +257,10 @@
247
257
  </zeebe:properties>
248
258
  <zeebe:ioMapping>
249
259
  <zeebe:input source="=&#34;blocked&#34;" target="status" />
250
- <zeebe:input source="=if mergeState = &#34;draft&#34; then &#34;This PR is in draft and can&#39;t be merged. Mark it ready (gh pr ready), then reply to retry.&#34; else &#34;This PR is not mergeable (state: &#34; + mergeState + &#34;). Resolve the conflict or failing required check on the branch, then reply to retry.&#34;" target="question" />
260
+ <zeebe:input source="=if mergeState = &#34;draft&#34; then &#34;This PR is in draft and can&#39;t be merged. Mark it ready (gh pr ready), then reply to retry.&#34; else if mergeState = &#34;waiting&#34; then &#34;GitHub never settled this PR&#39;s mergeability (still computing after repeated re-polls, or the state could not be read). Check the PR on GitHub — resolve any conflict or failing required check if present — then reply to retry.&#34; else &#34;This PR is not mergeable (state: &#34; + mergeState + &#34;). Resolve the conflict or failing required check on the branch, then reply to retry.&#34;" target="question" />
251
261
  </zeebe:ioMapping>
252
262
  </bpmn:extensionElements>
253
- <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
263
+ <bpmn:incoming>f_m_mDraft</bpmn:incoming>
254
264
  <bpmn:incoming>f_ci_giveup</bpmn:incoming>
255
265
  <bpmn:incoming>f_reb_giveup</bpmn:incoming>
256
266
  <bpmn:incoming>f_reb_escConflict</bpmn:incoming>
@@ -484,6 +494,7 @@
484
494
  <bpmn:sequenceFlow id="f_ci_rearm" name="fixed / re-attempt / reconcile — re-arm" sourceRef="gw-ci-outcome" targetRef="arm-merge" />
485
495
  <bpmn:exclusiveGateway id="gw-rebase" name="auto-rebase?" default="f_reb_giveup">
486
496
  <bpmn:incoming>f_m_mRebase</bpmn:incoming>
497
+ <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
487
498
  <bpmn:outgoing>f_reb_go</bpmn:outgoing>
488
499
  <bpmn:outgoing>f_reb_giveup</bpmn:outgoing>
489
500
  </bpmn:exclusiveGateway>
@@ -629,7 +640,14 @@
629
640
  <bpmn:sequenceFlow id="f_m_mRebase" name="conflict" sourceRef="gw-mergeable" targetRef="gw-rebase">
630
641
  <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "conflict"</bpmn:conditionExpression>
631
642
  </bpmn:sequenceFlow>
632
- <bpmn:sequenceFlow id="f_m_mBlocked" name="not landable" sourceRef="gw-mergeable" targetRef="merge-esc-conflict" />
643
+ <bpmn:sequenceFlow id="f_m_mWaiting" name="waiting (GitHub still computing) — re-poll" sourceRef="gw-mergeable" targetRef="wait-mergeable-repoll">
644
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "waiting"</bpmn:conditionExpression>
645
+ </bpmn:sequenceFlow>
646
+ <bpmn:sequenceFlow id="f_m_mDraft" name="draft — mark ready (human)" sourceRef="gw-mergeable" targetRef="merge-esc-conflict">
647
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "draft"</bpmn:conditionExpression>
648
+ </bpmn:sequenceFlow>
649
+ <bpmn:sequenceFlow id="f_mrp_probe" sourceRef="wait-mergeable-repoll" targetRef="merge-stall-probe" />
650
+ <bpmn:sequenceFlow id="f_m_mBlocked" name="unclassified — auto-rebase" sourceRef="gw-mergeable" targetRef="gw-rebase" />
633
651
  <bpmn:sequenceFlow id="f_ci_go" name="within budget" sourceRef="gw-ci-fix" targetRef="SP_cifix">
634
652
  <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciFixRound &lt; ciFixMax and failingChecks &gt; 0</bpmn:conditionExpression>
635
653
  </bpmn:sequenceFlow>
@@ -708,137 +726,143 @@
708
726
  <bpmndi:BPMNShape id="BPMNShape_wait-mergeable" bpmnElement="wait-mergeable">
709
727
  <dc:Bounds x="852" y="262" width="36" height="36" />
710
728
  <bpmndi:BPMNLabel>
711
- <dc:Bounds x="835" y="303" width="70" height="28" />
729
+ <dc:Bounds x="835" y="229" width="70" height="28" />
712
730
  </bpmndi:BPMNLabel>
713
731
  </bpmndi:BPMNShape>
714
732
  <bpmndi:BPMNShape id="BPMNShape_wait-mergeable-timeout" bpmnElement="wait-mergeable-timeout">
715
- <dc:Bounds x="852" y="422" width="36" height="36" />
733
+ <dc:Bounds x="852" y="582" width="36" height="36" />
716
734
  <bpmndi:BPMNLabel>
717
- <dc:Bounds x="835" y="463" width="70" height="42" />
735
+ <dc:Bounds x="893" y="579" width="70" height="42" />
718
736
  </bpmndi:BPMNLabel>
719
737
  </bpmndi:BPMNShape>
720
738
  <bpmndi:BPMNShape id="BPMNShape_merge-stall-probe" bpmnElement="merge-stall-probe">
721
- <dc:Bounds x="988" y="400" width="100" height="80" />
739
+ <dc:Bounds x="1338" y="1520" width="100" height="80" />
740
+ </bpmndi:BPMNShape>
741
+ <bpmndi:BPMNShape id="BPMNShape_wait-mergeable-repoll" bpmnElement="wait-mergeable-repoll">
742
+ <dc:Bounds x="1170" y="1542" width="36" height="36" />
743
+ <bpmndi:BPMNLabel>
744
+ <dc:Bounds x="1146" y="1495" width="84" height="42" />
745
+ </bpmndi:BPMNLabel>
722
746
  </bpmndi:BPMNShape>
723
747
  <bpmndi:BPMNShape id="BPMNShape_gw-merge-stall" bpmnElement="gw-merge-stall" isMarkerVisible="true">
724
- <dc:Bounds x="1188" y="415" width="50" height="50" />
748
+ <dc:Bounds x="1538" y="1535" width="50" height="50" />
725
749
  <bpmndi:BPMNLabel>
726
- <dc:Bounds x="1191" y="470" width="85" height="42" />
750
+ <dc:Bounds x="1521" y="1650" width="85" height="42" />
727
751
  </bpmndi:BPMNLabel>
728
752
  </bpmndi:BPMNShape>
729
753
  <bpmndi:BPMNShape id="BPMNShape_gw-mergeable" bpmnElement="gw-mergeable" isMarkerVisible="true">
730
- <dc:Bounds x="1338" y="255" width="50" height="50" />
754
+ <dc:Bounds x="988" y="255" width="50" height="50" />
731
755
  <bpmndi:BPMNLabel>
732
- <dc:Bounds x="1325" y="236" width="77" height="14" />
756
+ <dc:Bounds x="975" y="236" width="77" height="14" />
733
757
  </bpmndi:BPMNLabel>
734
758
  </bpmndi:BPMNShape>
735
759
  <bpmndi:BPMNShape id="BPMNShape_attempt-merge" bpmnElement="attempt-merge">
736
- <dc:Bounds x="1488" y="240" width="100" height="80" />
760
+ <dc:Bounds x="1138" y="240" width="100" height="80" />
737
761
  </bpmndi:BPMNShape>
738
762
  <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
739
- <dc:Bounds x="1713" y="255" width="50" height="50" />
763
+ <dc:Bounds x="1363" y="255" width="50" height="50" />
740
764
  <bpmndi:BPMNLabel>
741
- <dc:Bounds x="1712" y="350" width="53" height="28" />
765
+ <dc:Bounds x="1362" y="350" width="53" height="28" />
742
766
  </bpmndi:BPMNLabel>
743
767
  </bpmndi:BPMNShape>
744
768
  <bpmndi:BPMNShape id="BPMNShape_gw-merge-retry" bpmnElement="gw-merge-retry" isMarkerVisible="true">
745
- <dc:Bounds x="1888" y="735" width="50" height="50" />
769
+ <dc:Bounds x="1538" y="735" width="50" height="50" />
746
770
  <bpmndi:BPMNLabel>
747
- <dc:Bounds x="1869" y="830" width="88" height="28" />
771
+ <dc:Bounds x="1519" y="702" width="88" height="28" />
748
772
  </bpmndi:BPMNLabel>
749
773
  </bpmndi:BPMNShape>
750
774
  <bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
751
- <dc:Bounds x="1888" y="415" width="50" height="50" />
775
+ <dc:Bounds x="1538" y="415" width="50" height="50" />
752
776
  <bpmndi:BPMNLabel>
753
- <dc:Bounds x="1881" y="490" width="64" height="28" />
777
+ <dc:Bounds x="1531" y="490" width="64" height="28" />
754
778
  </bpmndi:BPMNLabel>
755
779
  </bpmndi:BPMNShape>
756
780
  <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
757
- <dc:Bounds x="2070" y="422" width="36" height="36" />
781
+ <dc:Bounds x="1720" y="422" width="36" height="36" />
758
782
  <bpmndi:BPMNLabel>
759
- <dc:Bounds x="2066" y="483" width="85" height="28" />
783
+ <dc:Bounds x="1736" y="483" width="85" height="28" />
760
784
  </bpmndi:BPMNLabel>
761
785
  </bpmndi:BPMNShape>
762
786
  <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
763
- <dc:Bounds x="2070" y="582" width="36" height="36" />
787
+ <dc:Bounds x="1720" y="582" width="36" height="36" />
764
788
  <bpmndi:BPMNLabel>
765
- <dc:Bounds x="2111" y="579" width="88" height="42" />
789
+ <dc:Bounds x="1761" y="579" width="88" height="42" />
766
790
  </bpmndi:BPMNLabel>
767
791
  </bpmndi:BPMNShape>
768
792
  <bpmndi:BPMNShape id="BPMNShape_wait-landed-timeout" bpmnElement="wait-landed-timeout">
769
- <dc:Bounds x="2070" y="102" width="36" height="36" />
793
+ <dc:Bounds x="1720" y="102" width="36" height="36" />
770
794
  <bpmndi:BPMNLabel>
771
- <dc:Bounds x="1981" y="92" width="84" height="56" />
795
+ <dc:Bounds x="1596" y="143" width="84" height="56" />
772
796
  </bpmndi:BPMNLabel>
773
797
  </bpmndi:BPMNShape>
774
798
  <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
775
- <dc:Bounds x="2238" y="240" width="100" height="80" />
799
+ <dc:Bounds x="1888" y="240" width="100" height="80" />
776
800
  </bpmndi:BPMNShape>
777
801
  <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
778
- <dc:Bounds x="2445" y="262" width="36" height="36" />
802
+ <dc:Bounds x="2095" y="262" width="36" height="36" />
779
803
  <bpmndi:BPMNLabel>
780
- <dc:Bounds x="2438" y="303" width="50" height="14" />
804
+ <dc:Bounds x="2088" y="303" width="50" height="14" />
781
805
  </bpmndi:BPMNLabel>
782
806
  </bpmndi:BPMNShape>
783
807
  <bpmndi:BPMNShape id="BPMNShape_MergeAbandoned" bpmnElement="MergeAbandoned">
784
- <dc:Bounds x="1895" y="902" width="36" height="36" />
808
+ <dc:Bounds x="1545" y="902" width="36" height="36" />
785
809
  <bpmndi:BPMNLabel>
786
- <dc:Bounds x="1872" y="943" width="82" height="28" />
810
+ <dc:Bounds x="1522" y="943" width="82" height="28" />
787
811
  </bpmndi:BPMNLabel>
788
812
  </bpmndi:BPMNShape>
789
813
  <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
790
- <dc:Bounds x="2038" y="1040" width="100" height="80" />
814
+ <dc:Bounds x="1688" y="1040" width="100" height="80" />
791
815
  </bpmndi:BPMNShape>
792
816
  <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
793
- <dc:Bounds x="2038" y="720" width="100" height="80" />
817
+ <dc:Bounds x="1688" y="720" width="100" height="80" />
794
818
  </bpmndi:BPMNShape>
795
819
  <bpmndi:BPMNShape id="BPMNShape_gw-merge-escalated" bpmnElement="gw-merge-escalated" isMarkerVisible="true">
796
- <dc:Bounds x="2438" y="95" width="50" height="50" />
820
+ <dc:Bounds x="2088" y="95" width="50" height="50" />
797
821
  <bpmndi:BPMNLabel>
798
- <dc:Bounds x="2406" y="150" width="74" height="28" />
822
+ <dc:Bounds x="2056" y="170" width="74" height="28" />
799
823
  </bpmndi:BPMNLabel>
800
824
  </bpmndi:BPMNShape>
801
825
  <bpmndi:BPMNShape id="BPMNShape_merge-esc-landed" bpmnElement="merge-esc-landed">
802
- <dc:Bounds x="2238" y="80" width="100" height="80" />
826
+ <dc:Bounds x="1888" y="80" width="100" height="80" />
803
827
  </bpmndi:BPMNShape>
804
828
  <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
805
- <dc:Bounds x="2588" y="80" width="100" height="80" />
829
+ <dc:Bounds x="2238" y="80" width="100" height="80" />
806
830
  </bpmndi:BPMNShape>
807
831
  <bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
808
- <dc:Bounds x="2788" y="80" width="100" height="80" />
832
+ <dc:Bounds x="2438" y="80" width="100" height="80" />
809
833
  </bpmndi:BPMNShape>
810
834
  <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
811
- <dc:Bounds x="1513" y="1055" width="50" height="50" />
835
+ <dc:Bounds x="1163" y="1055" width="50" height="50" />
812
836
  <bpmndi:BPMNLabel>
813
- <dc:Bounds x="1494" y="1036" width="89" height="14" />
837
+ <dc:Bounds x="1204" y="1110" width="89" height="14" />
814
838
  </bpmndi:BPMNLabel>
815
839
  </bpmndi:BPMNShape>
816
840
  <bpmndi:BPMNShape id="BPMNShape_SP_cifix" bpmnElement="SP_cifix">
817
- <dc:Bounds x="1688" y="1200" width="100" height="80" />
841
+ <dc:Bounds x="1338" y="1200" width="100" height="80" />
818
842
  </bpmndi:BPMNShape>
819
843
  <bpmndi:BPMNShape id="BPMNShape_gw-ci-outcome" bpmnElement="gw-ci-outcome" isMarkerVisible="true">
820
- <dc:Bounds x="1888" y="1215" width="50" height="50" />
844
+ <dc:Bounds x="1538" y="1215" width="50" height="50" />
821
845
  <bpmndi:BPMNLabel>
822
- <dc:Bounds x="1882" y="1310" width="63" height="28" />
846
+ <dc:Bounds x="1532" y="1310" width="63" height="28" />
823
847
  </bpmndi:BPMNLabel>
824
848
  </bpmndi:BPMNShape>
825
849
  <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
826
- <dc:Bounds x="1513" y="415" width="50" height="50" />
850
+ <dc:Bounds x="1163" y="415" width="50" height="50" />
827
851
  <bpmndi:BPMNLabel>
828
- <dc:Bounds x="1494" y="470" width="88" height="14" />
852
+ <dc:Bounds x="1144" y="370" width="88" height="14" />
829
853
  </bpmndi:BPMNLabel>
830
854
  </bpmndi:BPMNShape>
831
855
  <bpmndi:BPMNShape id="BPMNShape_SP_rebase" bpmnElement="SP_rebase">
832
- <dc:Bounds x="1688" y="1360" width="100" height="80" />
856
+ <dc:Bounds x="1338" y="1360" width="100" height="80" />
833
857
  </bpmndi:BPMNShape>
834
858
  <bpmndi:BPMNShape id="BPMNShape_gw-rebase-outcome" bpmnElement="gw-rebase-outcome" isMarkerVisible="true">
835
- <dc:Bounds x="1888" y="1375" width="50" height="50" />
859
+ <dc:Bounds x="1538" y="1375" width="50" height="50" />
836
860
  <bpmndi:BPMNLabel>
837
- <dc:Bounds x="1922" y="1430" width="63" height="28" />
861
+ <dc:Bounds x="1532" y="1470" width="63" height="28" />
838
862
  </bpmndi:BPMNLabel>
839
863
  </bpmndi:BPMNShape>
840
864
  <bpmndi:BPMNShape id="BPMNShape_record-merge-dep" bpmnElement="record-merge-dep">
841
- <dc:Bounds x="2038" y="1200" width="100" height="80" />
865
+ <dc:Bounds x="1688" y="1200" width="100" height="80" />
842
866
  </bpmndi:BPMNShape>
843
867
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
844
868
  <di:waypoint x="116" y="280" />
@@ -862,33 +886,33 @@
862
886
  </bpmndi:BPMNEdge>
863
887
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_ready" bpmnElement="f_m_ready">
864
888
  <di:waypoint x="888" y="280" />
865
- <di:waypoint x="1338" y="280" />
889
+ <di:waypoint x="988" y="280" />
866
890
  </bpmndi:BPMNEdge>
867
891
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_mReady" bpmnElement="f_m_mReady">
868
- <di:waypoint x="1388" y="280" />
869
- <di:waypoint x="1488" y="280" />
892
+ <di:waypoint x="1038" y="280" />
893
+ <di:waypoint x="1138" y="280" />
870
894
  <bpmndi:BPMNLabel>
871
- <dc:Bounds x="1419" y="258" width="39" height="14" />
895
+ <dc:Bounds x="1069" y="258" width="39" height="14" />
872
896
  </bpmndi:BPMNLabel>
873
897
  </bpmndi:BPMNEdge>
874
898
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_attempt" bpmnElement="f_m_attempt">
875
- <di:waypoint x="1588" y="280" />
876
- <di:waypoint x="1713" y="280" />
899
+ <di:waypoint x="1238" y="280" />
900
+ <di:waypoint x="1363" y="280" />
877
901
  </bpmndi:BPMNEdge>
878
902
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
879
- <di:waypoint x="1763" y="280" />
880
- <di:waypoint x="2238" y="280" />
903
+ <di:waypoint x="1413" y="280" />
904
+ <di:waypoint x="1888" y="280" />
881
905
  <bpmndi:BPMNLabel>
882
- <dc:Bounds x="2051" y="258" width="49" height="14" />
906
+ <dc:Bounds x="1721" y="258" width="49" height="14" />
883
907
  </bpmndi:BPMNLabel>
884
908
  </bpmndi:BPMNEdge>
885
909
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
886
- <di:waypoint x="2338" y="280" />
887
- <di:waypoint x="2445" y="280" />
910
+ <di:waypoint x="1988" y="280" />
911
+ <di:waypoint x="2095" y="280" />
888
912
  </bpmndi:BPMNEdge>
889
913
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_rearm" bpmnElement="f_ci_rearm">
890
- <di:waypoint x="1913" y="1265" />
891
- <di:waypoint x="1913" y="1300" />
914
+ <di:waypoint x="1563" y="1265" />
915
+ <di:waypoint x="1563" y="1300" />
892
916
  <di:waypoint x="402" y="1300" />
893
917
  <di:waypoint x="402" y="320" />
894
918
  <bpmndi:BPMNLabel>
@@ -896,316 +920,348 @@
896
920
  </bpmndi:BPMNLabel>
897
921
  </bpmndi:BPMNEdge>
898
922
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rearm" bpmnElement="f_reb_rearm">
899
- <di:waypoint x="1913" y="1425" />
900
- <di:waypoint x="1913" y="1460" />
923
+ <di:waypoint x="1563" y="1425" />
924
+ <di:waypoint x="1563" y="1460" />
901
925
  <di:waypoint x="402" y="1460" />
902
926
  <di:waypoint x="402" y="320" />
903
927
  <bpmndi:BPMNLabel>
904
- <dc:Bounds x="1119" y="1413" width="78" height="42" />
928
+ <dc:Bounds x="924" y="1413" width="78" height="42" />
905
929
  </bpmndi:BPMNLabel>
906
930
  </bpmndi:BPMNEdge>
907
931
  <bpmndi:BPMNEdge id="BPMNEdge_f_msp_giveup" bpmnElement="f_msp_giveup">
908
- <di:waypoint x="1238" y="440" />
909
- <di:waypoint x="1258" y="440" />
910
- <di:waypoint x="1258" y="465" />
911
- <di:waypoint x="1651" y="465" />
912
- <di:waypoint x="1651" y="1060" />
913
- <di:waypoint x="2038" y="1060" />
932
+ <di:waypoint x="1588" y="1560" />
933
+ <di:waypoint x="1608" y="1560" />
934
+ <di:waypoint x="1608" y="1535" />
935
+ <di:waypoint x="1601" y="1535" />
936
+ <di:waypoint x="1601" y="1140" />
937
+ <di:waypoint x="1708" y="1140" />
938
+ <di:waypoint x="1708" y="1120" />
914
939
  <bpmndi:BPMNLabel>
915
- <dc:Bounds x="1378" y="470" width="85" height="28" />
940
+ <dc:Bounds x="1606" y="1441" width="85" height="28" />
916
941
  </bpmndi:BPMNLabel>
917
942
  </bpmndi:BPMNEdge>
918
943
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
919
- <di:waypoint x="1563" y="1080" />
920
- <di:waypoint x="2038" y="1080" />
944
+ <di:waypoint x="1213" y="1080" />
945
+ <di:waypoint x="1688" y="1080" />
921
946
  <bpmndi:BPMNLabel>
922
- <dc:Bounds x="1757" y="1085" width="67" height="28" />
947
+ <dc:Bounds x="1424" y="1085" width="67" height="28" />
923
948
  </bpmndi:BPMNLabel>
924
949
  </bpmndi:BPMNEdge>
925
950
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
926
- <di:waypoint x="1563" y="440" />
927
- <di:waypoint x="1583" y="440" />
928
- <di:waypoint x="1583" y="465" />
929
- <di:waypoint x="1813" y="465" />
930
- <di:waypoint x="1813" y="1060" />
931
- <di:waypoint x="2038" y="1060" />
951
+ <di:waypoint x="1213" y="440" />
952
+ <di:waypoint x="1233" y="440" />
953
+ <di:waypoint x="1233" y="465" />
954
+ <di:waypoint x="1463" y="465" />
955
+ <di:waypoint x="1463" y="1060" />
956
+ <di:waypoint x="1688" y="1060" />
932
957
  <bpmndi:BPMNLabel>
933
- <dc:Bounds x="1699" y="432" width="67" height="28" />
958
+ <dc:Bounds x="1391" y="749" width="67" height="28" />
934
959
  </bpmndi:BPMNLabel>
935
960
  </bpmndi:BPMNEdge>
936
961
  <bpmndi:BPMNEdge id="BPMNEdge_f_mr_giveup" bpmnElement="f_mr_giveup">
937
- <di:waypoint x="1938" y="760" />
938
- <di:waypoint x="2038" y="760" />
962
+ <di:waypoint x="1588" y="760" />
963
+ <di:waypoint x="1688" y="760" />
939
964
  <bpmndi:BPMNLabel>
940
- <dc:Bounds x="1935" y="687" width="67" height="28" />
965
+ <dc:Bounds x="1605" y="765" width="67" height="28" />
941
966
  </bpmndi:BPMNLabel>
942
967
  </bpmndi:BPMNEdge>
943
968
  <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
944
- <di:waypoint x="1938" y="440" />
945
- <di:waypoint x="2070" y="440" />
969
+ <di:waypoint x="1588" y="440" />
970
+ <di:waypoint x="1720" y="440" />
946
971
  </bpmndi:BPMNEdge>
947
972
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
948
- <di:waypoint x="2106" y="440" />
949
- <di:waypoint x="2288" y="440" />
950
- <di:waypoint x="2288" y="320" />
973
+ <di:waypoint x="1756" y="440" />
974
+ <di:waypoint x="1938" y="440" />
975
+ <di:waypoint x="1938" y="320" />
951
976
  </bpmndi:BPMNEdge>
952
977
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
953
- <di:waypoint x="2138" y="1080" />
954
- <di:waypoint x="2638" y="1080" />
955
- <di:waypoint x="2638" y="160" />
978
+ <di:waypoint x="1788" y="1080" />
979
+ <di:waypoint x="2288" y="1080" />
980
+ <di:waypoint x="2288" y="160" />
956
981
  </bpmndi:BPMNEdge>
957
982
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
958
- <di:waypoint x="2138" y="760" />
959
- <di:waypoint x="2501" y="760" />
960
- <di:waypoint x="2501" y="145" />
961
- <di:waypoint x="2508" y="145" />
962
- <di:waypoint x="2508" y="120" />
963
- <di:waypoint x="2488" y="120" />
983
+ <di:waypoint x="1788" y="760" />
984
+ <di:waypoint x="2151" y="760" />
985
+ <di:waypoint x="2151" y="145" />
986
+ <di:waypoint x="2158" y="145" />
987
+ <di:waypoint x="2158" y="120" />
988
+ <di:waypoint x="2138" y="120" />
964
989
  </bpmndi:BPMNEdge>
965
990
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escReenter" bpmnElement="f_m_escReenter">
966
- <di:waypoint x="2463" y="95" />
967
- <di:waypoint x="2463" y="60" />
991
+ <di:waypoint x="2113" y="95" />
992
+ <di:waypoint x="2113" y="60" />
968
993
  <di:waypoint x="402" y="60" />
969
994
  <di:waypoint x="402" y="240" />
970
995
  <bpmndi:BPMNLabel>
971
- <dc:Bounds x="1396" y="13" width="74" height="42" />
996
+ <dc:Bounds x="1221" y="13" width="74" height="42" />
972
997
  </bpmndi:BPMNLabel>
973
998
  </bpmndi:BPMNEdge>
974
999
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
975
- <di:waypoint x="2688" y="120" />
976
- <di:waypoint x="2788" y="120" />
1000
+ <di:waypoint x="2338" y="120" />
1001
+ <di:waypoint x="2438" y="120" />
977
1002
  </bpmndi:BPMNEdge>
978
1003
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
979
- <di:waypoint x="2838" y="160" />
980
- <di:waypoint x="2838" y="340" />
1004
+ <di:waypoint x="2488" y="160" />
1005
+ <di:waypoint x="2488" y="340" />
981
1006
  <di:waypoint x="402" y="340" />
982
1007
  <di:waypoint x="402" y="320" />
983
1008
  </bpmndi:BPMNEdge>
984
1009
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_escAttempt" bpmnElement="f_ci_escAttempt">
985
- <di:waypoint x="1913" y="1215" />
986
- <di:waypoint x="1913" y="1195" />
987
- <di:waypoint x="1168" y="1195" />
988
- <di:waypoint x="1168" y="402" />
989
- <di:waypoint x="1868" y="402" />
990
- <di:waypoint x="1868" y="478" />
991
- <di:waypoint x="2018" y="478" />
992
- <di:waypoint x="2018" y="740" />
993
- <di:waypoint x="2038" y="740" />
1010
+ <di:waypoint x="1563" y="1215" />
1011
+ <di:waypoint x="1563" y="1195" />
1012
+ <di:waypoint x="1150" y="1195" />
1013
+ <di:waypoint x="1150" y="402" />
1014
+ <di:waypoint x="1518" y="402" />
1015
+ <di:waypoint x="1518" y="478" />
1016
+ <di:waypoint x="1668" y="478" />
1017
+ <di:waypoint x="1668" y="740" />
1018
+ <di:waypoint x="1688" y="740" />
994
1019
  <bpmndi:BPMNLabel>
995
- <dc:Bounds x="1551" y="1203" width="60" height="14" />
1020
+ <dc:Bounds x="1327" y="1173" width="60" height="14" />
996
1021
  </bpmndi:BPMNLabel>
997
1022
  </bpmndi:BPMNEdge>
998
1023
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_waitDep" bpmnElement="f_reb_waitDep">
999
- <di:waypoint x="1938" y="1400" />
1000
- <di:waypoint x="2088" y="1400" />
1001
- <di:waypoint x="2088" y="1280" />
1024
+ <di:waypoint x="1588" y="1400" />
1025
+ <di:waypoint x="1738" y="1400" />
1026
+ <di:waypoint x="1738" y="1280" />
1002
1027
  <bpmndi:BPMNLabel>
1003
- <dc:Bounds x="1996" y="1405" width="75" height="28" />
1028
+ <dc:Bounds x="1636" y="1367" width="75" height="28" />
1004
1029
  </bpmndi:BPMNLabel>
1005
1030
  </bpmndi:BPMNEdge>
1006
1031
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escAttempt" bpmnElement="f_reb_escAttempt">
1007
- <di:waypoint x="1913" y="1375" />
1008
- <di:waypoint x="1913" y="1355" />
1009
- <di:waypoint x="1168" y="1355" />
1010
- <di:waypoint x="1168" y="402" />
1011
- <di:waypoint x="1868" y="402" />
1012
- <di:waypoint x="1868" y="478" />
1013
- <di:waypoint x="2018" y="478" />
1014
- <di:waypoint x="2018" y="740" />
1015
- <di:waypoint x="2038" y="740" />
1032
+ <di:waypoint x="1563" y="1375" />
1033
+ <di:waypoint x="1563" y="1355" />
1034
+ <di:waypoint x="1150" y="1355" />
1035
+ <di:waypoint x="1150" y="402" />
1036
+ <di:waypoint x="1518" y="402" />
1037
+ <di:waypoint x="1518" y="478" />
1038
+ <di:waypoint x="1668" y="478" />
1039
+ <di:waypoint x="1668" y="740" />
1040
+ <di:waypoint x="1688" y="740" />
1016
1041
  <bpmndi:BPMNLabel>
1017
- <dc:Bounds x="1173" y="1234" width="64" height="42" />
1042
+ <dc:Bounds x="1081" y="1234" width="64" height="42" />
1018
1043
  </bpmndi:BPMNLabel>
1019
1044
  </bpmndi:BPMNEdge>
1020
1045
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escConflict" bpmnElement="f_reb_escConflict">
1021
- <di:waypoint x="1938" y="1400" />
1022
- <di:waypoint x="2018" y="1400" />
1023
- <di:waypoint x="2018" y="1080" />
1024
- <di:waypoint x="2038" y="1080" />
1046
+ <di:waypoint x="1588" y="1400" />
1047
+ <di:waypoint x="1608" y="1400" />
1048
+ <di:waypoint x="1608" y="1375" />
1049
+ <di:waypoint x="1601" y="1375" />
1050
+ <di:waypoint x="1601" y="1080" />
1051
+ <di:waypoint x="1688" y="1080" />
1025
1052
  <bpmndi:BPMNLabel>
1026
- <dc:Bounds x="1953" y="1246" width="60" height="28" />
1053
+ <dc:Bounds x="1606" y="1264" width="60" height="28" />
1027
1054
  </bpmndi:BPMNLabel>
1028
1055
  </bpmndi:BPMNEdge>
1029
1056
  <bpmndi:BPMNEdge id="BPMNEdge_f_mw_timeout" bpmnElement="f_mw_timeout">
1030
- <di:waypoint x="727" y="305" />
1031
- <di:waypoint x="727" y="440" />
1032
- <di:waypoint x="852" y="440" />
1057
+ <di:waypoint x="752" y="280" />
1058
+ <di:waypoint x="832" y="280" />
1059
+ <di:waypoint x="832" y="600" />
1060
+ <di:waypoint x="852" y="600" />
1033
1061
  </bpmndi:BPMNEdge>
1034
- <bpmndi:BPMNEdge id="BPMNEdge_f_msp_rederive" bpmnElement="f_msp_rederive">
1035
- <di:waypoint x="1213" y="415" />
1036
- <di:waypoint x="1213" y="280" />
1037
- <di:waypoint x="1338" y="280" />
1062
+ <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
1063
+ <di:waypoint x="1013" y="305" />
1064
+ <di:waypoint x="1013" y="1080" />
1065
+ <di:waypoint x="1163" y="1080" />
1038
1066
  <bpmndi:BPMNLabel>
1039
- <dc:Bounds x="1218" y="354" width="85" height="28" />
1067
+ <dc:Bounds x="1058" y="1033" width="60" height="42" />
1040
1068
  </bpmndi:BPMNLabel>
1041
1069
  </bpmndi:BPMNEdge>
1042
- <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
1043
- <di:waypoint x="1363" y="305" />
1044
- <di:waypoint x="1363" y="1080" />
1045
- <di:waypoint x="1513" y="1080" />
1070
+ <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
1071
+ <di:waypoint x="1013" y="305" />
1072
+ <di:waypoint x="1013" y="440" />
1073
+ <di:waypoint x="1163" y="440" />
1046
1074
  <bpmndi:BPMNLabel>
1047
- <dc:Bounds x="1368" y="739" width="60" height="42" />
1075
+ <dc:Bounds x="948" y="366" width="60" height="14" />
1048
1076
  </bpmndi:BPMNLabel>
1049
1077
  </bpmndi:BPMNEdge>
1050
- <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
1051
- <di:waypoint x="1363" y="305" />
1052
- <di:waypoint x="1363" y="440" />
1053
- <di:waypoint x="1513" y="440" />
1078
+ <bpmndi:BPMNEdge id="BPMNEdge_f_m_mWaiting" bpmnElement="f_m_mWaiting">
1079
+ <di:waypoint x="1013" y="305" />
1080
+ <di:waypoint x="1013" y="1560" />
1081
+ <di:waypoint x="1170" y="1560" />
1082
+ <bpmndi:BPMNLabel>
1083
+ <dc:Bounds x="1048" y="1485" width="88" height="70" />
1084
+ </bpmndi:BPMNLabel>
1085
+ </bpmndi:BPMNEdge>
1086
+ <bpmndi:BPMNEdge id="BPMNEdge_f_m_mDraft" bpmnElement="f_m_mDraft">
1087
+ <di:waypoint x="1013" y="305" />
1088
+ <di:waypoint x="1013" y="478" />
1089
+ <di:waypoint x="1226" y="478" />
1090
+ <di:waypoint x="1226" y="1080" />
1091
+ <di:waypoint x="1688" y="1080" />
1054
1092
  <bpmndi:BPMNLabel>
1055
- <dc:Bounds x="1408" y="418" width="60" height="14" />
1093
+ <dc:Bounds x="1057" y="483" width="85" height="42" />
1056
1094
  </bpmndi:BPMNLabel>
1057
1095
  </bpmndi:BPMNEdge>
1058
1096
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_mBlocked" bpmnElement="f_m_mBlocked">
1059
- <di:waypoint x="1363" y="305" />
1060
- <di:waypoint x="1363" y="325" />
1061
- <di:waypoint x="1875" y="325" />
1062
- <di:waypoint x="1875" y="805" />
1063
- <di:waypoint x="2126" y="805" />
1064
- <di:waypoint x="2126" y="1040" />
1097
+ <di:waypoint x="1013" y="305" />
1098
+ <di:waypoint x="1013" y="440" />
1099
+ <di:waypoint x="1163" y="440" />
1065
1100
  <bpmndi:BPMNLabel>
1066
- <dc:Bounds x="1880" y="558" width="85" height="14" />
1101
+ <dc:Bounds x="1018" y="352" width="88" height="42" />
1067
1102
  </bpmndi:BPMNLabel>
1068
1103
  </bpmndi:BPMNEdge>
1069
1104
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
1070
- <di:waypoint x="1538" y="1105" />
1071
- <di:waypoint x="1538" y="1240" />
1072
- <di:waypoint x="1688" y="1240" />
1105
+ <di:waypoint x="1188" y="1105" />
1106
+ <di:waypoint x="1188" y="1240" />
1107
+ <di:waypoint x="1338" y="1240" />
1073
1108
  <bpmndi:BPMNLabel>
1074
- <dc:Bounds x="1543" y="1159" width="49" height="28" />
1109
+ <dc:Bounds x="1193" y="1159" width="49" height="28" />
1075
1110
  </bpmndi:BPMNLabel>
1076
1111
  </bpmndi:BPMNEdge>
1077
1112
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
1078
- <di:waypoint x="1563" y="440" />
1079
- <di:waypoint x="1668" y="440" />
1080
- <di:waypoint x="1668" y="1400" />
1081
- <di:waypoint x="1688" y="1400" />
1113
+ <di:waypoint x="1213" y="440" />
1114
+ <di:waypoint x="1233" y="440" />
1115
+ <di:waypoint x="1233" y="465" />
1116
+ <di:waypoint x="2158" y="465" />
1117
+ <di:waypoint x="2158" y="75" />
1118
+ <di:waypoint x="2558" y="75" />
1119
+ <di:waypoint x="2558" y="1125" />
1120
+ <di:waypoint x="1318" y="1125" />
1121
+ <di:waypoint x="1318" y="1380" />
1122
+ <di:waypoint x="1338" y="1380" />
1082
1123
  <bpmndi:BPMNLabel>
1083
- <dc:Bounds x="1673" y="906" width="49" height="28" />
1124
+ <dc:Bounds x="2334" y="42" width="49" height="28" />
1084
1125
  </bpmndi:BPMNLabel>
1085
1126
  </bpmndi:BPMNEdge>
1086
1127
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
1087
- <di:waypoint x="1763" y="280" />
1088
- <di:waypoint x="1913" y="280" />
1089
- <di:waypoint x="1913" y="415" />
1128
+ <di:waypoint x="1413" y="280" />
1129
+ <di:waypoint x="1563" y="280" />
1130
+ <di:waypoint x="1563" y="415" />
1090
1131
  <bpmndi:BPMNLabel>
1091
- <dc:Bounds x="1918" y="361" width="46" height="14" />
1132
+ <dc:Bounds x="1568" y="354" width="46" height="14" />
1092
1133
  </bpmndi:BPMNLabel>
1093
1134
  </bpmndi:BPMNEdge>
1094
1135
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gRetry" bpmnElement="f_m_gRetry">
1095
- <di:waypoint x="1763" y="280" />
1096
- <di:waypoint x="1868" y="280" />
1097
- <di:waypoint x="1868" y="760" />
1098
- <di:waypoint x="1888" y="760" />
1136
+ <di:waypoint x="1388" y="255" />
1137
+ <di:waypoint x="1388" y="235" />
1138
+ <di:waypoint x="2218" y="235" />
1139
+ <di:waypoint x="2218" y="805" />
1140
+ <di:waypoint x="1538" y="805" />
1141
+ <di:waypoint x="1563" y="805" />
1142
+ <di:waypoint x="1563" y="785" />
1099
1143
  <bpmndi:BPMNLabel>
1100
- <dc:Bounds x="1785" y="419" width="78" height="28" />
1144
+ <dc:Bounds x="1852" y="772" width="78" height="28" />
1101
1145
  </bpmndi:BPMNLabel>
1102
1146
  </bpmndi:BPMNEdge>
1103
1147
  <bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
1104
- <di:waypoint x="1938" y="440" />
1105
- <di:waypoint x="2050" y="440" />
1106
- <di:waypoint x="2050" y="600" />
1107
- <di:waypoint x="2070" y="600" />
1148
+ <di:waypoint x="1563" y="415" />
1149
+ <di:waypoint x="1563" y="402" />
1150
+ <di:waypoint x="1720" y="402" />
1151
+ <di:waypoint x="1720" y="562" />
1152
+ <di:waypoint x="1738" y="562" />
1153
+ <di:waypoint x="1738" y="582" />
1108
1154
  </bpmndi:BPMNEdge>
1109
1155
  <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landedTimeout" bpmnElement="f_eg_landedTimeout">
1110
- <di:waypoint x="1938" y="440" />
1111
- <di:waypoint x="1958" y="440" />
1112
- <di:waypoint x="1958" y="415" />
1113
- <di:waypoint x="2070" y="415" />
1114
- <di:waypoint x="2070" y="478" />
1115
- <di:waypoint x="2508" y="478" />
1116
- <di:waypoint x="2508" y="235" />
1117
- <di:waypoint x="2070" y="235" />
1118
- <di:waypoint x="2070" y="158" />
1119
- <di:waypoint x="2088" y="158" />
1120
- <di:waypoint x="2088" y="138" />
1156
+ <di:waypoint x="1588" y="440" />
1157
+ <di:waypoint x="1700" y="440" />
1158
+ <di:waypoint x="1700" y="120" />
1159
+ <di:waypoint x="1720" y="120" />
1121
1160
  </bpmndi:BPMNEdge>
1122
1161
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
1123
- <di:waypoint x="1763" y="280" />
1124
- <di:waypoint x="1783" y="280" />
1125
- <di:waypoint x="1783" y="305" />
1126
- <di:waypoint x="1868" y="305" />
1127
- <di:waypoint x="1868" y="820" />
1128
- <di:waypoint x="2018" y="820" />
1129
- <di:waypoint x="2018" y="780" />
1130
- <di:waypoint x="2038" y="780" />
1162
+ <di:waypoint x="1388" y="255" />
1163
+ <di:waypoint x="1388" y="82" />
1164
+ <di:waypoint x="1776" y="82" />
1165
+ <di:waypoint x="1776" y="165" />
1166
+ <di:waypoint x="2218" y="165" />
1167
+ <di:waypoint x="2218" y="638" />
1168
+ <di:waypoint x="1668" y="638" />
1169
+ <di:waypoint x="1668" y="740" />
1170
+ <di:waypoint x="1688" y="740" />
1131
1171
  <bpmndi:BPMNLabel>
1132
- <dc:Bounds x="1977" y="828" width="53" height="14" />
1172
+ <dc:Bounds x="1952" y="616" width="53" height="14" />
1133
1173
  </bpmndi:BPMNLabel>
1134
1174
  </bpmndi:BPMNEdge>
1135
1175
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gAbandoned" bpmnElement="f_m_gAbandoned">
1136
- <di:waypoint x="1738" y="255" />
1137
- <di:waypoint x="1738" y="242" />
1138
- <di:waypoint x="2126" y="242" />
1139
- <di:waypoint x="2126" y="220" />
1140
- <di:waypoint x="2568" y="220" />
1141
- <di:waypoint x="2568" y="920" />
1142
- <di:waypoint x="1931" y="920" />
1176
+ <di:waypoint x="1388" y="255" />
1177
+ <di:waypoint x="1388" y="82" />
1178
+ <di:waypoint x="1776" y="82" />
1179
+ <di:waypoint x="1776" y="165" />
1180
+ <di:waypoint x="2218" y="165" />
1181
+ <di:waypoint x="2218" y="920" />
1182
+ <di:waypoint x="1581" y="920" />
1143
1183
  <bpmndi:BPMNLabel>
1144
- <dc:Bounds x="2306" y="187" width="82" height="28" />
1184
+ <dc:Bounds x="2131" y="849" width="82" height="28" />
1145
1185
  </bpmndi:BPMNLabel>
1146
1186
  </bpmndi:BPMNEdge>
1147
1187
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_waitDep" bpmnElement="f_ci_waitDep">
1148
- <di:waypoint x="1938" y="1240" />
1149
- <di:waypoint x="2038" y="1240" />
1188
+ <di:waypoint x="1588" y="1240" />
1189
+ <di:waypoint x="1688" y="1240" />
1150
1190
  <bpmndi:BPMNLabel>
1151
- <dc:Bounds x="1931" y="1167" width="75" height="28" />
1191
+ <dc:Bounds x="1621" y="1167" width="75" height="28" />
1152
1192
  </bpmndi:BPMNLabel>
1153
1193
  </bpmndi:BPMNEdge>
1154
1194
  <bpmndi:BPMNEdge id="BPMNEdge_f_mw_stall" bpmnElement="f_mw_stall">
1155
- <di:waypoint x="888" y="440" />
1156
- <di:waypoint x="988" y="440" />
1195
+ <di:waypoint x="870" y="618" />
1196
+ <di:waypoint x="870" y="638" />
1197
+ <di:waypoint x="888" y="638" />
1198
+ <di:waypoint x="888" y="1598" />
1199
+ <di:waypoint x="1338" y="1598" />
1157
1200
  </bpmndi:BPMNEdge>
1158
1201
  <bpmndi:BPMNEdge id="BPMNEdge_f_msp_gate" bpmnElement="f_msp_gate">
1159
- <di:waypoint x="1088" y="440" />
1160
- <di:waypoint x="1188" y="440" />
1202
+ <di:waypoint x="1438" y="1560" />
1203
+ <di:waypoint x="1538" y="1560" />
1204
+ </bpmndi:BPMNEdge>
1205
+ <bpmndi:BPMNEdge id="BPMNEdge_f_mrp_probe" bpmnElement="f_mrp_probe">
1206
+ <di:waypoint x="1206" y="1560" />
1207
+ <di:waypoint x="1338" y="1560" />
1161
1208
  </bpmndi:BPMNEdge>
1162
1209
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_spdone" bpmnElement="f_ci_spdone">
1163
- <di:waypoint x="1788" y="1240" />
1164
- <di:waypoint x="1888" y="1240" />
1210
+ <di:waypoint x="1438" y="1240" />
1211
+ <di:waypoint x="1538" y="1240" />
1165
1212
  </bpmndi:BPMNEdge>
1166
1213
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_spdone" bpmnElement="f_reb_spdone">
1167
- <di:waypoint x="1788" y="1400" />
1168
- <di:waypoint x="1888" y="1400" />
1214
+ <di:waypoint x="1438" y="1400" />
1215
+ <di:waypoint x="1538" y="1400" />
1169
1216
  </bpmndi:BPMNEdge>
1170
1217
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_landedStalled" bpmnElement="f_m_landedStalled">
1171
- <di:waypoint x="2106" y="120" />
1172
- <di:waypoint x="2238" y="120" />
1218
+ <di:waypoint x="1756" y="120" />
1219
+ <di:waypoint x="1888" y="120" />
1173
1220
  </bpmndi:BPMNEdge>
1174
1221
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escLanded" bpmnElement="f_m_escLanded">
1175
- <di:waypoint x="2338" y="120" />
1176
- <di:waypoint x="2438" y="120" />
1222
+ <di:waypoint x="1988" y="120" />
1223
+ <di:waypoint x="2088" y="120" />
1177
1224
  </bpmndi:BPMNEdge>
1178
1225
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escWait" bpmnElement="f_m_escWait">
1179
- <di:waypoint x="2488" y="120" />
1180
- <di:waypoint x="2588" y="120" />
1226
+ <di:waypoint x="2138" y="120" />
1227
+ <di:waypoint x="2238" y="120" />
1181
1228
  </bpmndi:BPMNEdge>
1182
1229
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_recheck" bpmnElement="f_ci_recheck">
1183
- <di:waypoint x="1913" y="1265" />
1184
- <di:waypoint x="1913" y="1300" />
1230
+ <di:waypoint x="1563" y="1265" />
1231
+ <di:waypoint x="1563" y="1300" />
1185
1232
  <di:waypoint x="577" y="1300" />
1186
1233
  <di:waypoint x="577" y="305" />
1187
1234
  <bpmndi:BPMNLabel>
1188
1235
  <dc:Bounds x="582" y="769" width="85" height="28" />
1189
1236
  </bpmndi:BPMNLabel>
1190
1237
  </bpmndi:BPMNEdge>
1238
+ <bpmndi:BPMNEdge id="BPMNEdge_f_msp_rederive" bpmnElement="f_msp_rederive">
1239
+ <di:waypoint x="1563" y="1585" />
1240
+ <di:waypoint x="1563" y="1620" />
1241
+ <di:waypoint x="1013" y="1620" />
1242
+ <di:waypoint x="1013" y="305" />
1243
+ <bpmndi:BPMNLabel>
1244
+ <dc:Bounds x="1446" y="1587" width="85" height="28" />
1245
+ </bpmndi:BPMNLabel>
1246
+ </bpmndi:BPMNEdge>
1191
1247
  <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
1192
- <di:waypoint x="2088" y="1280" />
1193
- <di:waypoint x="2088" y="1480" />
1194
- <di:waypoint x="234" y="1480" />
1248
+ <di:waypoint x="1738" y="1280" />
1249
+ <di:waypoint x="1738" y="1640" />
1250
+ <di:waypoint x="234" y="1640" />
1195
1251
  <di:waypoint x="234" y="298" />
1196
1252
  </bpmndi:BPMNEdge>
1197
1253
  <bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
1198
- <di:waypoint x="1913" y="785" />
1199
- <di:waypoint x="1913" y="805" />
1254
+ <di:waypoint x="1563" y="785" />
1255
+ <di:waypoint x="1563" y="805" />
1200
1256
  <di:waypoint x="402" y="805" />
1201
1257
  <di:waypoint x="402" y="320" />
1202
1258
  <bpmndi:BPMNLabel>
1203
- <dc:Bounds x="1114" y="772" width="49" height="28" />
1259
+ <dc:Bounds x="946" y="772" width="49" height="28" />
1204
1260
  </bpmndi:BPMNLabel>
1205
1261
  </bpmndi:BPMNEdge>
1206
1262
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
1207
- <di:waypoint x="2088" y="618" />
1208
- <di:waypoint x="2088" y="638" />
1263
+ <di:waypoint x="1738" y="618" />
1264
+ <di:waypoint x="1738" y="638" />
1209
1265
  <di:waypoint x="402" y="638" />
1210
1266
  <di:waypoint x="402" y="320" />
1211
1267
  </bpmndi:BPMNEdge>