Add PZC support

app.py

@@ -43,7 +43,7 @@ import os
 lib_path = os.path.abspath("lib/JTSParser.dll")
 
 Reflection.Assembly.LoadFile(lib_path)
-import YYZ.JTS.NB
+from YYZ import JTS
 
 # App
 
@@ -62,19 +62,26 @@ def dock(x, limit):
 
 default_path = "JTS_assets/ridge.map"
 
+road_names_map = {
+    "NB": ["Path", "Road", "Pike", "Rail"],
+    "CWB": ["Trail", "Road", "Pike", "Rail"],
+    "PZC": ["Trail", "Secondary", "Primary", "Rail"]
+}
+
 with gr.Blocks(analytics_enabled=False) as demo:
     with gr.Row():
         with gr.Column(scale=1):
-            file_input = gr.File(default_path, label="Map File (NB or CWB)", file_types=[".map"])
+            file_input = gr.File(default_path, label="Map File (NB/CWB/PZC)", file_types=[".map"])
+            code_dropdown = gr.Dropdown(choices=["NB", "CWB", "PZC"], value="NB", label="Series")
             labels_checkbox = gr.Checkbox(True, label="Labels")
             labels_size_threshold_number = gr.Number(0, label="Label Size Threshold", info="1 => Tactical, 2 => Normal, 3 => Important")
             # with gr.Row():
             with gr.Accordion("Roads"):
                 with gr.Row():
-                    path_checkbox = gr.Checkbox(label="Path")
-                    road_checkbox = gr.Checkbox(label="Road")
-                    pike_checkbox = gr.Checkbox(True, label="Pike")
-                    railway_checkbox = gr.Checkbox(True, label="Railway")
+                    path_checkbox = gr.Checkbox(label="Path/Trail")
+                    road_checkbox = gr.Checkbox(label="Road/Secondary")
+                    pike_checkbox = gr.Checkbox(True, label="Pike/Primary")
+                    railway_checkbox = gr.Checkbox(True, label="Rail")
             with gr.Row():
                 road_offset_number = gr.Number(0.3, label="Road Offset")
                 elevation_scale_number = gr.Number(0.1, label="Elevation Scale")
@@ -85,12 +92,15 @@ with gr.Blocks(analytics_enabled=False) as demo:
     def plot(data):
         with open(data[file_input].name) as f:
             map_str = f.read()
-        map_file = YYZ.JTS.NB.MapFile.Parse(map_str)
-        graph = YYZ.JTS.NB.InfantryColumnGraph.FromMapFile(map_file)
+
+        code = data[code_dropdown]
+        map_file = JTS.JTSParser.FromCode(code).ParseMap(map_str, False)
+        network = JTS.HexNetwork.FromMapFile(map_file)
+        
         height_mat = np.empty([map_file.Height, map_file.Width])
         for i in range(map_file.Height):
             for j in range(map_file.Width):
-                height_mat[i,j] = graph.HexMat[i, j].Height
+                height_mat[i,j] = network.HexMat[i, j].Height
 
         surface = go.Surface(
             x = np.arange(map_file.Width),
@@ -103,15 +113,18 @@ with gr.Blocks(analytics_enabled=False) as demo:
         road_offset = data[road_offset_number]
 
         road_items = [
-            (YYZ.JTS.NB.RoadType.Path, path_checkbox, 'gray'),
-            (YYZ.JTS.NB.RoadType.Road, road_checkbox, 'green'),
-            (YYZ.JTS.NB.RoadType.Pike, pike_checkbox, 'pink'),
-            (YYZ.JTS.NB.RoadType.Railway, railway_checkbox, 'black')
+            (path_checkbox, 'gray'),
+            (road_checkbox, 'green'),
+            (pike_checkbox, 'pink'),
+            (railway_checkbox, 'black')
         ]
 
-        for road_type, checkbox, color in road_items:
+        for road_idx, (checkbox, color) in enumerate(road_items):
+            road_name = road_names_map[code][road_idx]
+            road_type = map_file.CurrentTerrainSystem.Road.GetValue(road_name)
+
             if data[checkbox]:
-                for road in graph.SimplifyRoad(road_type):
+                for road in network.SimplifyRoad(road_type):
                     x_line = []
                     y_line = []
                     z_line = []
@@ -178,7 +191,7 @@ with gr.Blocks(analytics_enabled=False) as demo:
 
         return {output_plot: fig}
 
-    plot_button.click(plot, {file_input, 
+    plot_button.click(plot, {file_input, code_dropdown,
                              labels_checkbox, labels_size_threshold_number, 
                              path_checkbox, road_checkbox, pike_checkbox, railway_checkbox,
                              elevation_scale_number, road_offset_number}, {output_plot})

requirements.txt

@@ -1,3 +1,3 @@
-plotly == 5.14.1
+plotly
 numpy
 pythonnet