Change 1 was never released, revert cyber

spatialillusions · Mar 5, 2023 · 833ffa2 · 833ffa2
1 parent 29f960e
commit 833ffa2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/src/iconparts/ground.js b/src/iconparts/ground.js
@@ -4523,7 +4523,7 @@ export default function(
     },
     { type: "path", d: "m 135,100 -15,35 -10,0 15,-35 z" }
   ];
-  /*
+
   icn["CY.IC.COMMAND AND CONTROL (C2)"] = text("BC2");
   icn["CY.IC.HERDER"] = text("HDR");
   icn["CY.IC.CALLBACK DOMAIN"] = text("CBD");
@@ -4573,7 +4573,7 @@ export default function(
   icn["CY.IC.NETWORK OUTAGE"] = text("NOT");
   icn["CY.IC.SERVICE OUTAGE"] = text("SOT");
   icn["CY.IC.DEVICE OUTAGE"] = text("DOT");
-  */
+
   icn["CY.IC.COMBAT MISSION TEAM"] = text("CMT");
   icn["CY.IC.NATIONAL MISSION TEAM"] = text("NMT");
   icn["CY.IC.CYBER PROTECTION TEAM"] = text("CPT");

diff --git a/src/numbersidc/metadata.js b/src/numbersidc/metadata.js
@@ -39,7 +39,7 @@ export function metadata(ms, metadata, mapping) {
     "52": "Ground",
     "53": "Sea",
     "54": "Subsurface",
-    "60": "Ground"
+    "60": "Air"
   };
 
   var functionid = (metadata.functionid = this.options.sidc.substr(10, 10));

diff --git a/src/numbersidc/sidc/cyberspace.js b/src/numbersidc/sidc/cyberspace.js
@@ -19,13 +19,13 @@ export default {
     //Adds support for Cyberspace
     if (symbolSet == "60") {
       sId["110000"] = [];
-      sId["110100"] = [icn["CY.IC.COMBAT MISSION TEAM"]];
-      sId["110200"] = [icn["CY.IC.NATIONAL MISSION TEAM"]];
-      sId["110300"] = [icn["CY.IC.CYBER PROTECTION TEAM"]];
-      sId["110400"] = [icn["CY.IC.NATION STATE CYBER THREAT ACTOR"]];
-      sId["110500"] = [icn["CY.IC.NON NATION STATE CYBER THREAT ACTOR"]];
-      /*
-      //sId['120000'] = 'Infection';
+      sId["110100"] = [icn["CY.IC.COMMAND AND CONTROL (C2)"]];
+      sId["110200"] = [icn["CY.IC.HERDER"]];
+      sId["110300"] = [icn["CY.IC.CALLBACK DOMAIN"]];
+      sId["110400"] = [icn["CY.IC.ZOMBIE"]];
+      // sId["110500"] = //[icn["CY.IC.NON NATION STATE CYBER THREAT ACTOR"]];
+
+      sId["120000"] = []; //'Infection';
       sId["120100"] = [icn["CY.IC.ADVANCED PERSISTENT THREAT (APT)"]];
       sId["120101"] = [icn["CY.IC.APT WITH C2"]];
       sId["120102"] = [icn["CY.IC.APT WITH SELF PROPAGATION"]];
@@ -36,12 +36,14 @@ export default {
       sId["120202"] = [icn["CY.IC.NAPT WITH SELF PROPAGATION"]];
       sId["120203"] = [icn["CY.IC.NAPT WITH C2 AND SELF PROPAGATION"]];
       sId["120204"] = [icn["CY.IC.NAPT OTHER"]];
-      //sId['130000'] = 'Health and Status';
+
+      sId["130000"] = []; //'Health and Status';
       sId["130100"] = [icn["CY.IC.NORMAL"]];
       sId["130200"] = [icn["CY.IC.NETWORK OUTAGE"]];
       sId["130300"] = [icn["CY.IC.UNKNOWN"]];
       sId["130400"] = [icn["CY.IC.IMPAIRED"]];
-      //sId['140000'] = 'Device Type';
+
+      sId["140000"] = []; //'Device Type';
       sId["140100"] = [icn["CY.IC.CORE ROUTER"]];
       sId["140200"] = [icn["CY.IC.ROUTER"]];
       sId["140300"] = [icn["CY.IC.CROSS DOMAIN SOLUTION"]];
@@ -54,15 +56,17 @@ export default {
       sId["141000"] = [icn["CY.IC.SWITCH"]];
       sId["141100"] = [icn["CY.IC.HOST"]];
       sId["141200"] = [icn["CY.IC.VIRTUAL PRIVATE NETWORK (VPN)"]];
-      //sId['150000'] = 'Device Domain';
+
+      sId["150000"] = []; //'Device Domain';
       sId["150100"] = [icn["CY.IC.DEPARTMENT OF DEFENSE (DOD)"]];
       sId["150200"] = [icn["CY.IC.GOVERNMENT"]];
       sId["150300"] = [icn["CY.IC.CONTRACTOR"]];
       sId["150400"] = [
         icn["CY.IC.SUPERVISORY CONTROL AND DATA ACQUISITION (SCADA)"]
       ];
       sId["150500"] = [icn["CY.IC.NON-GOVERNMENT"]];
-      //sId['160000'] = 'Effect';
+
+      sId["160000"] = []; //'Effect';
       sId["160100"] = [icn["CY.IC.INFECTION"]];
       sId["160200"] = [icn["CY.IC.DEGRADATION"]];
       sId["160300"] = [icn["CY.IC.DATA SPOOFING"]];
@@ -72,7 +76,6 @@ export default {
       sId["160700"] = [icn["CY.IC.NETWORK OUTAGE"]];
       sId["160800"] = [icn["CY.IC.SERVICE OUTAGE"]];
       sId["160900"] = [icn["CY.IC.DEVICE OUTAGE"]];
-      */
     }
   }
 };
diff --git a/src/symbolfunctions/basegeometry.js b/src/symbolfunctions/basegeometry.js
@@ -150,7 +150,8 @@ export default function basegeometry(ms) {
     };
     drawArray2.push(modifier[this.metadata.affiliation]);
   }
-  // Space Modifiers
+  // Cyberspace Modifiers
+  /*
   if (this.metadata.cyberspace) {
     modifier = {
       Friend: {
@@ -180,6 +181,7 @@ export default function basegeometry(ms) {
     };
     drawArray2.push(modifier[this.metadata.affiliation]);
   }
+  */
   //Add a dashed outline to the frame if the status is not present.
   if (
     this.style.fill &&