From d40bb388c4cc6b1646d5ece0fefbc8c2fa92a057 Mon Sep 17 00:00:00 2001
From: Sergei <spond@temple.edu>
Date: Wed, 20 Dec 2023 14:16:16 -0500
Subject: [PATCH 1/2] Implementing a fix to issue #277

---
 src/clusternetwork.js | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/clusternetwork.js b/src/clusternetwork.js
index ef2b8b6..93044eb 100755
--- a/src/clusternetwork.js
+++ b/src/clusternetwork.js
@@ -115,12 +115,15 @@ var _networkSequentialColor = {
 var _networkPresetColorSchemes = {
   sex_trans: {
     "MSM-Male": "#1f78b4",
+    "MMSC-Male": "#1f78b4",
     "MSM-Unknown sex": "#1f78b4",
+    "MMSC-Unknown sex": "#1f78b4",
     "Heterosexual Contact-Male": "#e31a1c",
     "Heterosexual Contact-Female": "#e31a1c",
     "Heterosexual Contact-Unknown sex": "#e31a1c",
     "IDU-Male": "#33a02c",
     "MSM & IDU-Male": "#33a02c",
+    "MMSC & IDU-Male": "#33a02c",
     "IDU-Female": "#33a02c",
     "IDU-Unknown sex": "#33a02c",
     "Other/Unknown-Male": "#636363",
@@ -134,6 +137,7 @@ var _networkPresetColorSchemes = {
     "Other/Unknown-Child": "#ff7f00",
     "Other-Child": "#ff7f00",
   },
+
   race_cat: {
     Asian: "#1f77b4",
     "Black/African American": "#bcbd22",
@@ -147,6 +151,26 @@ var _networkPresetColorSchemes = {
     missing: "#999",
     White: "#d62728",
   },
+  sex_birth: {
+    Male: "#0047AB",
+    Female: "#E30B5C",
+    Unknown: "#3D2B1F",
+  },
+  birth_sex: {
+    Male: "#4682B4",
+    Female: "#b22222",
+    Unknown: "#3D2B1F",
+  },
+  gender_identity: {
+    Man: "#0047AB",
+    Woman: "#E30B5C",
+    "Transgender man": "#A7C7E7",
+    "Transgender woman": "#FF4433",
+    "Additional gender identity": "#228B22",
+    Unknown: "#3D2B1F",
+    "Declined to answer": "#E4D00A",
+    Unknown: "#999",
+  },
 };
 
 var _networkPresetShapeSchemes = {
@@ -157,6 +181,23 @@ var _networkPresetShapeSchemes = {
     missing: "diamond",
     Unknown: "diamond",
   },
+  sex_birth: {
+    Male: "square",
+    Female: "ellipse",
+    Missing: "diamond",
+    missing: "diamond",
+    Unknown: "diamond",
+  },
+  gender_identity: {
+    Man: "square",
+    Woman: "ellipse",
+    "Transgender man": "hexagon",
+    "Transgender woman": "circle",
+    "Additional gender identity": "pentagon",
+    Unknown: "diamond",
+    "Declined to answer": "diamond",
+    Unknown: "diamond",
+  },
   race_cat: {
     Asian: "hexagon",
     "Black/African American": "square",
@@ -10272,9 +10313,18 @@ var hivtrace_cluster_network_graph = function (
 
     if (cat_id) {
       if (cat_id in self.networkColorScheme) {
+        let cat_data = graph_data[_networkGraphAttrbuteID][cat_id]["enum"];
+        if (cat_data) {
+          cat_data = new Set(_.map(cat_data, (d) => d.toLowerCase()));
+        }
         var domain = [],
           range = [];
         _.each(self.networkColorScheme[cat_id], function (value, key) {
+          if (cat_data) {
+            if (!cat_data.has(key.toLowerCase())) {
+              return;
+            }
+          }
           domain.push(key);
           range.push(value);
         });

From c9a6c922d7bc43fb51a4e8f9fec9c1a6a7a2aa6c Mon Sep 17 00:00:00 2001
From: Sergei <spond@temple.edu>
Date: Thu, 4 Jan 2024 15:24:33 -0500
Subject: [PATCH 2/2] Updating color schemes

---
 src/clusternetwork.js | 60 +++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/clusternetwork.js b/src/clusternetwork.js
index 93044eb..d9624c0 100755
--- a/src/clusternetwork.js
+++ b/src/clusternetwork.js
@@ -112,20 +112,30 @@ var _networkSequentialColor = {
   ],
 };
 
+/*
+Sex/Transmission Risk
+
+IDU= blue
+Heterosexual= green
+Perinatal, child= red
+MMSC= orange
+Other= grey (leave as-is)*/
+
 var _networkPresetColorSchemes = {
   sex_trans: {
     "MSM-Male": "#1f78b4",
-    "MMSC-Male": "#1f78b4",
+    "MMSC-Male": "#FFBF00",
     "MSM-Unknown sex": "#1f78b4",
-    "MMSC-Unknown sex": "#1f78b4",
-    "Heterosexual Contact-Male": "#e31a1c",
-    "Heterosexual Contact-Female": "#e31a1c",
-    "Heterosexual Contact-Unknown sex": "#e31a1c",
-    "IDU-Male": "#33a02c",
+    "MMSC-Unknown sex": "#FFBF00",
+    "Heterosexual Contact-Male": "#AAFF00",
+    "Heterosexual Contact-Female": "#AAFF00",
+    "Heterosexual Contact-Unknown sex": "#AAFF00",
+    "IDU-Male": "#0096FF",
     "MSM & IDU-Male": "#33a02c",
-    "MMSC & IDU-Male": "#33a02c",
-    "IDU-Female": "#33a02c",
-    "IDU-Unknown sex": "#33a02c",
+    "MMSC & IDU-Unknown sex": "#0096FF",
+    "MMSC & IDU-Male": "#FFBF00",
+    "IDU-Female": "#0096FF",
+    "IDU-Unknown sex": "#0096FF",
     "Other/Unknown-Male": "#636363",
     "Other/Unknown-Female": "#636363",
     "Other-Male": "#636363",
@@ -133,9 +143,9 @@ var _networkPresetColorSchemes = {
     Missing: "#636363",
     "": "#636363",
     "Other/Unknown-Unknown sex": "#636363",
-    Perinatal: "#ff7f00",
-    "Other/Unknown-Child": "#ff7f00",
-    "Other-Child": "#ff7f00",
+    Perinatal: "#D2042D",
+    "Other/Unknown-Child": "#D2042D",
+    "Other-Child": "#D2042D",
   },
 
   race_cat: {
@@ -152,23 +162,23 @@ var _networkPresetColorSchemes = {
     White: "#d62728",
   },
   sex_birth: {
-    Male: "#0047AB",
-    Female: "#E30B5C",
-    Unknown: "#3D2B1F",
+    Male: "#FF6700",
+    Female: "#50c878",
+    Unknown: "#999",
   },
   birth_sex: {
-    Male: "#4682B4",
-    Female: "#b22222",
-    Unknown: "#3D2B1F",
+    Male: "#FF6700",
+    Female: "#50c878",
+    Unknown: "#999",
   },
+
   gender_identity: {
-    Man: "#0047AB",
-    Woman: "#E30B5C",
-    "Transgender man": "#A7C7E7",
-    "Transgender woman": "#FF4433",
-    "Additional gender identity": "#228B22",
-    Unknown: "#3D2B1F",
-    "Declined to answer": "#E4D00A",
+    Woman: "#AAFF00",
+    "Transgender woman": "#228B22",
+    Man: "#FFBF00",
+    "Transgender man": "#FF5F1F",
+    "Declined to answer": "#FAFA33",
+    "Additional gender identity": "#D2042D",
     Unknown: "#999",
   },
 };