Skip to content

Commit c3e4076

Browse files
committed
Fixed work segment sort in Sankey
1 parent 041b4bb commit c3e4076

11 files changed

Lines changed: 14 additions & 12 deletions

src/data/intxt_network_graph.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/intxts_full.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/meters.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/model_json_backup.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/nodegoat_data.json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def remove_decimal(id_string):
370370
meter_sub_df2 = meter_sub_df.query("line_meter_id == @meter_id").sort_values("position").reset_index(drop=True)
371371
meter_name = meter_sub_df2.at[0, "meter_name"]
372372
unit_line = meter_sub_df2.at[0, "unit_line"]
373-
meter_sub_dict["unit_line"] = unit_line
373+
meter_sub_dict["unit_line"] = unit_line # if I need to turn single-value lists into non-lists, this is the place to do it
374374
meter_sub_dict["meter_id"] = meter_id
375375
meter_sub_dict["meter_name"] = meter_name
376376

src/data/nodegoat_tables.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/objects_json_backup.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/data/sankey_data.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ const sectionSankey = nodes.length > 0 && links.length > 0 ?
827827
let authorComp = d3.descending(lookupIDTable.get(nodeA.author), lookupIDTable.get(nodeB.author));
828828
// Within authors, sort so that all work sections are in order by work
829829
let workComp = d3.descending(lookupIDTable.get(nodeA.work), lookupIDTable.get(nodeB.work));
830-
let workSegComp = d3.descending(lookupIDTable.get(a.id).section,lookupIDTable.get(b.id).section);
830+
let workSegComp = lookupIDTable.get(b.id).section.localeCompare(lookupIDTable.get(a.id).section, undefined, {numeric: true});
831831
if (authorComp !== 0) return authorComp; // if the authors aren't the same, don't go any further in sorting
832832
if (workComp !== 0) return workComp;
833833
return workSegComp; // sort by work section
@@ -859,7 +859,8 @@ const wordSankey = wordIntxtNodes.length > 0 && wordIntxtEdges.length > 0 ?
859859
let nodeB = lookupIDTable.get(b.id);
860860
let authorComp = d3.descending(lookupIDTable.get(nodeA.authorID),lookupIDTable.get(nodeB.authorID));
861861
let workComp = d3.descending(lookupIDTable.get(nodeA.workID),lookupIDTable.get(nodeB.workID));
862-
let workSegComp = d3.descending(lookupIDTable.get(nodeA.workSegID),lookupIDTable.get(nodeB.workSegID));
862+
let workSegComp = lookupIDTable.get(nodeB.workSegID).section.localeCompare(lookupIDTable.get(nodeA.workSegID).section, undefined, {numeric: true});
863+
//let workSegComp = d3.descending(lookupIDTable.get(nodeA.workSegID).section,lookupIDTable.get(nodeB.workSegID).section);
863864
let lineComp = d3.descending(nodeA.lineNum,nodeB.lineNum);
864865
if (authorComp !== 0) {return authorComp;}
865866
else if (workComp !== 0) {return workComp;}

src/js/sankey_function.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ nodeRect
588588
.attr("dy","1em")
589589
.text(workSection);
590590
} else if (sankeyType === "word") {
591-
console.log(thisNode);
591+
//console.log(thisNode);
592592
let thisWord = lookupIDTable.get(thisNode.id);
593593
let author = lookupIDTable.get(thisWord.authorID);
594594
let work = lookupIDTable.get(thisWord.workID);

0 commit comments

Comments
 (0)