Neater representation of combining data events.

Author: anjackson

src/dataflows/cul.md

@@ -95,21 +95,24 @@ space
 transform id@adele sip@adele "Create\nSIP Folder"
 """The identifier is used to create a SIP folder that will hold the transfer. It contains a data folder and a metadata folder, named according to item identifiers. The data folder will contain the physical or logical disk contents. The metadata folder will contain photographs and the log and hash manifest from the media extraction process."""
 
-start photo@camera "Photograph\nCarrier"@N [0,0]
+start photo@camera "Photograph\nCarrier"@N [0,1]
 """A camera attached to the workstation is used to record what the carrier look like."""
 
-merge photo@camera sip@adele "Take\nPhotographs"
+move photo@camera photo@adele "Take\nPhotographs"
 """Pictures are taken of the front and back of the carrier, and these photos are added to the metadata folder of the SIP."""
 
+combine photo@adele "Add photos\nto SIP"
+"""The photographs are added to the SIP metadata folder."""
+
 space
 move leg@shelf leg@hub "Connect\nCarrier" [0,1]
 """The carrier is connected or inserted into the appropriate drive of the workstation."""
 
 space
-derive leg@hub content@hub "Extract\nContent & Logs"@N [0,0]
+copy leg@hub content@adele "Extract\nContent & Logs"@W [0,1]
 """The device in the workstation makes a copy of the content, logging the process as it goes, along with the checksums of each file. This may be a physical disk image of a logical copy of the disk contents, depending on teh situation."""
 
-merge content@hub sip@adele "Transfer to SIP"
+combine content@adele "Add data\nto SIP"
 """The extracted file contents and the log are written into the data and metadata folders of the SIP."""
 
 move leg@hub leg@shelf "Reshelve\nCarrier"

src/dataflows/dataflows.js

@@ -145,6 +145,9 @@ export function generateTubeMapData(df, wf) {
                     }
                     setupEntitiesForEvent(lines, stations, item, event );
                     pushCopyEvent(lines, stations, item, event, t1, y1, t2, y2 );
+                    // Create a post-merge marker 'station'?
+                    // Add this is a 'name' to the last line segment line  and .marker = "interchange"???
+                    //lines[item].nodes[-1].name = terminus
                     // Record as a merge:
                     lines[source.item].terminated = t2;
                     lines[item].name = `${target.itemId}@${target.place.id}`;
@@ -209,7 +212,7 @@ export function generateTubeMapData(df, wf) {
                 // Note that start point is marked:
                 lines[source.item].markedAtStart = true;
             });
-        } else if( event.type == "delete" ) {
+        } else if( event.type == "delete" || event.type == "combine" ) {
             const targets = getTargets(df, event);
             targets.forEach( (target) => {
                 var item = target.item;
@@ -372,15 +375,15 @@ export function parseDataflow(text) {
                             label: l[1] || l[0],
                             type: l[0],
                         }
-                    } else if( l[0] == "delete" || l[0] == "start" ) {
+                    } else if( l[0] == "delete" || l[0] == "combine" || l[0] == "start" ) {
                         // FIXME START is kinda broken because only one color is allowed and there could be multiple starts
                         event = {
                             label: l[2] || l[0],
                             type: l[0],
                             targets: l[1].split(','),
                             color: l[1]
                         }
-                        if( l[0] == "delete") {
+                        if( l[0] == "delete" || l[0] == "combine") {
                             event.marker = 'interchange';
                         }
                         // Parse offset if any:
@@ -505,6 +508,8 @@ export async function generateDataflow(dfl) {
             return `<i>Transform ${e.source} to ${e.target}</i>.<br>${e.description || ''}`;
         } else if( e.type == "merge") {
             return `<i>Merge ${e.sources} into ${e.target}</i>.<br>${e.description || ''}`;
+        } else if( e.type == "combine") {
+            return `<i>Combine ${e.targets.join(', ') || e.target}</i>.<br>${e.description || ''}`;
         } else if( e.type == "delete") {
             return `<i>Delete ${e.targets.join(', ') || e.target}</i>.<br>${e.description || ''}`;
         } else if( e.type == "start") {