Merge pull request #96 from linkedconnections/development

v1.4.2
linkedconnections · Jan 4, 2025 · 0459cf0 · 0459cf0
2 parents 92fb4b0 + 1d7c420
commit 0459cf0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 46 deletions.
diff --git a/lib/manager/dataset_manager.js b/lib/manager/dataset_manager.js
@@ -216,46 +216,45 @@ export class DatasetManager {
                 const connsPath = `${this.storage}/linked_connections/${companyName}`;
                 logger.info(`Creating ${companyName} Linked Connections...`);
 
-                converter.resultStream(uncompressed_feed, connsPath, async rawConns => {
-
-                    logger.info(`Sorting and fragmenting ${companyName} Linked Connections...`);
-                    // Create folder for Linked Connection fragments
-                    fs.mkdirSync(`${this.storage}/linked_pages/${companyName}/${file_name}`);
-
-                    // Proceed to sort and fragment the Linked Connections graph
-                    const sorted = await this.sortLCByDepartureTime(rawConns);
-
-                    sorted.pipe(JsonLParser.parser())
-                        .pipe(new PageWriterStream(`${this.storage}/linked_pages/${companyName}/${file_name}`,
-                            dataset.fragmentSize || 300))
-                        .on('finish', async () => {
-                            const t1 = (new Date().getTime() - t0) / 1000;
-                            logger.info(`Dataset conversion for ${companyName} completed successfully (took ${t1} seconds)`);
-
-                            // Update Catalog, Stops and Routes
-                            const [stops, routes] = await Promise.all([
-                                new Stops(uncompressed_feed).createStopList(companyName),
-                                new Routes(uncompressed_feed).createRouteList(companyName),
-                            ]);
-                            await Promise.all([
-                                writeFile(`${this.storage}/stops/${companyName}/stops.json`, JSON.stringify(stops), 'utf8'),
-                                writeFile(`${this.storage}/routes/${companyName}/routes.json`, JSON.stringify(routes), 'utf8'),
-                            ]);
-
-                            const catalog = await new Catalog().createCatalog(companyName);
-                            await writeFile(`${this.storage}/catalog/${companyName}/catalog.json`, JSON.stringify(catalog), 'utf8'),
-
-                                logger.info('DCAT catalog updated correctly');
-                            logger.info(`Stop dataset for ${companyName} updated`);
-                            logger.info(`Route dataset for ${companyName} updated`);
-
-                            // Clean up
-                            await del([
-                                lockPath,
-                                uncompressed_feed,
-                            ], { force: true });
-                        });
-                });
+                const rawConns = await converter.convert(uncompressed_feed, connsPath);
+
+                logger.info(`Sorting and fragmenting ${companyName} Linked Connections...`);
+                // Create folder for Linked Connection fragments
+                fs.mkdirSync(`${this.storage}/linked_pages/${companyName}/${file_name}`);
+
+                // Proceed to sort and fragment the Linked Connections graph
+                const sorted = await this.sortLCByDepartureTime(rawConns);
+
+                sorted.pipe(JsonLParser.parser())
+                    .pipe(new PageWriterStream(`${this.storage}/linked_pages/${companyName}/${file_name}`,
+                        dataset.fragmentSize || 300))
+                    .on('finish', async () => {
+                        const t1 = (new Date().getTime() - t0) / 1000;
+                        logger.info(`Dataset conversion for ${companyName} completed successfully (took ${t1} seconds)`);
+
+                        // Update Catalog, Stops and Routes
+                        const [stops, routes] = await Promise.all([
+                            new Stops(uncompressed_feed).createStopList(companyName),
+                            new Routes(uncompressed_feed).createRouteList(companyName),
+                        ]);
+                        await Promise.all([
+                            writeFile(`${this.storage}/stops/${companyName}/stops.json`, JSON.stringify(stops), 'utf8'),
+                            writeFile(`${this.storage}/routes/${companyName}/routes.json`, JSON.stringify(routes), 'utf8'),
+                        ]);
+
+                        const catalog = await new Catalog().createCatalog(companyName);
+                        await writeFile(`${this.storage}/catalog/${companyName}/catalog.json`, JSON.stringify(catalog), 'utf8'),
+
+                            logger.info('DCAT catalog updated correctly');
+                        logger.info(`Stop dataset for ${companyName} updated`);
+                        logger.info(`Route dataset for ${companyName} updated`);
+
+                        // Clean up
+                        await del([
+                            lockPath,
+                            uncompressed_feed,
+                        ], { force: true });
+                    });
             } else {
                 logger.warn(companyName + " dataset was already downloaded");
             }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linked-connections-server",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "author": "Julian Rojas",
   "license": "MIT",
   "type": "module",