Add files via upload

changelog.md

@@ -1,5 +1,14 @@
 # FTOT Change Log
 
+## v2021_2
+The 2021.2 release adds multiple functionality enhancements related to disruption, vehicle types, and routing. The following changes have been made:
+- New functionality allowing the user to fully disrupt FTOT network segments (make segments unavailable) by leveraging a configurable disruption csv.
+- An FTOT supporting tool automating the process of generating a disruption csv based on gridded exposure data (e.g., flooding data, HAZUS scenario outputs) has also been added.
+- Ability to create custom vehicle types and assign them to individual commodities to enhance reporting. This feature introduces a new vehicle_types.csv file within FTOT and updates the functionality of the optional commodity_mode.csv input file.
+- The network density reduction (NDR) functionality for identifying shortest paths (introduced in the 2020.4 release) has been refined to consider both phase of matter and commodity. With this additional development, NDR provides the optimal solution for all cases for which the functionality is allowed. The network presolve step for NDR remains disabled by default and is not compatible with candidate generation, the inclusion of modal capacity, and maximum allowable transport distance scenarios.
+- Additional reporting of routes (shortest paths) included in the optimal solution has been added for scenarios where NDR has been enabled. A new optimal_routes.csv file stored in the debug folder of the scenario reports the starting and ending facility of each route, along with its routing cost and length in miles.
+- The default background map for the Tableau dashboard has been changed from Dark to Streets to make it easier for the user to identify the local geography and path of the optimal solution.
+
 ## v2021_1
 
 The 2021.1 release finalizes the transition to Python 3, migrating from a dependency on ArcGIS 10.x to a dependency on ArcGIS Pro. The following changes have been made:

program/ftot.py

@@ -25,8 +25,8 @@
     ureg.define('long_hundredweight = long_hunderdweight')
     ureg.define('us_ton = US_ton')
 
-VERSION_NUMBER = "5.0.9"
-VERSION_DATE = "3/30/2021"
+VERSION_NUMBER = "5.0.10"
+VERSION_DATE = "7/15/2021"
 
 # ===================================================================================================
 

program/ftot_facilities.py

@@ -809,7 +809,7 @@ def get_commodity_id(the_scenario, db_con, commodity_data, logger):
                                                           share_max_transport_distance)
         else:
             sql = "insert into commodities " \
-                  "(commodity_name, units, phase_of_matter, max_transport_distance,share_max_transport_distance) " \
+                  "(commodity_name, units, phase_of_matter, max_transport_distance, share_max_transport_distance) " \
                   "values ('{}', '{}', '{}', {}, '{}');".format(commodity_name, commodity_unit, commodity_phase,
                                                                 commodity_max_transport_distance,
                                                                 share_max_transport_distance)
@@ -875,10 +875,10 @@ def gis_clean_fc(the_scenario, logger):
 
 
 def gis_clear_feature_class(fc, logger):
-    logger.debug("start: clear_feature_class for fc{}".format(os.path.split(fc)[1]))
+    logger.debug("start: clear_feature_class for fc {}".format(os.path.split(fc)[1]))
     if arcpy.Exists(fc):
         arcpy.Delete_management(fc)
-        logger.debug("finished: deleted existing fc{}".format(os.path.split(fc)[1]))
+        logger.debug("finished: deleted existing fc {}".format(os.path.split(fc)[1]))
 
 # ===================================================================================================
 
@@ -888,7 +888,6 @@ def gis_get_feature_count(fc, logger):
     count = int(result.getOutput(0))
     return count
 
-
 # ===================================================================================================
 
 

program/ftot_maps.py

@@ -158,6 +158,13 @@ def export_to_png(map_name, aprx, the_scenario, logger):
 
     layout = aprx.listLayouts("ftot_layout")[0]
 
+    # # Setup legend properties so everything refreshes as expected
+    legend = layout.listElements("LEGEND_ELEMENT", "Legend")[0]
+    legend.fittingStrategy = 'AdjustFrame'
+    legend.syncLayerVisibility = True
+    legend.syncLayerOrder = True
+    aprx.save()
+
     layout.exportToPNG(file_location)
 
     logger.info("exporting: {}".format(map_name))