exer5 check

Ozodbek47 · Jan 23, 2024 · b718f47 · b718f47
1 parent bc76456
commit b718f47
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/exercises/exercise5.jv b/exercises/exercise5.jv
@@ -22,26 +22,28 @@ pipeline GtfsPipeline {
     }
 
     block StopsTextFileInterpreter oftype TextFileInterpreter { encoding: "latin2"; }
-    block StopsCSVInterpreter oftype CSVInterpreter { enclosing: '"'; } // enclosing: '"';
+    block StopsCSVInterpreter oftype CSVInterpreter { enclosing: '"'; }
 
     block StopsColumnDeleter oftype ColumnDeleter { delete: [column B, column D, column H, column I, column J, column K, column L,]; }
 
     block StopsTableInterpreter oftype TableInterpreter {
-        header: false;
+        header: true;
         columns:[
             "stop_id" oftype integer,
             "stop_name" oftype text,
             "stop_lat" oftype coordinatetype,
             "stop_lon" oftype coordinatetype,
-            "zone_id" oftype integer
+            "zone_id" oftype zonetype
         ];
     }
 
     constraint GeographicCoordinate oftype RangeConstraint { lowerBound: -90; lowerBoundInclusive: true; upperBound: 90; upperBoundInclusive: true;}
     valuetype coordinatetype oftype decimal { constraints: [ GeographicCoordinate ]; }
 
-    // constraint allowedzone oftype AllowlistConstraint { allowlist: ['2001']; }
-    // valuetype zonetype oftype integer { constraints: [ allowedzone ]; }
+    constraint AllowedZone on integer:
+        value == 2001;
+
+    valuetype zonetype oftype integer { constraints: [ AllowedZone ]; }
 
     block StopsLoader oftype SQLiteLoader { table: "stops"; file: "./gtfs.sqlite"; }