minotor 5.0.1 → 6.0.0

package/dist/cli.mjs

@@ -15771,10 +15771,10 @@ const Stop = {
             writer.uint32(18).string(message.sourceStopId);
         }
         if (message.lat !== undefined) {
-            writer.uint32(25).double(message.lat);
+            writer.uint32(29).float(message.lat);
         }
         if (message.lon !== undefined) {
-            writer.uint32(33).double(message.lon);
+            writer.uint32(37).float(message.lon);
         }
         writer.uint32(42).fork();
         for (const v of message.children) {
@@ -15814,17 +15814,17 @@ const Stop = {
                     continue;
                 }
                 case 3: {
-                    if (tag !== 25) {
+                    if (tag !== 29) {
                         break;
                     }
-                    message.lat = reader.double();
+                    message.lat = reader.float();
                     continue;
                 }
                 case 4: {
-                    if (tag !== 33) {
+                    if (tag !== 37) {
                         break;
                     }
-                    message.lon = reader.double();
+                    message.lon = reader.float();
                     continue;
                 }
                 case 5: {
@@ -15929,16 +15929,16 @@ const Stop = {
     },
 };
 function createBaseStopsMap() {
-    return { version: "", stops: {} };
+    return { version: "", stops: [] };
 }
 const StopsMap = {
     encode(message, writer = new BinaryWriter()) {
         if (message.version !== "") {
             writer.uint32(10).string(message.version);
         }
-        Object.entries(message.stops).forEach(([key, value]) => {
-            StopsMap_StopsEntry.encode({ key: key, value }, writer.uint32(18).fork()).join();
-        });
+        for (const v of message.stops) {
+            Stop.encode(v, writer.uint32(18).fork()).join();
+        }
         return writer;
     },
     decode(input, length) {
@@ -15959,10 +15959,7 @@ const StopsMap = {
                     if (tag !== 18) {
                         break;
                     }
-                    const entry2 = StopsMap_StopsEntry.decode(reader, reader.uint32());
-                    if (entry2.value !== undefined) {
-                        message.stops[entry2.key] = entry2.value;
-                    }
+                    message.stops.push(Stop.decode(reader, reader.uint32()));
                     continue;
                 }
             }
@@ -15976,27 +15973,17 @@ const StopsMap = {
     fromJSON(object) {
         return {
             version: isSet$1(object.version) ? globalThis.String(object.version) : "",
-            stops: isObject$1(object.stops)
-                ? Object.entries(object.stops).reduce((acc, [key, value]) => {
-                    acc[globalThis.Number(key)] = Stop.fromJSON(value);
-                    return acc;
-                }, {})
-                : {},
+            stops: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.stops) ? object.stops.map((e) => Stop.fromJSON(e)) : [],
         };
     },
     toJSON(message) {
+        var _a;
         const obj = {};
         if (message.version !== "") {
             obj.version = message.version;
         }
-        if (message.stops) {
-            const entries = Object.entries(message.stops);
-            if (entries.length > 0) {
-                obj.stops = {};
-                entries.forEach(([k, v]) => {
-                    obj.stops[k] = Stop.toJSON(v);
-                });
-            }
+        if ((_a = message.stops) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.stops = message.stops.map((e) => Stop.toJSON(e));
         }
         return obj;
     },
@@ -16007,92 +15994,15 @@ const StopsMap = {
         var _a, _b;
         const message = createBaseStopsMap();
         message.version = (_a = object.version) !== null && _a !== void 0 ? _a : "";
-        message.stops = Object.entries((_b = object.stops) !== null && _b !== void 0 ? _b : {}).reduce((acc, [key, value]) => {
-            if (value !== undefined) {
-                acc[globalThis.Number(key)] = Stop.fromPartial(value);
-            }
-            return acc;
-        }, {});
+        message.stops = ((_b = object.stops) === null || _b === void 0 ? void 0 : _b.map((e) => Stop.fromPartial(e))) || [];
         return message;
     },
 };
-function createBaseStopsMap_StopsEntry() {
-    return { key: 0, value: undefined };
-}
-const StopsMap_StopsEntry = {
-    encode(message, writer = new BinaryWriter()) {
-        if (message.key !== 0) {
-            writer.uint32(8).uint32(message.key);
-        }
-        if (message.value !== undefined) {
-            Stop.encode(message.value, writer.uint32(18).fork()).join();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseStopsMap_StopsEntry();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 8) {
-                        break;
-                    }
-                    message.key = reader.uint32();
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.value = Stop.decode(reader, reader.uint32());
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            key: isSet$1(object.key) ? globalThis.Number(object.key) : 0,
-            value: isSet$1(object.value) ? Stop.fromJSON(object.value) : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.key !== 0) {
-            obj.key = Math.round(message.key);
-        }
-        if (message.value !== undefined) {
-            obj.value = Stop.toJSON(message.value);
-        }
-        return obj;
-    },
-    create(base) {
-        return StopsMap_StopsEntry.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseStopsMap_StopsEntry();
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : 0;
-        message.value = (object.value !== undefined && object.value !== null) ? Stop.fromPartial(object.value) : undefined;
-        return message;
-    },
-};
-function isObject$1(value) {
-    return typeof value === "object" && value !== null;
-}
 function isSet$1(value) {
     return value !== null && value !== undefined;
 }
 
-const CURRENT_VERSION$1 = '0.0.2';
+const CURRENT_VERSION$1 = '0.0.3';
 const serializeStop = (stop) => {
     return {
         name: stop.name,
@@ -16105,14 +16015,11 @@ const serializeStop = (stop) => {
         platform: stop.platform,
     };
 };
-const serializeStopsMap = (stopsMap) => {
+const serializeStopsMap = (stops) => {
     const protoStopsMap = {
         version: CURRENT_VERSION$1,
-        stops: {},
+        stops: stops.map((value) => serializeStop(value)),
     };
-    stopsMap.forEach((value, key) => {
-        protoStopsMap.stops[key] = serializeStop(value);
-    });
     return protoStopsMap;
 };
 const deserializeStop = (stopId, protoStop) => {
@@ -16132,12 +16039,7 @@ const deserializeStopsMap = (protoStopsMap) => {
     if (protoStopsMap.version !== CURRENT_VERSION$1) {
         throw new Error(`Unsupported stopMap version ${protoStopsMap.version}`);
     }
-    const stopsMap = new Map();
-    Object.entries(protoStopsMap.stops).forEach(([key, value]) => {
-        const intKey = parseInt(key, 10);
-        stopsMap.set(intKey, deserializeStop(intKey, value));
-    });
-    return stopsMap;
+    return protoStopsMap.stops.map((value, intKey) => deserializeStop(intKey, value));
 };
 const parseProtoLocationType = (protoLocationType) => {
     switch (protoLocationType) {
@@ -16176,13 +16078,12 @@ const serializeLocationType = (locationType) => {
  * to efficiently find stops based on user queries.
  */
 class StopsIndex {
-    constructor(stopsMap) {
-        var _a;
-        this.stopsMap = stopsMap;
+    constructor(stops) {
+        this.stops = stops;
         this.sourceStopsMap = new Map();
-        for (const [id, stop] of stopsMap.entries()) {
+        stops.forEach((stop, id) => {
             this.sourceStopsMap.set(stop.sourceStopId, id);
-        }
+        });
         this.textIndex = lt({
             fields: ['name'],
             storeFields: ['id'],
@@ -16190,25 +16091,26 @@ class StopsIndex {
             processTerm: generateAccentVariants,
         });
         const stopsSet = new Map();
-        for (const [id, stop] of stopsMap.entries()) {
+        stops.forEach((stop, id) => {
+            var _a;
             const effectiveStopId = (_a = stop.parent) !== null && _a !== void 0 ? _a : id;
             if (!stopsSet.has(effectiveStopId)) {
                 stopsSet.set(effectiveStopId, {
                     id: effectiveStopId,
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    name: stop.parent ? this.stopsMap.get(stop.parent).name : stop.name,
+                    name: stop.parent ? this.stops[stop.parent].name : stop.name,
                 });
             }
-        }
+        });
         const stopsArray = Array.from(stopsSet.values());
         q(this.textIndex, stopsArray);
-        this.stopPoints = Array.from(this.stopsMap.entries())
-            .filter(([, stop]) => {
+        this.stopPoints = this.stops
+            .filter((stop) => {
             if (stop.lat && stop.lon)
                 return true;
             return false;
         })
-            .map(([id, stop]) => ({
+            .map((stop, id) => ({
             id: id,
             lat: stop.lat,
             lon: stop.lon,
@@ -16236,7 +16138,7 @@ class StopsIndex {
      * @returns The serialized binary data.
      */
     serialize() {
-        const protoStopsMap = serializeStopsMap(this.stopsMap);
+        const protoStopsMap = serializeStopsMap(this.stops);
         const writer = new BinaryWriter();
         StopsMap.encode(protoStopsMap, writer);
         return writer.finish();
@@ -16247,7 +16149,7 @@ class StopsIndex {
      * @returns The total number of stops.
      */
     size() {
-        return this.stopsMap.size;
+        return this.stops.length;
     }
     /**
      * Finds stops by their name using a text search.
@@ -16257,7 +16159,7 @@ class StopsIndex {
      * @returns An array of Stop objects that match the search query.
      */
     findStopsByName(query, maxResults = 5) {
-        const results = dt(this.textIndex, query).map((result) => this.stopsMap.get(result.id));
+        const results = dt(this.textIndex, query).map((result) => this.stops[result.id]);
         return results.slice(0, maxResults);
     }
     /**
@@ -16272,7 +16174,7 @@ class StopsIndex {
     findStopsByLocation(lat, lon, maxResults = 5, radius = 0.5) {
         const nearestStops = around(this.geoIndex, lon, lat, maxResults, radius).map((id) => {
             const stopPoint = this.stopPoints[id];
-            return this.stopsMap.get(stopPoint.id);
+            return this.stops[stopPoint.id];
         });
         return nearestStops;
     }
@@ -16283,7 +16185,7 @@ class StopsIndex {
      * @returns The Stop object that matches the specified ID, or undefined if not found.
      */
     findStopById(id) {
-        return this.stopsMap.get(id);
+        return this.stops[id];
     }
     /**
      * Finds a stop by its ID in the transit data source (e.g. GTFS).
@@ -16307,14 +16209,14 @@ class StopsIndex {
         if (id === undefined) {
             return [];
         }
-        const stop = this.stopsMap.get(id);
+        const stop = this.stops[id];
         if (!stop) {
             return [];
         }
         const equivalentStops = stop.parent
-            ? ((_b = (_a = this.stopsMap.get(stop.parent)) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : [])
+            ? ((_b = (_a = this.stops[stop.parent]) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : [])
             : stop.children;
-        return Array.from(new Set([id, ...equivalentStops])).map((stopId) => this.stopsMap.get(stopId));
+        return Array.from(new Set([id, ...equivalentStops])).map((stopId) => this.stops[stopId]);
     }
 }
 
@@ -16532,7 +16434,7 @@ function createBaseRoute() {
         stopTimes: new Uint8Array(0),
         pickUpDropOffTypes: new Uint8Array(0),
         stops: new Uint8Array(0),
-        serviceRouteId: "",
+        serviceRouteId: 0,
     };
 }
 const Route$2 = {
@@ -16546,8 +16448,8 @@ const Route$2 = {
         if (message.stops.length !== 0) {
             writer.uint32(26).bytes(message.stops);
         }
-        if (message.serviceRouteId !== "") {
-            writer.uint32(34).string(message.serviceRouteId);
+        if (message.serviceRouteId !== 0) {
+            writer.uint32(32).uint32(message.serviceRouteId);
         }
         return writer;
     },
@@ -16580,10 +16482,10 @@ const Route$2 = {
                     continue;
                 }
                 case 4: {
-                    if (tag !== 34) {
+                    if (tag !== 32) {
                         break;
                     }
-                    message.serviceRouteId = reader.string();
+                    message.serviceRouteId = reader.uint32();
                     continue;
                 }
             }
@@ -16601,7 +16503,7 @@ const Route$2 = {
                 ? bytesFromBase64(object.pickUpDropOffTypes)
                 : new Uint8Array(0),
             stops: isSet(object.stops) ? bytesFromBase64(object.stops) : new Uint8Array(0),
-            serviceRouteId: isSet(object.serviceRouteId) ? globalThis.String(object.serviceRouteId) : "",
+            serviceRouteId: isSet(object.serviceRouteId) ? globalThis.Number(object.serviceRouteId) : 0,
         };
     },
     toJSON(message) {
@@ -16615,8 +16517,8 @@ const Route$2 = {
         if (message.stops.length !== 0) {
             obj.stops = base64FromBytes(message.stops);
         }
-        if (message.serviceRouteId !== "") {
-            obj.serviceRouteId = message.serviceRouteId;
+        if (message.serviceRouteId !== 0) {
+            obj.serviceRouteId = Math.round(message.serviceRouteId);
         }
         return obj;
     },
@@ -16629,7 +16531,7 @@ const Route$2 = {
         message.stopTimes = (_a = object.stopTimes) !== null && _a !== void 0 ? _a : new Uint8Array(0);
         message.pickUpDropOffTypes = (_b = object.pickUpDropOffTypes) !== null && _b !== void 0 ? _b : new Uint8Array(0);
         message.stops = (_c = object.stops) !== null && _c !== void 0 ? _c : new Uint8Array(0);
-        message.serviceRouteId = (_d = object.serviceRouteId) !== null && _d !== void 0 ? _d : "";
+        message.serviceRouteId = (_d = object.serviceRouteId) !== null && _d !== void 0 ? _d : 0;
         return message;
     },
 };
@@ -16717,83 +16619,10 @@ const Transfer = {
         return message;
     },
 };
-function createBaseStopsAdjacency() {
-    return { stops: {} };
-}
-const StopsAdjacency = {
-    encode(message, writer = new BinaryWriter()) {
-        Object.entries(message.stops).forEach(([key, value]) => {
-            StopsAdjacency_StopsEntry.encode({ key: key, value }, writer.uint32(10).fork()).join();
-        });
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseStopsAdjacency();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 10) {
-                        break;
-                    }
-                    const entry1 = StopsAdjacency_StopsEntry.decode(reader, reader.uint32());
-                    if (entry1.value !== undefined) {
-                        message.stops[entry1.key] = entry1.value;
-                    }
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            stops: isObject(object.stops)
-                ? Object.entries(object.stops).reduce((acc, [key, value]) => {
-                    acc[globalThis.Number(key)] = StopsAdjacency_StopAdjacency.fromJSON(value);
-                    return acc;
-                }, {})
-                : {},
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.stops) {
-            const entries = Object.entries(message.stops);
-            if (entries.length > 0) {
-                obj.stops = {};
-                entries.forEach(([k, v]) => {
-                    obj.stops[k] = StopsAdjacency_StopAdjacency.toJSON(v);
-                });
-            }
-        }
-        return obj;
-    },
-    create(base) {
-        return StopsAdjacency.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseStopsAdjacency();
-        message.stops = Object.entries((_a = object.stops) !== null && _a !== void 0 ? _a : {}).reduce((acc, [key, value]) => {
-            if (value !== undefined) {
-                acc[globalThis.Number(key)] = StopsAdjacency_StopAdjacency.fromPartial(value);
-            }
-            return acc;
-        }, {});
-        return message;
-    },
-};
-function createBaseStopsAdjacency_StopAdjacency() {
+function createBaseStopAdjacency() {
     return { transfers: [], routes: [] };
 }
-const StopsAdjacency_StopAdjacency = {
+const StopAdjacency = {
     encode(message, writer = new BinaryWriter()) {
         for (const v of message.transfers) {
             Transfer.encode(v, writer.uint32(10).fork()).join();
@@ -16808,7 +16637,7 @@ const StopsAdjacency_StopAdjacency = {
     decode(input, length) {
         const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseStopsAdjacency_StopAdjacency();
+        const message = createBaseStopAdjacency();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -16861,87 +16690,16 @@ const StopsAdjacency_StopAdjacency = {
         return obj;
     },
     create(base) {
-        return StopsAdjacency_StopAdjacency.fromPartial(base !== null && base !== void 0 ? base : {});
+        return StopAdjacency.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
-        const message = createBaseStopsAdjacency_StopAdjacency();
+        const message = createBaseStopAdjacency();
         message.transfers = ((_a = object.transfers) === null || _a === void 0 ? void 0 : _a.map((e) => Transfer.fromPartial(e))) || [];
         message.routes = ((_b = object.routes) === null || _b === void 0 ? void 0 : _b.map((e) => e)) || [];
         return message;
     },
 };
-function createBaseStopsAdjacency_StopsEntry() {
-    return { key: 0, value: undefined };
-}
-const StopsAdjacency_StopsEntry = {
-    encode(message, writer = new BinaryWriter()) {
-        if (message.key !== 0) {
-            writer.uint32(8).uint32(message.key);
-        }
-        if (message.value !== undefined) {
-            StopsAdjacency_StopAdjacency.encode(message.value, writer.uint32(18).fork()).join();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseStopsAdjacency_StopsEntry();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 8) {
-                        break;
-                    }
-                    message.key = reader.uint32();
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.value = StopsAdjacency_StopAdjacency.decode(reader, reader.uint32());
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            key: isSet(object.key) ? globalThis.Number(object.key) : 0,
-            value: isSet(object.value) ? StopsAdjacency_StopAdjacency.fromJSON(object.value) : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.key !== 0) {
-            obj.key = Math.round(message.key);
-        }
-        if (message.value !== undefined) {
-            obj.value = StopsAdjacency_StopAdjacency.toJSON(message.value);
-        }
-        return obj;
-    },
-    create(base) {
-        return StopsAdjacency_StopsEntry.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseStopsAdjacency_StopsEntry();
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : 0;
-        message.value = (object.value !== undefined && object.value !== null)
-            ? StopsAdjacency_StopAdjacency.fromPartial(object.value)
-            : undefined;
-        return message;
-    },
-};
 function createBaseServiceRoute() {
     return { type: 0, name: "", routes: [] };
 }
@@ -17036,166 +16794,22 @@ const ServiceRoute = {
         return message;
     },
 };
-function createBaseServiceRoutesMap() {
-    return { routes: {} };
-}
-const ServiceRoutesMap = {
-    encode(message, writer = new BinaryWriter()) {
-        Object.entries(message.routes).forEach(([key, value]) => {
-            ServiceRoutesMap_RoutesEntry.encode({ key: key, value }, writer.uint32(10).fork()).join();
-        });
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseServiceRoutesMap();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 10) {
-                        break;
-                    }
-                    const entry1 = ServiceRoutesMap_RoutesEntry.decode(reader, reader.uint32());
-                    if (entry1.value !== undefined) {
-                        message.routes[entry1.key] = entry1.value;
-                    }
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            routes: isObject(object.routes)
-                ? Object.entries(object.routes).reduce((acc, [key, value]) => {
-                    acc[key] = ServiceRoute.fromJSON(value);
-                    return acc;
-                }, {})
-                : {},
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.routes) {
-            const entries = Object.entries(message.routes);
-            if (entries.length > 0) {
-                obj.routes = {};
-                entries.forEach(([k, v]) => {
-                    obj.routes[k] = ServiceRoute.toJSON(v);
-                });
-            }
-        }
-        return obj;
-    },
-    create(base) {
-        return ServiceRoutesMap.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseServiceRoutesMap();
-        message.routes = Object.entries((_a = object.routes) !== null && _a !== void 0 ? _a : {}).reduce((acc, [key, value]) => {
-            if (value !== undefined) {
-                acc[key] = ServiceRoute.fromPartial(value);
-            }
-            return acc;
-        }, {});
-        return message;
-    },
-};
-function createBaseServiceRoutesMap_RoutesEntry() {
-    return { key: "", value: undefined };
-}
-const ServiceRoutesMap_RoutesEntry = {
-    encode(message, writer = new BinaryWriter()) {
-        if (message.key !== "") {
-            writer.uint32(10).string(message.key);
-        }
-        if (message.value !== undefined) {
-            ServiceRoute.encode(message.value, writer.uint32(18).fork()).join();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseServiceRoutesMap_RoutesEntry();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.key = reader.string();
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.value = ServiceRoute.decode(reader, reader.uint32());
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            key: isSet(object.key) ? globalThis.String(object.key) : "",
-            value: isSet(object.value) ? ServiceRoute.fromJSON(object.value) : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.key !== "") {
-            obj.key = message.key;
-        }
-        if (message.value !== undefined) {
-            obj.value = ServiceRoute.toJSON(message.value);
-        }
-        return obj;
-    },
-    create(base) {
-        return ServiceRoutesMap_RoutesEntry.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseServiceRoutesMap_RoutesEntry();
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : "";
-        message.value = (object.value !== undefined && object.value !== null)
-            ? ServiceRoute.fromPartial(object.value)
-            : undefined;
-        return message;
-    },
-};
 function createBaseTimetable() {
-    return { version: "", stopsAdjacency: undefined, routesAdjacency: [], routes: undefined };
+    return { version: "", stopsAdjacency: [], routesAdjacency: [], serviceRoutes: [] };
 }
 const Timetable$1 = {
     encode(message, writer = new BinaryWriter()) {
         if (message.version !== "") {
             writer.uint32(10).string(message.version);
         }
-        if (message.stopsAdjacency !== undefined) {
-            StopsAdjacency.encode(message.stopsAdjacency, writer.uint32(18).fork()).join();
+        for (const v of message.stopsAdjacency) {
+            StopAdjacency.encode(v, writer.uint32(18).fork()).join();
         }
         for (const v of message.routesAdjacency) {
             Route$2.encode(v, writer.uint32(26).fork()).join();
         }
-        if (message.routes !== undefined) {
-            ServiceRoutesMap.encode(message.routes, writer.uint32(34).fork()).join();
+        for (const v of message.serviceRoutes) {
+            ServiceRoute.encode(v, writer.uint32(34).fork()).join();
         }
         return writer;
     },
@@ -17217,7 +16831,7 @@ const Timetable$1 = {
                     if (tag !== 18) {
                         break;
                     }
-                    message.stopsAdjacency = StopsAdjacency.decode(reader, reader.uint32());
+                    message.stopsAdjacency.push(StopAdjacency.decode(reader, reader.uint32()));
                     continue;
                 }
                 case 3: {
@@ -17231,7 +16845,7 @@ const Timetable$1 = {
                     if (tag !== 34) {
                         break;
                     }
-                    message.routes = ServiceRoutesMap.decode(reader, reader.uint32());
+                    message.serviceRoutes.push(ServiceRoute.decode(reader, reader.uint32()));
                     continue;
                 }
             }
@@ -17245,27 +16859,31 @@ const Timetable$1 = {
     fromJSON(object) {
         return {
             version: isSet(object.version) ? globalThis.String(object.version) : "",
-            stopsAdjacency: isSet(object.stopsAdjacency) ? StopsAdjacency.fromJSON(object.stopsAdjacency) : undefined,
+            stopsAdjacency: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.stopsAdjacency)
+                ? object.stopsAdjacency.map((e) => StopAdjacency.fromJSON(e))
+                : [],
             routesAdjacency: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.routesAdjacency)
                 ? object.routesAdjacency.map((e) => Route$2.fromJSON(e))
                 : [],
-            routes: isSet(object.routes) ? ServiceRoutesMap.fromJSON(object.routes) : undefined,
+            serviceRoutes: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.serviceRoutes)
+                ? object.serviceRoutes.map((e) => ServiceRoute.fromJSON(e))
+                : [],
         };
     },
     toJSON(message) {
-        var _a;
+        var _a, _b, _c;
         const obj = {};
         if (message.version !== "") {
             obj.version = message.version;
         }
-        if (message.stopsAdjacency !== undefined) {
-            obj.stopsAdjacency = StopsAdjacency.toJSON(message.stopsAdjacency);
+        if ((_a = message.stopsAdjacency) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.stopsAdjacency = message.stopsAdjacency.map((e) => StopAdjacency.toJSON(e));
         }
-        if ((_a = message.routesAdjacency) === null || _a === void 0 ? void 0 : _a.length) {
+        if ((_b = message.routesAdjacency) === null || _b === void 0 ? void 0 : _b.length) {
             obj.routesAdjacency = message.routesAdjacency.map((e) => Route$2.toJSON(e));
         }
-        if (message.routes !== undefined) {
-            obj.routes = ServiceRoutesMap.toJSON(message.routes);
+        if ((_c = message.serviceRoutes) === null || _c === void 0 ? void 0 : _c.length) {
+            obj.serviceRoutes = message.serviceRoutes.map((e) => ServiceRoute.toJSON(e));
         }
         return obj;
     },
@@ -17273,16 +16891,12 @@ const Timetable$1 = {
         return Timetable$1.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const message = createBaseTimetable();
         message.version = (_a = object.version) !== null && _a !== void 0 ? _a : "";
-        message.stopsAdjacency = (object.stopsAdjacency !== undefined && object.stopsAdjacency !== null)
-            ? StopsAdjacency.fromPartial(object.stopsAdjacency)
-            : undefined;
-        message.routesAdjacency = ((_b = object.routesAdjacency) === null || _b === void 0 ? void 0 : _b.map((e) => Route$2.fromPartial(e))) || [];
-        message.routes = (object.routes !== undefined && object.routes !== null)
-            ? ServiceRoutesMap.fromPartial(object.routes)
-            : undefined;
+        message.stopsAdjacency = ((_b = object.stopsAdjacency) === null || _b === void 0 ? void 0 : _b.map((e) => StopAdjacency.fromPartial(e))) || [];
+        message.routesAdjacency = ((_c = object.routesAdjacency) === null || _c === void 0 ? void 0 : _c.map((e) => Route$2.fromPartial(e))) || [];
+        message.serviceRoutes = ((_d = object.serviceRoutes) === null || _d === void 0 ? void 0 : _d.map((e) => ServiceRoute.fromPartial(e))) || [];
         return message;
     },
 };
@@ -17311,9 +16925,6 @@ function base64FromBytes(arr) {
         return globalThis.btoa(bin.join(""));
     }
 }
-function isObject(value) {
-    return typeof value === "object" && value !== null;
-}
 function isSet(value) {
     return value !== null && value !== undefined;
 }
@@ -17829,18 +17440,14 @@ const bytesToUint16Array = (bytes) => {
     return result;
 };
 const serializeStopsAdjacency = (stopsAdjacency) => {
-    const protoStopsAdjacency = {
-        stops: {},
-    };
-    stopsAdjacency.forEach((value, key) => {
-        protoStopsAdjacency.stops[key] = {
+    return stopsAdjacency.map((value) => {
+        return {
             transfers: value.transfers.map((transfer) => (Object.assign({ destination: transfer.destination, type: serializeTransferType(transfer.type) }, (transfer.minTransferTime !== undefined && {
                 minTransferTime: transfer.minTransferTime.toSeconds(),
             })))),
             routes: value.routes,
         };
     });
-    return protoStopsAdjacency;
 };
 const serializeRoutesAdjacency = (routesAdjacency) => {
     const protoRoutesAdjacency = [];
@@ -17855,31 +17462,24 @@ const serializeRoutesAdjacency = (routesAdjacency) => {
     });
     return protoRoutesAdjacency;
 };
-const serializeServiceRoutesMap = (serviceRoutesMap) => {
-    const protoServiceRoutesMap = {
-        routes: {},
-    };
-    serviceRoutesMap.forEach((value, key) => {
-        protoServiceRoutesMap.routes[key] = {
+const serializeServiceRoutesMap = (serviceRoutes) => {
+    return serviceRoutes.map((value) => {
+        return {
             type: serializeRouteType(value.type),
             name: value.name,
             routes: value.routes,
         };
     });
-    return protoServiceRoutesMap;
 };
 const deserializeStopsAdjacency = (protoStopsAdjacency) => {
-    const stopsAdjacency = new Map();
-    Object.entries(protoStopsAdjacency.stops).forEach(([keyStr, value]) => {
-        const key = parseInt(keyStr, 10);
-        stopsAdjacency.set(key, {
+    return protoStopsAdjacency.map((value) => {
+        return {
             transfers: value.transfers.map((transfer) => (Object.assign({ destination: transfer.destination, type: parseTransferType(transfer.type) }, (transfer.minTransferTime !== undefined && {
                 minTransferTime: Duration.fromSeconds(transfer.minTransferTime),
             })))),
             routes: value.routes,
-        });
+        };
     });
-    return stopsAdjacency;
 };
 const deserializeRoutesAdjacency = (protoRoutesAdjacency) => {
     const routesAdjacency = [];
@@ -17889,16 +17489,14 @@ const deserializeRoutesAdjacency = (protoRoutesAdjacency) => {
     });
     return routesAdjacency;
 };
-const deserializeServiceRoutesMap = (protoServiceRoutesMap) => {
-    const serviceRoutesMap = new Map();
-    Object.entries(protoServiceRoutesMap.routes).forEach(([key, value]) => {
-        serviceRoutesMap.set(key, {
+const deserializeServiceRoutesMap = (protoServiceRoutes) => {
+    return protoServiceRoutes.map((value) => {
+        return {
             type: parseRouteType(value.type),
             name: value.name,
             routes: value.routes,
-        });
+        };
     });
-    return serviceRoutesMap;
 };
 const parseTransferType = (type) => {
     switch (type) {
@@ -17990,7 +17588,7 @@ const ALL_TRANSPORT_MODES = new Set([
     'TROLLEYBUS',
     'MONORAIL',
 ]);
-const CURRENT_VERSION = '0.0.5';
+const CURRENT_VERSION = '0.0.6';
 /**
  * The internal transit timetable format.
  */
@@ -17998,7 +17596,15 @@ class Timetable {
     constructor(stopsAdjacency, routesAdjacency, routes) {
         this.stopsAdjacency = stopsAdjacency;
         this.routesAdjacency = routesAdjacency;
-        this.routes = routes;
+        this.serviceRoutes = routes;
+        this.activeStops = new Set();
+        for (let i = 0; i < stopsAdjacency.length; i++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const stop = stopsAdjacency[i];
+            if (stop.routes.length > 0 || stop.transfers.length > 0) {
+                this.activeStops.add(i);
+            }
+        }
     }
     /**
      * Serializes the Timetable into a binary array.
@@ -18010,7 +17616,7 @@ class Timetable {
             version: CURRENT_VERSION,
             stopsAdjacency: serializeStopsAdjacency(this.stopsAdjacency),
             routesAdjacency: serializeRoutesAdjacency(this.routesAdjacency),
-            routes: serializeServiceRoutesMap(this.routes),
+            serviceRoutes: serializeServiceRoutesMap(this.serviceRoutes),
         };
         const writer = new BinaryWriter();
         Timetable$1.encode(protoTimetable, writer);
@@ -18028,11 +17634,18 @@ class Timetable {
         if (protoTimetable.version !== CURRENT_VERSION) {
             throw new Error(`Unsupported timetable version ${protoTimetable.version}`);
         }
-        return new Timetable(
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        deserializeStopsAdjacency(protoTimetable.stopsAdjacency), deserializeRoutesAdjacency(protoTimetable.routesAdjacency), 
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        deserializeServiceRoutesMap(protoTimetable.routes));
+        return new Timetable(deserializeStopsAdjacency(protoTimetable.stopsAdjacency), deserializeRoutesAdjacency(protoTimetable.routesAdjacency), deserializeServiceRoutesMap(protoTimetable.serviceRoutes));
+    }
+    /**
+     * Checks if the given stop is active on the timetable.
+     * An active stop is a stop reached by a route that is active on the timetable
+     * or by a transfer reachable from an active route.
+     *
+     * @param stopId - The ID of the stop to check.
+     * @returns True if the stop is active, false otherwise.
+     */
+    isActive(stopId) {
+        return this.activeStops.has(stopId);
     }
     /**
      * Retrieves the route associated with the given route ID.
@@ -18052,7 +17665,7 @@ class Timetable {
      */
     getTransfers(stopId) {
         var _a, _b;
-        return (_b = (_a = this.stopsAdjacency.get(stopId)) === null || _a === void 0 ? void 0 : _a.transfers) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.stopsAdjacency[stopId]) === null || _a === void 0 ? void 0 : _a.transfers) !== null && _b !== void 0 ? _b : [];
     }
     /**
      * Retrieves the service route associated with the given route.
@@ -18063,7 +17676,7 @@ class Timetable {
      * @returns The service route corresponding to the provided route.
      */
     getServiceRouteInfo(route) {
-        const serviceRoute = this.routes.get(route.serviceRoute());
+        const serviceRoute = this.serviceRoutes[route.serviceRoute()];
         if (!serviceRoute) {
             throw new Error(`Service route not found for route ID: ${route.serviceRoute()}`);
         }
@@ -18078,7 +17691,7 @@ class Timetable {
      * @returns An array of routes passing through the specified stop.
      */
     routesPassingThrough(stopId) {
-        const stopData = this.stopsAdjacency.get(stopId);
+        const stopData = this.stopsAdjacency[stopId];
         if (!stopData) {
             return [];
         }
@@ -20109,7 +19722,6 @@ const parseRoutes = (routesStream_1, ...args_1) => __awaiter(void 0, [routesStre
             routes.set(line.route_id, {
                 name: line.route_short_name,
                 type: routeType,
-                routes: [],
             });
         }
     }
@@ -20122,6 +19734,29 @@ const parseRoutes = (routesStream_1, ...args_1) => __awaiter(void 0, [routesStre
     }
     return routes;
 });
+/**
+ * Creates an array of ServiceRoute objects by combining GTFS route data with service route mappings.
+ *
+ * @param gtfsRoutesMap A map containing GTFS route information indexed by route ID
+ * @param serviceRoutesMap A map linking GTFS route IDs to service route IDs
+ * @returns An array of ServiceRoute objects with route information
+ */
+const indexRoutes = (gtfsRoutesMap, serviceRoutesMap) => {
+    const serviceRoutes = new Array(serviceRoutesMap.size);
+    for (const [gtfsRouteId, serviceRouteId] of serviceRoutesMap) {
+        const route = gtfsRoutesMap.get(gtfsRouteId);
+        if (route === undefined) {
+            log.warn(`Route ${gtfsRouteId} not found.`);
+            continue;
+        }
+        serviceRoutes[serviceRouteId] = {
+            name: route.name,
+            type: route.type,
+            routes: [],
+        };
+    }
+    return serviceRoutes;
+};
 
 const toGtfsDate = (date) => {
     return parseInt(date.toFormat('yyyyLLdd'));
@@ -20289,37 +19924,6 @@ const parseStops = (stopsStream) => __awaiter(void 0, void 0, void 0, function*
     }
     return parsedStops;
 });
-/**
- * Builds the final stop map indexed by internal IDs.
- * Excludes all stops that do not have at least one valid stopId
- * as a child, a parent, or being valid itself.
- *
- * @param parsedStops - The map of parsed stops.
- * @param validStops - A set of valid stop IDs.
- * @returns A map of stops indexed by internal IDs.
- */
-const indexStops = (parsedStops, validStops) => {
-    const stops = new Map();
-    for (const [, stop] of parsedStops) {
-        if (!validStops ||
-            validStops.has(stop.id) ||
-            (stop.parent && validStops.has(stop.parent)) ||
-            stop.children.some((childId) => validStops.has(childId))) {
-            stops.set(stop.id, {
-                id: stop.id,
-                sourceStopId: stop.sourceStopId,
-                name: stop.name,
-                lat: stop.lat,
-                lon: stop.lon,
-                locationType: stop.locationType,
-                platform: stop.platform,
-                children: stop.children.filter((childId) => !validStops || validStops.has(childId)),
-                parent: stop.parent,
-            });
-        }
-    }
-    return stops;
-};
 const parseGtfsLocationType = (gtfsLocationType) => {
     switch (gtfsLocationType) {
         case 0:
@@ -20496,7 +20100,7 @@ const finalizeRouteFromBuilder = (builder) => {
  * @param serviceRoutes A mapping of route IDs to route details.
  * @returns A mapping of trip IDs to corresponding route IDs.
  */
-const parseTrips = (tripsStream, serviceIds, serviceRoutes) => __awaiter(void 0, void 0, void 0, function* () {
+const parseTrips = (tripsStream, serviceIds, validGtfsRoutes) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, e_1, _b, _c;
     const trips = new Map();
     try {
@@ -20509,7 +20113,7 @@ const parseTrips = (tripsStream, serviceIds, serviceRoutes) => __awaiter(void 0,
                 // The trip doesn't correspond to an active service
                 continue;
             }
-            if (!serviceRoutes.get(line.route_id)) {
+            if (!validGtfsRoutes.has(line.route_id)) {
                 // The trip doesn't correspond to a supported route
                 continue;
             }
@@ -20525,29 +20129,32 @@ const parseTrips = (tripsStream, serviceIds, serviceRoutes) => __awaiter(void 0,
     }
     return trips;
 });
-const buildStopsAdjacencyStructure = (validStops, serviceRoutes, routes, transfersMap) => {
-    const stopsAdjacency = new Map();
+const buildStopsAdjacencyStructure = (serviceRoutes, routes, transfersMap, nbStops, activeStops) => {
+    // TODO somehow works when it's a map
+    const stopsAdjacency = new Array(nbStops);
+    for (let i = 0; i < nbStops; i++) {
+        stopsAdjacency[i] = { routes: [], transfers: [] };
+    }
     routes.forEach((route, index) => {
-        var _a;
         for (const stop of route.stopsIterator()) {
-            if (!stopsAdjacency.get(stop) && validStops.has(stop)) {
-                stopsAdjacency.set(stop, { routes: [], transfers: [] });
+            if (activeStops.has(stop)) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                stopsAdjacency[stop].routes.push(index);
             }
-            (_a = stopsAdjacency.get(stop)) === null || _a === void 0 ? void 0 : _a.routes.push(index);
         }
-        const serviceRoute = serviceRoutes.get(route.serviceRoute());
-        if (!serviceRoute) {
+        const serviceRoute = serviceRoutes[route.serviceRoute()];
+        if (serviceRoute === undefined) {
             throw new Error(`Service route ${route.serviceRoute()} not found for route ${index}.`);
         }
         serviceRoute.routes.push(index);
     });
     for (const [stop, transfers] of transfersMap) {
-        const s = stopsAdjacency.get(stop);
-        if (s) {
-            for (const transfer of transfers) {
-                if (validStops.has(transfer.destination)) {
-                    s.transfers.push(transfer);
-                }
+        for (const transfer of transfers) {
+            if (activeStops.has(stop) || activeStops.has(transfer.destination)) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                stopsAdjacency[stop].transfers.push(transfer);
+                activeStops.add(transfer.destination);
+                activeStops.add(stop);
             }
         }
     }
@@ -20558,18 +20165,18 @@ const buildStopsAdjacencyStructure = (validStops, serviceRoutes, routes, transfe
  *
  * @param stopTimesStream The readable stream containing the stop times data.
  * @param stopsMap A map of parsed stops from the GTFS feed.
- * @param validTripIds A map of valid trip IDs to corresponding route IDs.
- * @param validStopIds A set of valid stop IDs.
+ * @param activeTripIds A map of valid trip IDs to corresponding route IDs.
+ * @param activeStopIds A set of valid stop IDs.
  * @returns A mapping of route IDs to route details. The routes returned correspond to the set of trips from GTFS that share the same stop list.
  */
-const parseStopTimes = (stopTimesStream, stopsMap, validTripIds, validStopIds) => __awaiter(void 0, void 0, void 0, function* () {
+const parseStopTimes = (stopTimesStream, stopsMap, activeTripIds, activeStopIds) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, e_2, _b, _c;
     var _d, _e;
     /**
      * Adds a trip to the appropriate route builder
      */
     const addTrip = (currentTripId) => {
-        const gtfsRouteId = validTripIds.get(currentTripId);
+        const gtfsRouteId = activeTripIds.get(currentTripId);
         if (!gtfsRouteId || stops.length === 0) {
             stops = [];
             arrivalTimes = [];
@@ -20578,7 +20185,6 @@ const parseStopTimes = (stopTimesStream, stopsMap, validTripIds, validStopIds) =
             dropOffTypes = [];
             return;
         }
-        const routeId = `${gtfsRouteId}_${hashIds(stops)}`;
         const firstDeparture = departureTimes[0];
         if (firstDeparture === undefined) {
             console.warn(`Empty trip ${currentTripId}`);
@@ -20589,24 +20195,31 @@ const parseStopTimes = (stopTimesStream, stopsMap, validTripIds, validStopIds) =
             dropOffTypes = [];
             return;
         }
+        const routeId = `${gtfsRouteId}_${hashIds(stops)}`;
         let routeBuilder = routeBuilders.get(routeId);
         if (!routeBuilder) {
+            let serviceRouteId = serviceRoutesMap.get(gtfsRouteId);
+            if (serviceRouteId === undefined) {
+                serviceRouteId = currentServiceRouteId;
+                serviceRoutesMap.set(gtfsRouteId, serviceRouteId);
+                currentServiceRouteId = currentServiceRouteId + 1;
+            }
             routeBuilder = {
-                serviceRouteId: gtfsRouteId,
-                stops: [...stops],
+                serviceRouteId,
+                stops,
                 trips: [],
             };
             routeBuilders.set(routeId, routeBuilder);
             for (const stop of stops) {
-                validStopIds.add(stop);
+                activeStopIds.add(stop);
             }
         }
         routeBuilder.trips.push({
             firstDeparture,
-            arrivalTimes: [...arrivalTimes],
-            departureTimes: [...departureTimes],
-            pickUpTypes: [...pickUpTypes],
-            dropOffTypes: [...dropOffTypes],
+            arrivalTimes: arrivalTimes,
+            departureTimes: departureTimes,
+            pickUpTypes: pickUpTypes,
+            dropOffTypes: dropOffTypes,
         });
         stops = [];
         arrivalTimes = [];
@@ -20615,6 +20228,9 @@ const parseStopTimes = (stopTimesStream, stopsMap, validTripIds, validStopIds) =
         dropOffTypes = [];
     };
     const routeBuilders = new Map();
+    const serviceRoutesMap = new Map();
+    // incrementally generate service route IDs
+    let currentServiceRouteId = 0;
     let previousSeq = 0;
     let stops = [];
     let arrivalTimes = [];
@@ -20677,7 +20293,7 @@ const parseStopTimes = (stopTimesStream, stopsMap, validTripIds, validStopIds) =
         const routeData = finalizeRouteFromBuilder(routeBuilder);
         routesAdjacency.push(new Route$1(routeData.stopTimes, routeData.pickUpDropOffTypes, routeData.stops, routeData.serviceRouteId));
     }
-    return routesAdjacency;
+    return { routes: routesAdjacency, serviceRoutesMap };
 });
 const parsePickupDropOffType = (gtfsType) => {
     switch (gtfsType) {
@@ -20711,18 +20327,16 @@ class GtfsParser {
      * Parses a GTFS feed to extract all the data relevant to a given day in a transit-planner friendly format.
      *
      * @param date The active date.
-     * @param gtfsPath A path to the zipped GTFS feed.
-     * @param gtfsProfile The GTFS profile configuration.
-     * @returns An object containing the timetable and stops map.
+     * @returns The parsed timetable.
      */
-    parse(date) {
+    parseTimetable(date) {
         return __awaiter(this, void 0, void 0, function* () {
             log.setLevel('INFO');
             const zip = new StreamZip.async({ file: this.path });
             const entries = yield zip.entries();
             const datetime = DateTime.fromJSDate(date);
-            const validServiceIds = new Set();
-            const validStopIds = new Set();
+            const activeServiceIds = new Set();
+            const activeStopIds = new Set();
             log.info(`Parsing ${STOPS_FILE}`);
             const stopsStart = performance.now();
             const stopsStream = yield zip.stream(STOPS_FILE);
@@ -20733,17 +20347,17 @@ class GtfsParser {
                 log.info(`Parsing ${CALENDAR_FILE}`);
                 const calendarStart = performance.now();
                 const calendarStream = yield zip.stream(CALENDAR_FILE);
-                yield parseCalendar(calendarStream, validServiceIds, datetime);
+                yield parseCalendar(calendarStream, activeServiceIds, datetime);
                 const calendarEnd = performance.now();
-                log.info(`${validServiceIds.size} valid services. (${(calendarEnd - calendarStart).toFixed(2)}ms)`);
+                log.info(`${activeServiceIds.size} valid services. (${(calendarEnd - calendarStart).toFixed(2)}ms)`);
             }
             if (entries[CALENDAR_DATES_FILE]) {
                 log.info(`Parsing ${CALENDAR_DATES_FILE}`);
                 const calendarDatesStart = performance.now();
                 const calendarDatesStream = yield zip.stream(CALENDAR_DATES_FILE);
-                yield parseCalendarDates(calendarDatesStream, validServiceIds, datetime);
+                yield parseCalendarDates(calendarDatesStream, activeServiceIds, datetime);
                 const calendarDatesEnd = performance.now();
-                log.info(`${validServiceIds.size} valid services. (${(calendarDatesEnd - calendarDatesStart).toFixed(2)}ms)`);
+                log.info(`${activeServiceIds.size} valid services. (${(calendarDatesEnd - calendarDatesStart).toFixed(2)}ms)`);
             }
             log.info(`Parsing ${ROUTES_FILE}`);
             const routesStart = performance.now();
@@ -20754,7 +20368,7 @@ class GtfsParser {
             log.info(`Parsing ${TRIPS_FILE}`);
             const tripsStart = performance.now();
             const tripsStream = yield zip.stream(TRIPS_FILE);
-            const trips = yield parseTrips(tripsStream, validServiceIds, validGtfsRoutes);
+            const trips = yield parseTrips(tripsStream, activeServiceIds, validGtfsRoutes);
             const tripsEnd = performance.now();
             log.info(`${trips.size} valid trips. (${(tripsEnd - tripsStart).toFixed(2)}ms)`);
             let transfers = new Map();
@@ -20769,32 +20383,26 @@ class GtfsParser {
             log.info(`Parsing ${STOP_TIMES_FILE}`);
             const stopTimesStart = performance.now();
             const stopTimesStream = yield zip.stream(STOP_TIMES_FILE);
-            const routesAdjacency = yield parseStopTimes(stopTimesStream, parsedStops, trips, validStopIds);
-            const stopsAdjacency = buildStopsAdjacencyStructure(validStopIds, validGtfsRoutes, routesAdjacency, transfers);
+            const { routes, serviceRoutesMap } = yield parseStopTimes(stopTimesStream, parsedStops, trips, activeStopIds);
+            const serviceRoutes = indexRoutes(validGtfsRoutes, serviceRoutesMap);
             const stopTimesEnd = performance.now();
-            log.info(`${routesAdjacency.length} valid unique routes. (${(stopTimesEnd - stopTimesStart).toFixed(2)}ms)`);
-            log.info(`Removing unused stops.`);
-            const indexStopsStart = performance.now();
-            const stops = indexStops(parsedStops, validStopIds);
-            const indexStopsEnd = performance.now();
-            log.info(`${stops.size} used stop stops, ${parsedStops.size - stops.size} unused. (${(indexStopsEnd - indexStopsStart).toFixed(2)}ms)`);
+            log.info(`${routes.length} valid unique routes. (${(stopTimesEnd - stopTimesStart).toFixed(2)}ms)`);
+            log.info('Building stops adjacency structure');
+            const stopsAdjacencyStart = performance.now();
+            const stopsAdjacency = buildStopsAdjacencyStructure(serviceRoutes, routes, transfers, parsedStops.size, activeStopIds);
+            const stopsAdjacencyEnd = performance.now();
+            log.info(`${stopsAdjacency.length} valid stops in the structure. (${(stopsAdjacencyEnd - stopsAdjacencyStart).toFixed(2)}ms)`);
             yield zip.close();
-            const timetable = new Timetable(stopsAdjacency, routesAdjacency, validGtfsRoutes);
-            log.info(`Building stops index.`);
-            const stopsIndexStart = performance.now();
-            const stopsIndex = new StopsIndex(stops);
-            const stopsIndexEnd = performance.now();
-            log.info(`Stops index built. (${(stopsIndexEnd - stopsIndexStart).toFixed(2)}ms)`);
+            const timetable = new Timetable(stopsAdjacency, routes, serviceRoutes);
             log.info('Parsing complete.');
-            return { timetable, stopsIndex };
+            return timetable;
         });
     }
     /**
      * Parses a GTFS feed to extract all stops.
      *
-     * @param gtfsPath A path the zipped GTFS feed.
-     * @param gtfsProfile The GTFS profile configuration.
-     * @returns An object containing the timetable and stops map.
+     * @param activeStops The set of active stop IDs to include in the index.
+     * @returns An index of stops.
      */
     parseStops() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -20802,11 +20410,11 @@ class GtfsParser {
             log.info(`Parsing ${STOPS_FILE}`);
             const stopsStart = performance.now();
             const stopsStream = yield zip.stream(STOPS_FILE);
-            const stops = indexStops(yield parseStops(stopsStream));
+            const stops = yield parseStops(stopsStream);
             const stopsEnd = performance.now();
             log.info(`${stops.size} parsed stops. (${(stopsEnd - stopsStart).toFixed(2)}ms)`);
             yield zip.close();
-            return new StopsIndex(stops);
+            return new StopsIndex(Array.from(stops.values()));
         });
     }
 }
@@ -21316,6 +20924,8 @@ class Router {
             for (const [route, hopOnStop] of reachableRoutes.entries()) {
                 let currentTrip = undefined;
                 for (const currentStop of route.stopsIterator(hopOnStop)) {
+                    // If we're currently on a trip,
+                    // check if arrival at the stop improves the earliest arrival time
                     if (currentTrip !== undefined) {
                         const currentArrivalTime = route.arrivalAt(currentStop, currentTrip.tripIndex);
                         const currentDropOffType = route.dropOffTypeAt(currentStop, currentTrip.tripIndex);
@@ -21344,7 +20954,7 @@ class Router {
                             markedStops.add(currentStop);
                         }
                     }
-                    // check if we can catch a previous trip at the current stop
+                    // check if we can board an earlier trip at the current stop
                     // if there was no current trip, find the first one reachable
                     const earliestArrivalOnPreviousRound = (_c = arrivalsAtPreviousRound.get(currentStop)) === null || _c === void 0 ? void 0 : _c.arrival;
                     if (earliestArrivalOnPreviousRound !== undefined &&
@@ -21669,9 +21279,10 @@ program
         log.setDefaultLevel(log.levels.ERROR);
     }
     const parser = new GtfsParser(gtfsPath, profiles[options.profileName]);
-    const { timetable, stopsIndex } = yield parser.parse(new Date(options.date));
-    fs.writeFileSync(options.timetableOutputPath, timetable.serialize());
+    const stopsIndex = yield parser.parseStops();
     fs.writeFileSync(options.stopsOutputPath, stopsIndex.serialize());
+    const timetable = yield parser.parseTimetable(new Date(options.date));
+    fs.writeFileSync(options.timetableOutputPath, timetable.serialize());
 }));
 program
     .command('parse-stops')