Support inp in coord, vertex, label

api/inp_in_new.py

@@ -24,6 +24,9 @@ from .s20_mixing import inp_in_mixing_new
 from .s21_times import inp_in_time_new
 from .s22_report import inp_in_report_new
 from .s23_options import inp_in_option_new
+from .s24_coordinates import inp_in_coord_new
+from .s25_vertices import inp_in_vertex_new
+from .s26_labels import inp_in_label_new
 from .s27_backdrop import inp_in_backdrop_new
 
 _S = 'S'
@@ -53,9 +56,9 @@ _handler = {
     TIMES       : (_S, inp_in_time_new),
     REPORT      : (_S, inp_in_report_new),
     OPTIONS     : (_S, inp_in_option_new),
-    COORDINATES : (_L, None),
-    VERTICES    : (_L, None),
-    LABELS      : (_L, None),
+    COORDINATES : (_L, inp_in_coord_new),
+    VERTICES    : (_L, inp_in_vertex_new),
+    LABELS      : (_L, inp_in_label_new),
     BACKDROP    : (_S, inp_in_backdrop_new),
     #END         : 'END',
 }
@@ -188,13 +191,12 @@ def parse_file(project: str, inp: str) -> None:
                                     write(project, f"delete from demands where junction = '{junction}';")
                                 demand_junction = junction
 
-                        if handler != None:
-                            handler(project, line)
+                        handler(project, line)
 
 
                 f.seek(0)
 
-            if is_s and handler != None:
+            if is_s:
                 handler(project, sections[s])