From 79ebfb615eadae20967c53ff0687c48ae6f3f0c7 Mon Sep 17 00:00:00 2001
From: Kerry Robinson <krobinson@esri.com>
Date: Wed, 24 Jan 2024 12:57:15 -0800
Subject: [PATCH] update to latest jsapi

---
 js/OPLAN_3D_config.html           | 36 +++++++++++++++---
 js/monterey_2D_stream_config.html | 61 +++----------------------------
 2 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/js/OPLAN_3D_config.html b/js/OPLAN_3D_config.html
index 75845c1..5ccf87e 100644
--- a/js/OPLAN_3D_config.html
+++ b/js/OPLAN_3D_config.html
@@ -24,7 +24,7 @@
 		}
 	</style>
 	<link rel="stylesheet" href="https://js.arcgis.com/4.18/esri/themes/light/main.css" />
-	<script src="https://js.arcgis.com/4.20/"></script>
+	<script src="https://js.arcgis.com/4.24/"></script>
 	<script>
 	require([
 		"esri/config",
@@ -104,6 +104,30 @@
 			config: dictionaryRendererConfig
 		});
 		
+		var dictionaryRendererFieldMap_cm = {
+				sidc: "sidc_2525c",
+				status: "status",
+				echelon: "echelon",
+				additionalinformation: "additionalinformation",
+				combateffectiveness: "combateffectiveness",
+				operationalcondition: "operationalcondition",
+				higherformation: "higherFormation",
+				direction: "direction",
+				speed: "speed",
+				staffcomment: "staffComment",
+				type: "Type",
+				uniquedesignation: "uniquedesignation",
+				distance: "width",
+				z: "z",
+				z2: "z2"
+		};
+		var dictionaryRenderer2525c = new DictionaryRenderer({
+			url: "https://www.arcgis.com/sharing/rest/content/items/64d5c3d58a924cd98587fd80f9ec4ef1", // 2525c
+ 			//url: "https://www.arcgis.com/sharing/rest/content/items/75b40938249848dcaa7a9f3a8fec2895", //2525d latest
+           fieldMap: dictionaryRendererFieldMap_cm,
+			config: dictionaryRendererConfig
+		});
+		
 		var popupTemplateUnits = {
 			title: "[{symbolset} ({identity_})] {symbolentity}",
 			content: [
@@ -289,7 +313,7 @@
 			renderer: dictionaryRenderer2525d
 		});
 
-/*		var layerControlMeasuresPoints = new FeatureLayer({
+		var layerControlMeasuresPoints = new FeatureLayer({
 			title: "Control Measures - Points",
 			url: "https://services.arcgis.com/pmcEyn9tLWCoX7Dm/ArcGIS/rest/services/Ft_Irwin_OPLAN/FeatureServer/21",
             outFields: ["*"],
@@ -312,14 +336,14 @@
 			popupTemplate: popupTemplateCM,
 			renderer: dictionaryRenderer2525c
 		});
-*/
 
-		//map.add(layerControlMeasuresLines);
-		//map.add(layerControlMeasuresAreas);
+
+		map.add(layerControlMeasuresLines);
+		map.add(layerControlMeasuresAreas);
 		map.add(layerUnits);
 		map.add(layerActivities);
 		map.add(layerAir);
-		//map.add(layerControlMeasuresPoints);
+		map.add(layerControlMeasuresPoints);
 
 
 		var spinning = false;
diff --git a/js/monterey_2D_stream_config.html b/js/monterey_2D_stream_config.html
index 08f1e2a..7ca545e 100644
--- a/js/monterey_2D_stream_config.html
+++ b/js/monterey_2D_stream_config.html
@@ -24,7 +24,7 @@
 		}
 	</style>
 	<link rel="stylesheet" href="https://js.arcgis.com/4.16/esri/themes/light/main.css" />
-	<script src="https://js.arcgis.com/4.16/"></script>
+	<script src="https://jsdev.arcgis.com/4.26/"></script>
 	<script>
 	var streamLayer;
 	require([
@@ -41,7 +41,7 @@
 		"esri/widgets/CoordinateConversion",
 		"esri/widgets/Fullscreen",
 		"esri/widgets/Feature"
-	], function(
+		], function(
 		esriConfig,
 		Portal,
 		Map,
@@ -85,29 +85,6 @@
             sidc: "sidc_2525c",
             speed: "Speed",
             uniquedesignation: "uniquedesignation",
-            //combateffectiveness: "operationalcondition",
-            //staffcomment: "staffcomment",
-            //higherformation: "owningunit",
-            //additionalinformation: "Description",
-            //datetimevalid: "Date",
-            //distance: "Distance",
-            //commonidentifier: "commonidentifier",
-            //datetimeexpired: "datetimeexpired",
-            //equipmentteardowntime: "equipmentteardowntime",
-            //idmode: "idmode",
-            //platformtype: "platformtype",
-            //quantity: "quantity",
-            //reinforced: "reinforced",
-            //reliability: "reliability",
-            //credibility: "credibility",
-            //sigintmobility: "",
-            //targetdesignator: "TargetDesignator",
-            //type: "type",
-            //uniquedesignation2: "",
-            //x: "X",
-            //y: "Y",
-            //z: "Z",
-            //z2: ""
           },
           config: {
 			frame: "ON",
@@ -126,30 +103,8 @@
             sidc: "sidc",
             speed: "Speed",
             uniquedesignation: "uniquedesignation",
-            //combateffectiveness: "operationalcondition",
-            //staffcomment: "staffcomment",
             higherformation: "owningunit",
-            //additionalinformation: "Description",
-            //datetimevalid: "Date",
-            //distance: "Distance",
-            //commonidentifier: "commonidentifier",
-            //datetimeexpired: "datetimeexpired",
-            //equipmentteardowntime: "equipmentteardowntime",
-            //idmode: "idmode",
-            //platformtype: "platformtype",
-            //quantity: "quantity",
-            //reinforced: "reinforced",
-            //reliability: "reliability",
-            //credibility: "credibility",
-            //sigintmobility: "",
-            //targetdesignator: "TargetDesignator",
-            //type: "type",
-            //uniquedesignation2: "",
-            //x: "X",
-            //y: "Y",
-            //z: "Z",
-            //z2: ""
-          },
+        },
           config: {
 			frame: "ON",
 			fill: "ON",
@@ -353,19 +308,13 @@
 				}
 				});
 			
-			//streamLayerView.effect = {
-			//	filter: {
-			//		where: "status911 = " + 1,
-			//	},
-			//	includedEffect: "invert(100%)"
-			//};
-			
 			
+ 
 			streamLayerView.on("data-received", (event) => {
 
 				if (event.attributes["status911"]===1) {
 					console.log("Alert: " + event.attributes["uniquedesignation"]);
-                    var highlightQuery = friendlyLandStreamLayer.createQuery();
+					var highlightQuery = friendlyLandStreamLayer.createQuery();
                     highlightQuery.where = "track_id='" + event.attributes["track_id"] + "'";
                     streamLayerView.queryFeatures(highlightQuery).then(function (response) {
 						streamLayerView.highlight(response.features);