Merge pull request #143 from CMAP-REPOS/c23q2

c23q2

Author: nrferguson

.gitignore

@@ -1,5 +1,9 @@
+# Ignore temporary files generated by tools.
+temp/
+
 # Compiled source #
 ###################
+src/__pycache__/
 *.com
 *.class
 *.dll

README.md

@@ -1,7 +1,10 @@
-CMAP-REPOS/mhn_programs
-=======================
+# CMAP-REPOS/mhn_programs
+
 The MHN Programs repository is a collection of (mostly) Python scripts used to administer the [Chicago Metropolitan Agency for Planning (CMAP)](http://www.cmap.illinois.gov)'s Master Highway Network [geodatabase](http://www.esri.com/software/arcgis/geodatabase). This geodatabase is used, in conjunction with the Master Rail Network, to generate travel demand modeling networks, which we use for all of our modeling needs, including [transportation conformity](http://www.cmap.illinois.gov/conformity-analysis).
 
-The MHN itself contains information about all of the major roads within the 21-county CMAP modeling area, as well as all major road construction projects scheduled between now and 2040, all current CTA and Pace bus routes, and planned future bus routes (like [CTA's Ashland BRT](http://www.transitchicago.com/ashlandbrt)).
+The MHN itself contains information about all of the major roads within the 21-county CMAP modeling area, as well as all major road construction projects scheduled between now and 2050, all current CTA and Pace bus routes, and planned future bus routes.
 
 The scripts in this repository are used to import new GTFS bus data and road construction project details, maintain the integrity of the network after geometric edits have been made, and export data in a format suitable for input into [Emme](http://www.inrosoftware.com/en/products/emme) modeling networks. This repository includes an ArcGIS Toolbox (mhn_tools.tbx), which has been configured such that each of the main scripts can (and should!) be run within the ArcMap/ArcCatalog/ArcGIS Pro GUI out of the box!
+
+## Getting Started
+See the [wiki](https://github.com/CMAP-REPOS/mhn_programs/wiki/Getting-Set-Up).

data/Bus_Plaza_Nodes_C15Q3.txt input/Bus_Plaza_Nodes_C15Q3.txtdata/Bus_Plaza_Nodes_C15Q3.txt renamed to input/Bus_Plaza_Nodes_C15Q3.txt

@@ -289,16 +289,15 @@ def __init__(self, mhn_gdb_path, zone_gdb_path=None):
 
         # Directories
         self.root_dir = os.path.dirname(self.gdb)
-        self.imp_dir = self.ensure_dir(os.path.join(self.root_dir, 'import'))
-        self.out_dir = self.ensure_dir(os.path.join(self.root_dir, 'output'))
-        self.temp_dir = self.ensure_dir(os.path.join(self.root_dir, 'temp'))
         self.script_dir = sys.path[0]  # Directory containing this module
         if os.path.basename(self.script_dir) == 'utilities':
-            self.prog_dir = os.path.dirname(self.script_dir)
+            self.src_dir = os.path.dirname(self.script_dir)
             self.util_dir = self.script_dir
         else:
-            self.prog_dir = self.script_dir
-            self.util_dir = os.path.join(self.prog_dir, 'utilities')
+            self.src_dir = self.script_dir
+            self.util_dir = os.path.join(self.src_dir, 'utilities')
+        self.temp_dir = self.ensure_dir(os.path.realpath(os.path.join(self.src_dir, '../temp')))
+        self.in_dir = os.path.realpath(os.path.join(self.src_dir, '../input'))
         self.mem = 'in_memory'
 
         # MHN geodatabase structure, projection
@@ -688,7 +687,7 @@ def submit_sas(self, sas_file, sas_log, sas_lst, arg_list=None):
             arg_str = ''
         else:
             arg_str = '$'.join(str(arg) for arg in arg_list)
-        bat = os.path.join(self.prog_dir, 'sasrun.bat')
+        bat = os.path.join(self.src_dir, 'sasrun.bat')
         cmd = [bat, sas_file, arg_str, sas_log, sas_lst]
         # arcpy.AddMessage('{}: {}'.format(sas_file, arg_str))  # Helpful for debugging
         return subprocess.check_call(cmd, startupinfo=startupinfo)