text-to-map 1.1.6 → 1.1.8

package/dist/bin/knex.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/bin/knex.js

@@ -0,0 +1,20 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { disconnectKnex, getKnexDb } from "../db/db";
+function main() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const knex = getKnexDb();
+        yield knex.schema.alterTable("school_founder", (table) => {
+            table.unique(["school_izo", "founder_id"]);
+        });
+        yield disconnectKnex();
+    });
+}
+main();

package/dist/bin/parse-ordinance.js

@@ -36,6 +36,7 @@ function main() {
         };
         console.time("downloadAndImportAllLatestAddressPoints");
         const { municipality } = yield getNewMunicipality("Česká Lípa");
+        console.log(municipality.founder.schools[0].locations);
         const addressPoints = yield parseOrdinanceToAddressPoints(lines, {
         // currentMunicipality: municipality,
         }, reportErrors, reportWarnings);

package/dist/db/address-points.js

@@ -130,10 +130,10 @@ export const getAddressPointById = (addressPointId) => __awaiter(void 0, void 0,
     const knex = getKnexDb();
     const row = yield knex.raw(`${addressPointSelect}
       WHERE a.id = ?`, [addressPointId]);
-    if (!row) {
+    if (row.length === 0) {
         return null;
     }
-    return rowToAddressPoint(row);
+    return rowToAddressPoint(row[0]);
 });
 let lastFounder = null;
 let allStreets = [];

package/dist/db/db.d.ts

@@ -21,7 +21,7 @@ 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[], preventDuplicates?: boolean, keyColumns?: string[]) => Promise<number>;
+export declare const insertMultipleRows: (rows: string[][], table: string, columnNames: string[], preventDuplicates?: boolean) => Promise<number>;
 /**
  * Insert a single row and return the autoincremented ID.
  */

package/dist/db/db.js

@@ -115,17 +115,12 @@ 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, preventDuplicates = true, keyColumns = []) => __awaiter(void 0, void 0, void 0, function* () {
+export const insertMultipleRows = (rows, table, columnNames, preventDuplicates = true) => __awaiter(void 0, void 0, void 0, function* () {
     if (rows.length === 0) {
         return 0;
     }
     const insertPlaceholders = generate2DPlaceholders(columnNames.length, rows.length);
-    if (preventDuplicates && keyColumns.length === 0) {
-        keyColumns = [columnNames[0]];
-    }
-    const onConfict = preventDuplicates
-        ? `ON CONFLICT (${keyColumns.join(", ")}) DO NOTHING`
-        : "";
+    const onConfict = preventDuplicates ? `ON CONFLICT DO NOTHING` : "";
     yield getKnexDb().raw(`INSERT INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
     return rows.length;
 });

package/dist/db/founders.js

@@ -86,7 +86,7 @@ export const insertFounders = (founders) => __awaiter(void 0, void 0, void 0, fu
             schoolFounderConnectionData.push([school.izo, founderId]);
         });
     }
-    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"], true, ["school_izo", "founder_id"]);
+    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"], true);
     return insertedFounders + insertedConnections;
 });
 const getCityOfSchool = (izo) => __awaiter(void 0, void 0, void 0, function* () {

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"], true, ["school_izo", "address_point_id"]);
+            insertedLocations += yield insertMultipleRows([location], "school_location", ["school_izo", "address_point_id"], true);
         }
         catch (error) {
             console.log(`Cannot add location with RUIAN code ${location[1]} (school IZO = ${location[0]}): code does not exist.`);

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.6",
+  "version": "1.1.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [