text-to-map 1.1.15 → 1.1.16

package/dist/bin/parse-ordinance.js

@@ -36,7 +36,6 @@ 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

@@ -11,7 +11,7 @@ import { AddressPointType, createSingleLineAddress } from "czech-address";
 import { SeriesType, isNegativeSeriesSpec, isRange, isSeriesSpecArray, } from "../street-markdown/types";
 import { findClosestString } from "../utils/helpers";
 import jtsk2wgs84 from "../utils/jtsk2wgs84";
-import { extractKeyValuesPairs, generate2DPlaceholders, getKnexDb, insertMultipleRows, isMysql, isSqlite, nonEmptyOrNull, } from "./db";
+import { extractKeyValuesPairs, generate2DPlaceholders, getKnexDb, insertMultipleRows, isMysql, isSqlite, nonEmptyOrNull, rawQuery, } from "./db";
 import { getFounderCityCode } from "./founders";
 import { MunicipalityType } from "./types";
 const DescriptiveType = "č.p.";
@@ -80,7 +80,7 @@ export const commitAddressPoints = (buffer) => __awaiter(void 0, void 0, void 0,
     });
     const placeHolders = generate2DPlaceholders(columnNames.length, buffer.length);
     const knex = getKnexDb();
-    yield knex.raw(`INSERT ${isMysql(knex) ? "IGNORE" : ""} INTO address_point (${columnNames.join(",")}) VALUES ${placeHolders} ${!isMysql(knex) ? "ON CONFLICT (id) DO NOTHING" : ""}`, params);
+    yield rawQuery(`INSERT ${isMysql(knex) ? "IGNORE" : ""} INTO address_point (${columnNames.join(",")}) VALUES ${placeHolders} ${!isMysql(knex) ? "ON CONFLICT (id) DO NOTHING" : ""}`, params);
     return buffer.length;
 });
 export const insertCities = (buffer) => __awaiter(void 0, void 0, void 0, function* () {
@@ -129,8 +129,7 @@ const addressPointSelect = `
   LEFT JOIN prague_district p ON a.prague_district_code = p.code
   LEFT JOIN municipality_part m ON a.municipality_part_code = m.code`;
 export const getAddressPointById = (addressPointId) => __awaiter(void 0, void 0, void 0, function* () {
-    const knex = getKnexDb();
-    const row = yield knex.raw(`${addressPointSelect}
+    const row = yield rawQuery(`${addressPointSelect}
       WHERE a.id = ?`, [addressPointId]);
     if (row.length === 0) {
         return null;
@@ -144,7 +143,7 @@ export const checkStreetExists = (streetName, founder) => __awaiter(void 0, void
     const errors = [];
     // we check the whole city
     const cityCode = yield getFounderCityCode(founder);
-    const rowList = yield knex.raw(`SELECT name AS street_name
+    const rowList = yield rawQuery(`SELECT name AS street_name
     FROM street
     WHERE city_code = ? AND name = ?  ${isSqlite(knex) ? "COLLATE NOCASE" : ""}`, [cityCode, streetName]);
     if (rowList.length > 0) {
@@ -207,7 +206,7 @@ export const findAddressPoints = (params) => __awaiter(void 0, void 0, void 0, f
             (params.type === FindAddressPointsType.WholeMunicipalityNoStreetName
                 ? " AND a.street_code IS NULL"
                 : "");
-    const queryResult = yield knex.raw(`SELECT a.id, s.name AS street_name, o.name AS object_type_name, a.descriptive_number,
+    const queryResult = yield rawQuery(`SELECT a.id, s.name AS street_name, o.name AS object_type_name, a.descriptive_number,
       a.orientational_number, a.orientational_number_letter, c.name AS city_name,
       d.name AS district_name, m.name AS municipality_part_name, p.name AS prague_district_name,
       a.postal_code, a.wgs84_latitude, a.wgs84_longitude

package/dist/db/cities.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import chunk from "lodash/chunk";
-import { extractKeyValuesPairs, getKnexDb, insertMultipleRows } from "./db";
+import { extractKeyValuesPairs, insertMultipleRows, rawQuery } from "./db";
 const citiesColumn = {
     cityName: 0,
     cityCode: 1,
@@ -26,11 +26,10 @@ export const insertCityPositions = (data) => __awaiter(void 0, void 0, void 0, f
     // we need to insert them before updating them with region data
     changes += yield insertCities(data);
     const prev = changes;
-    const knex = getKnexDb();
     for (const arrayChunk of chunk(data, 1000)) {
         const queries = [];
         for (const row of arrayChunk) {
-            queries.push(knex.raw(`UPDATE city SET wgs84_latitude = ?, wgs84_longitude = ? WHERE code = ?`, [
+            queries.push(rawQuery(`UPDATE city SET wgs84_latitude = ?, wgs84_longitude = ? WHERE code = ?`, [
                 row[citiesColumn.latitude],
                 row[citiesColumn.longitude],
                 row[citiesColumn.cityCode],

package/dist/db/db.d.ts

@@ -20,6 +20,7 @@ export declare const initDb: (config?: Partial<DbConfig>) => Promise<Knex>;
 export declare const clearDb: (config?: Partial<DbConfig>) => Promise<Knex>;
 export declare const disconnectKnex: () => Promise<void>;
 export declare const nonEmptyOrNull: (value: string) => string | null;
+export declare const rawQuery: (query: string, ...bindings: readonly Knex.RawBinding[]) => Promise<any[]>;
 /**
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).

package/dist/db/db.js

@@ -57,6 +57,7 @@ export const getKnexDb = (config = {}) => {
                 client: DbClient[SupportedDbType.postgres],
                 connection: _knexDbConfig.pgConnectionString,
                 useNullAsDefault: true,
+                debug: _knexDbConfig.verbose,
             });
         }
         else if (_knexDbConfig.dbType === SupportedDbType.mysql) {
@@ -71,6 +72,7 @@ export const getKnexDb = (config = {}) => {
                     database,
                 },
                 useNullAsDefault: true,
+                debug: _knexDbConfig.verbose,
             });
         }
         else {
@@ -141,6 +143,11 @@ const getEnvConfig = () => {
 export const nonEmptyOrNull = (value) => {
     return value ? value : null;
 };
+export const rawQuery = (query, ...bindings) => __awaiter(void 0, void 0, void 0, function* () {
+    const knex = getKnexDb();
+    const result = yield knex.raw(query, ...bindings);
+    return isMysql(knex) ? result[0] : result;
+});
 /**
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).
@@ -152,7 +159,7 @@ export const insertMultipleRows = (rows, table, columnNames, preventDuplicates =
     const insertPlaceholders = generate2DPlaceholders(columnNames.length, rows.length);
     const knex = getKnexDb();
     const onConfict = preventDuplicates && !isMysql(knex) ? `ON CONFLICT DO NOTHING` : "";
-    yield knex.raw(`INSERT ${isMysql(knex) ? "IGNORE" : ""} INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
+    yield rawQuery(`INSERT ${isMysql(knex) ? "IGNORE" : ""} INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
     return rows.length;
 });
 /**

package/package.json

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