Merge pull request #127 from IN-CORE/release-1.26.0

Release 1.26.0
IN-CORE · Apr 8, 2024 · 6551ffa · 6551ffa
2 parents bb8e247 + de735f8
commit 6551ffa
Show file tree

Hide file tree

Showing 13 changed files with 159 additions and 39 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -8,7 +8,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.25.3
+version: 1.26.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -47,6 +47,7 @@ annotations:
     - name: Helm Chart
       url: https://github.com/IN-CORE/incore-helm
   artifacthub.io/changes: |
-    - Update Galveston configuration CPU number to acheive best performance
-
-
+    - Update configuration for SLC Retrofit Strategy Builder 
+    - Update SLC regions and add new regions for Playbook Config
+    - Update labels for Joplin Retrofit Strategy Builder
+    - Update number of CPUs for best performance
diff --git a/README.md b/README.md
@@ -103,6 +103,13 @@ IN-CORE will use a persistent storage to store all data that is uploaded as well
 For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc.yaml).
 
 ## ChangeLog
+
+### 1.26.0
+- Update configuration for SLC Retrofit Strategy Builder
+- Update slc regions and remove additional sector
+- Update labels for Joplin Retrofit Strategy Builder
+- Update number of CPUs for best performance
+
 ### 1.25.3
 - Update Galveston configuration CPU number to acheive best performance
 

diff --git a/playbook-configs/galveston/datawolfWorkflow.config.dev.json b/playbook-configs/galveston/datawolfWorkflow.config.dev.json
@@ -306,7 +306,7 @@
         "variableName": "numCPUs",
         "widget": null,
         "hidden": true,
-        "defaultValue": 8,
+        "defaultValue": 14,
         "parametersMap": [
           {
             "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667",

diff --git a/playbook-configs/joplin/datawolfWorkflow.config.dev.json b/playbook-configs/joplin/datawolfWorkflow.config.dev.json
@@ -541,7 +541,7 @@
         "variableName": "numCpus",
         "widget": null,
         "hidden": true,
-        "defaultValue": 8,
+        "defaultValue": 14,
         "parametersMap": [
           {
             "paramId": "937224ee-0e6c-40d7-dd2e-6a40018c1a02",

diff --git a/playbook-configs/joplin/datawolfWorkflow.config.prod.json b/playbook-configs/joplin/datawolfWorkflow.config.prod.json
@@ -541,7 +541,7 @@
         "variableName": "numCpus",
         "widget": null,
         "hidden": true,
-        "defaultValue": 8,
+        "defaultValue": 14,
         "parametersMap": [
           {
             "paramId": "937224ee-0e6c-40d7-dd2e-6a40018c1a02",

diff --git a/playbook-configs/joplin/globals.config.dev.json b/playbook-configs/joplin/globals.config.dev.json
@@ -125,11 +125,11 @@
 				"key": "strtypes",
 				"possibleOptions": [
 					{
-						"label": "1 story residential wood building (small rectangular plan and gable roof)",
+						"label": "1-story wood-frame residential buildings",
 						"value": "1"
 					},
 					{
-						"label": "2 stories residential wood building (large rectangular plan and gable roof)",
+						"label": "2-story wood-frame residential buildings",
 						"value": "5"
 					}
 				]
@@ -148,21 +148,21 @@
 				"key": "retrofits",
 				"possibleOptions": [
 					{
-						"label": "Current Practice - Asphalt Shingles, 8d Sheath, 2x16d R-W",
+						"label": "Joplin buildings constructed following the 2006 IRC",
 						"value": {
 							"ret_key": "retrofit_1",
 							"ret_val": ""
 						}
 					},
 					{
-						"label": "Asphalt Shingles, 8d Sheath C6/6, 2xH2.5 R-W Clips",
+						"label": "Joplin buildings with a cost-effective retrofit plan",
 						"value": {
 							"ret_key": "retrofit_2",
 							"ret_val": ""
 						}
 					},
 					{
-						"label": "Clay Tiles, 8d Sheath C6/6, 2xH2.5 R-W Clips",
+						"label": "Joplin buildings with a high-performance retrofit plan",
 						"value": {
 							"ret_key": "retrofit_3",
 							"ret_val": ""

diff --git a/playbook-configs/joplin/globals.config.prod.json b/playbook-configs/joplin/globals.config.prod.json
@@ -125,11 +125,11 @@
 				"key": "strtypes",
 				"possibleOptions": [
 					{
-						"label": "1 story residential wood building (small rectangular plan and gable roof)",
+						"label": "1-story wood-frame residential buildings",
 						"value": "1"
 					},
 					{
-						"label": "2 stories residential wood building (large rectangular plan and gable roof)",
+						"label": "2-story wood-frame residential buildings",
 						"value": "5"
 					}
 				]
@@ -148,21 +148,21 @@
 				"key": "retrofits",
 				"possibleOptions": [
 					{
-						"label": "Current Practice - Asphalt Shingles, 8d Sheath, 2x16d R-W",
+						"label": "Joplin buildings constructed following the 2006 IRC",
 						"value": {
 							"ret_key": "retrofit_1",
 							"ret_val": ""
 						}
 					},
 					{
-						"label": "Asphalt Shingles, 8d Sheath C6/6, 2xH2.5 R-W Clips",
+						"label": "Joplin buildings with a cost-effective retrofit plan",
 						"value": {
 							"ret_key": "retrofit_2",
 							"ret_val": ""
 						}
 					},
 					{
-						"label": "Clay Tiles, 8d Sheath C6/6, 2xH2.5 R-W Clips",
+						"label": "Joplin buildings with a high-performance retrofit plan",
 						"value": {
 							"ret_key": "retrofit_3",
 							"ret_val": ""

diff --git a/playbook-configs/slc/cgeInfo.json b/playbook-configs/slc/cgeInfo.json
@@ -25,8 +25,7 @@
 	  "ART_ACC": "Arts, Entertainment, Recreation, Accommodation and Food Services",
 	  "RELIG": "Religious Organizations",
 	  "HS1": "Lower-value homes (less than $100k)",
-	  "HS2": "Middle-value homes (100k-200k)",
-	  "HS3": "Higher - value homes (more than 200k)"
+	  "HS2": "Middle-value homes (100k-200k)"
 	}
   },
   "employment": {
@@ -44,8 +43,7 @@
 	  "ART_ACC": "Arts, Entertainment, Recreation, Accommodation and Food Services",
 	  "RELIG": "Religious Organizations",
 	  "HS1": "Lower-value homes (less than $100k)",
-	  "HS2": "Middle-value homes (100k-200k)",
-	  "HS3": "Higher - value homes (more than 200k)"
+	  "HS2": "Middle-value homes (100k-200k)"
 	}
   }
 }
diff --git a/playbook-configs/slc/datawolfWorkflow.config.dev.json b/playbook-configs/slc/datawolfWorkflow.config.dev.json
@@ -306,7 +306,7 @@
         "variableName": "numCPUs",
         "widget": null,
         "hidden": true,
-        "defaultValue": 8,
+        "defaultValue": 14,
         "parametersMap": [
           {
             "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667",
@@ -915,7 +915,7 @@
         "variableName": "regions",
         "widget": null,
         "hidden": true,
-        "defaultValue": "R1,R2",
+        "defaultValue": "R1,R2,R3,R4,R5,R6,R7",
         "parametersMap": [
           {
             "paramId": "46509d68-7f9e-447f-eb76-de5a884cf3b0",
@@ -966,7 +966,7 @@
         "variableName": "supCategories",
         "widget": null,
         "hidden": true,
-        "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2,HS3",
+        "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2",
         "parametersMap": [
           {
             "paramId": "7c88cdbf-3801-4371-e709-50be083c7f75",

diff --git a/playbook-configs/slc/datawolfWorkflow.config.prod.json b/playbook-configs/slc/datawolfWorkflow.config.prod.json
@@ -306,7 +306,7 @@
         "variableName": "numCPUs",
         "widget": null,
         "hidden": true,
-        "defaultValue": 8,
+        "defaultValue": 14,
         "parametersMap": [
           {
             "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667",
@@ -915,7 +915,7 @@
         "variableName": "regions",
         "widget": null,
         "hidden": true,
-        "defaultValue": "R1,R2",
+        "defaultValue": "R1,R2,R3,R4,R5,R6,R7",
         "parametersMap": [
           {
             "paramId": "46509d68-7f9e-447f-eb76-de5a884cf3b0",
@@ -966,7 +966,7 @@
         "variableName": "supCategories",
         "widget": null,
         "hidden": true,
-        "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2,HS3",
+        "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2",
         "parametersMap": [
           {
             "paramId": "7c88cdbf-3801-4371-e709-50be083c7f75",

diff --git a/playbook-configs/slc/globals.config.dev.json b/playbook-configs/slc/globals.config.dev.json
@@ -18,6 +18,26 @@
 		{
 			"name": "R2",
 			"value": "R2"
+		},
+		{
+		  "name": "R3",
+		  "value": "R3"
+		},
+		{
+		  "name": "R4",
+		  "value": "R4"
+		},
+		{
+		  "name": "R5",
+		  "value": "R5"
+		},
+		{
+		  "name": "R6",
+		  "value": "R6"
+		},
+		{
+		  "name": "R7",
+		  "value": "R7"
 		}
 	],
 	"testbedSpace": "commresilienceslc",
@@ -126,13 +146,50 @@
 			"#CDECF0",
 			"#FFE3C4"
 		],
-		"maxStrategies": 5,
+		"maxStrategies": 18,
 		"conditions": [
 			{
 				"label": "City Council District",
 				"type": "mapSelect",
 				"key": "zones",
-				"possibleOptions": []
+				"possibleOptions": [
+					{
+						"label": "District 1",
+						"value": "1"
+					},
+					{
+						"label": "District 2",
+						"value": "2"
+					},
+					{
+						"label": "District 3",
+						"value": "3"
+					},
+					{
+						"label": "District 4",
+						"value": "4"
+					},
+					{
+						"label": "District 5",
+						"value": "5"
+					},
+					{
+						"label": "District 6",
+						"value": "6"
+					},
+					{
+						"label": "District 7",
+						"value": "7"
+					},
+					{
+						"label": "District 8",
+						"value": "8"
+					},
+					{
+						"label": "District 9",
+						"value": "9"
+					}
+				]
 			},
 			{
 				"label": "Building Structural Type",
@@ -165,7 +222,7 @@
 					{
 						"label": "Wood or Metal Deck Diaphragms",
 						"value": {
-							"ret_key": "Wood or Metal Deck Diaphragms",
+							"ret_key": "WMDD",
 							"ret_val": ""
 						}
 					}
@@ -174,7 +231,7 @@
 		],
 		"zoneLayerId": "65f509b6e42f3b0da55d74cf",
 		"activeLayerNames": "Zone",
-		"activeLayerFieldname": "NAME",
+		"activeLayerFieldname": "COUNCIL_ID",
 		"zoneMapBounds": [
 			-112.10137778755622,
 			40.69990503292076,