text-to-map 1.1.4 → 1.1.6

package/dist/db/db.d.ts

@@ -21,13 +21,12 @@ export declare const nonEmptyOrNull: (value: string) => string | null;
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).
  */
-export declare const insertMultipleRows: (rows: string[][], table: string, columnNames: string[], preventDuplicatesByFirstColumn?: boolean) => Promise<number>;
+export declare const insertMultipleRows: (rows: string[][], table: string, columnNames: string[], preventDuplicates?: boolean, keyColumns?: string[]) => Promise<number>;
 /**
  * Insert a single row and return the autoincremented ID.
  */
 export declare const insertAutoincrementRow: (row: any[], table: string, columnNames: string[]) => Promise<number | null>;
 export declare const deleteMultipleRowsKnex: (keys: string[], table: string, keyColumnName: string) => Promise<void>;
-export declare const clearDuplicates: (rows: string[][], table: string, columnNames: string[]) => Promise<string[][]>;
 export declare const generatePlaceholders: (n: number) => string;
 export declare const generate2DPlaceholders: (inner: number, outer: number) => string;
 export declare const extractKeyValuesPairs: (array: string[][], keyIndex: number, valuesIndices: number[]) => string[][];

package/dist/db/db.js

@@ -39,6 +39,12 @@ export const getKnexDb = (config = {}) => {
                 connection: {
                     filename: _knexDbConfig.filePath,
                 },
+                pool: {
+                    afterCreate: (db, done) => {
+                        db.pragma("journal_mode = WAL;");
+                        done(false, done);
+                    },
+                },
                 useNullAsDefault: true,
                 debug: _knexDbConfig.verbose,
             });
@@ -109,19 +115,16 @@ export const nonEmptyOrNull = (value) => {
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).
  */
-export const insertMultipleRows = (rows, table, columnNames, preventDuplicatesByFirstColumn = true) => __awaiter(void 0, void 0, void 0, function* () {
+export const insertMultipleRows = (rows, table, columnNames, preventDuplicates = true, keyColumns = []) => __awaiter(void 0, void 0, void 0, function* () {
     if (rows.length === 0) {
         return 0;
     }
-    // if (preventDuplicatesByFirstColumn) {
-    //   rows = await clearDuplicates(rows, table, columnNames);
-    //   if (rows.length === 0) {
-    //     return 0;
-    //   }
-    // }
     const insertPlaceholders = generate2DPlaceholders(columnNames.length, rows.length);
-    const onConfict = preventDuplicatesByFirstColumn
-        ? `ON CONFLICT (${columnNames[0]}) DO NOTHING`
+    if (preventDuplicates && keyColumns.length === 0) {
+        keyColumns = [columnNames[0]];
+    }
+    const onConfict = preventDuplicates
+        ? `ON CONFLICT (${keyColumns.join(", ")}) DO NOTHING`
         : "";
     yield getKnexDb().raw(`INSERT INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
     return rows.length;
@@ -143,14 +146,6 @@ export const deleteMultipleRowsKnex = (keys, table, keyColumnName) => __awaiter(
     }
     yield getKnexDb().from(table).whereIn(keyColumnName, keys).del();
 });
-export const clearDuplicates = (rows, table, columnNames) => __awaiter(void 0, void 0, void 0, function* () {
-    const existing = yield getKnexDb()
-        .select(columnNames[0])
-        .from(table)
-        .whereIn(columnNames[0], rows.map((row) => row[0]));
-    const keys = existing.map((row) => row[columnNames[0]].toString());
-    return rows.filter((row) => !keys.includes(row[0]));
-});
 const generateRepetitiveString = (value, glue, n) => {
     return new Array(n).fill(value).join(glue);
 };

package/dist/db/founders.js

@@ -15,7 +15,7 @@ import { MunicipalityType, } from "./types";
 const cityTypeCode = 261;
 const cityDistrictTypeCode = 263;
 export const insertFounders = (founders) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b, _c;
     let insertedFounders = 0;
     const schoolFounderConnectionData = [];
     for (const founder of founders) {
@@ -63,8 +63,9 @@ export const insertFounders = (founders) => __awaiter(void 0, void 0, void 0, fu
             name: sanitizeMunicipalityName(founder.name),
             ico: founder.ico,
         });
+        let founderId = (_c = (_b = existing[0]) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null;
         if (existing.length === 0) {
-            const founderId = yield insertAutoincrementRow([
+            founderId = yield insertAutoincrementRow([
                 sanitizeMunicipalityName(founder.name),
                 sanitizeMunicipalityName(extractedMunicipalityName),
                 founder.ico,
@@ -80,12 +81,12 @@ export const insertFounders = (founders) => __awaiter(void 0, void 0, void 0, fu
                 "city_district_code",
             ]);
             insertedFounders++;
-            founder.schools.forEach((school) => {
-                schoolFounderConnectionData.push([school.izo, founderId]);
-            });
         }
+        founder.schools.forEach((school) => {
+            schoolFounderConnectionData.push([school.izo, founderId]);
+        });
     }
-    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"]);
+    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"], true, ["school_izo", "founder_id"]);
     return insertedFounders + insertedConnections;
 });
 const getCityOfSchool = (izo) => __awaiter(void 0, void 0, void 0, function* () {
@@ -174,14 +175,14 @@ const fixFounderProblems = (founder, municipalityCode, differingSchools, extract
     }
 });
 const getCityCodeByDistrictCode = (districtCode) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
+    var _d;
     const result = yield getKnexDb()
         .first("city.code")
         .from("city_district")
         .join("city", "city_district.city_code", "city.code")
         .where("city_district.code", districtCode)
         .limit(1);
-    return (_b = result === null || result === void 0 ? void 0 : result.code) !== null && _b !== void 0 ? _b : null;
+    return (_d = result === null || result === void 0 ? void 0 : result.code) !== null && _d !== void 0 ? _d : null;
 });
 const findMunicipalitiesAndPositionsByNameAndType = (name, type) => __awaiter(void 0, void 0, void 0, function* () {
     const knex = getKnexDb();

package/dist/db/migrations/20230704125715_initial.js

@@ -126,6 +126,7 @@ export function up(knex) {
                 .references("id")
                 .inTable("founder")
                 .notNullable();
+            table_13.unique(["school_izo", "founder_id"]);
         });
         yield knex.schema.createTable("address_point", function (table) {
             table.increments("id");

package/dist/db/schools.js

@@ -38,7 +38,7 @@ export const insertSchools = (schools) => __awaiter(void 0, void 0, void 0, func
     // plus filter out duplicate locations (same address id + izo)
     for (const location of locations) {
         try {
-            insertedLocations += yield insertMultipleRows([location], "school_location", ["school_izo", "address_point_id"], false);
+            insertedLocations += yield insertMultipleRows([location], "school_location", ["school_izo", "address_point_id"], true, ["school_izo", "address_point_id"]);
         }
         catch (error) {
             console.log(`Cannot add location with RUIAN code ${location[1]} (school IZO = ${location[0]}): code does not exist.`);

package/dist/open-data-sync/schools.d.ts

@@ -1,3 +1,3 @@
 import { OpenDataSyncOptionsPartial } from "../utils/helpers";
-export declare const downloadAndImportSchools: (options: OpenDataSyncOptionsPartial, saveFoundersToCsv?: boolean, saveSchoolsWithoutRuianToCsv?: boolean) => Promise<void>;
+export declare const downloadAndImportSchools: (options?: OpenDataSyncOptionsPartial, saveFoundersToCsv?: boolean, saveSchoolsWithoutRuianToCsv?: boolean) => Promise<void>;
 export declare const deleteSchoolsXmlFile: (options?: OpenDataSyncOptionsPartial) => void;

package/dist/open-data-sync/schools.js

@@ -299,7 +299,7 @@ const importDataToDb = (options, saveFoundersToCsv = false, saveSchoolsWithoutRu
 const getXmlFilePath = (options) => {
     return join(options.tmpDir, options.schoolsXmlFileName);
 };
-export const downloadAndImportSchools = (options, saveFoundersToCsv = false, saveSchoolsWithoutRuianToCsv = false) => __awaiter(void 0, void 0, void 0, function* () {
+export const downloadAndImportSchools = (options = {}, saveFoundersToCsv = false, saveSchoolsWithoutRuianToCsv = false) => __awaiter(void 0, void 0, void 0, function* () {
     yield runSyncPart(SyncPart.Schools, [SyncPart.AddressPoints], () => __awaiter(void 0, void 0, void 0, function* () {
         const runOptions = prepareOptions(options);
         yield downloadXml(runOptions);

package/dist/open-data-sync/streets.d.ts

@@ -1,2 +1,2 @@
 import { OpenDataSyncOptionsPartial } from "../utils/helpers";
-export declare const downloadAndImportStreets: (options: OpenDataSyncOptionsPartial) => Promise<void>;
+export declare const downloadAndImportStreets: (options?: OpenDataSyncOptionsPartial) => Promise<void>;

package/dist/open-data-sync/streets.js

@@ -47,7 +47,7 @@ const importDataToDb = (data) => __awaiter(void 0, void 0, void 0, function* ()
     }
     yield insertStreetsFromDbf(data);
 });
-export const downloadAndImportStreets = (options) => __awaiter(void 0, void 0, void 0, function* () {
+export const downloadAndImportStreets = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     yield runSyncPart(SyncPart.Streets, [SyncPart.AddressPoints], () => __awaiter(void 0, void 0, void 0, function* () {
         console.log("Starting to download and import streets. This takes up to 1 hour.");
         const completeOptions = prepareOptions(options);

package/package.json

@@ -53,7 +53,7 @@
   },
   "name": "text-to-map",
   "description": "Text To Map usiluje o lepší, strojově zpracovatelné využití částí vyhlášek s výčtem ulic a dalších lokací. Jde o rozšiřitelnou sadu konceptů a nástrojů, které zajistí hladký převod výčtu ulic a jejich rozsahů v lidsky srozumitelném jazyce do strojově zpracovatelného, uchopitelného formátu.",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [