text-to-map 1.1.17 → 1.1.18

package/dist/bin/parse-ordinance.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { readFileSync, writeFileSync } from "fs";
-import { getNewMunicipality, parseOrdinanceToAddressPoints, } from "../street-markdown/smd";
+import { getNewMunicipalityByName, parseOrdinanceToAddressPoints, } from "../street-markdown/smd";
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         // take first node argument as a file name
@@ -35,7 +35,7 @@ function main() {
             warningCount++;
         };
         console.time("downloadAndImportAllLatestAddressPoints");
-        const { municipality } = yield getNewMunicipality("Česká Lípa");
+        const { municipality } = yield getNewMunicipalityByName("Česká Lípa");
         const addressPoints = yield parseOrdinanceToAddressPoints(lines, {
         // currentMunicipality: municipality,
         }, reportErrors, reportWarnings);

package/dist/db/founders.d.ts

@@ -1,6 +1,10 @@
 import { DbMunicipalityResult, MunicipalityPartResult, SmdError } from "../street-markdown/types";
 import { Founder, MunicipalityType } from "./types";
 export declare const insertFounders: (founders: Founder[]) => Promise<number>;
+export declare const getFounderById: (id: number) => Promise<{
+    founder: Founder;
+    errors: SmdError[];
+}>;
 export declare const findFounder: (nameWithHashtag: string) => Promise<{
     founder: Founder;
     errors: SmdError[];

package/dist/db/founders.js

@@ -223,14 +223,27 @@ const extractFounderName = (line) => {
         return line.trim();
     }
 };
-export const findFounder = (nameWithHashtag) => __awaiter(void 0, void 0, void 0, function* () {
-    const errors = [];
-    const name = extractFounderName(nameWithHashtag);
-    const result = yield getKnexDb()
+const getBaseFounderQuery = () => {
+    return getKnexDb()
         .select("f.id", "f.name", "f.ico", "f.founder_type_code", "f.city_code", "f.city_district_code")
         .from("founder as f")
         .leftJoin("city as c", "c.code", "f.city_code")
-        .leftJoin("city_district as d", "d.code", "f.city_district_code")
+        .leftJoin("city_district as d", "d.code", "f.city_district_code");
+};
+export const getFounderById = (id) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = yield getBaseFounderQuery().where("f.id", id).first();
+    const founder = yield resultToFounder(result);
+    return {
+        founder: founder !== null && founder !== void 0 ? founder : null,
+        errors: founder
+            ? []
+            : [wholeLineError(`Zřizovatel s id ${id} neexistuje.`, "")],
+    };
+});
+export const findFounder = (nameWithHashtag) => __awaiter(void 0, void 0, void 0, function* () {
+    const errors = [];
+    const name = extractFounderName(nameWithHashtag);
+    const result = yield getBaseFounderQuery()
         .where("f.name", name)
         .orWhere("c.name", name)
         .orWhere("d.name", name)

package/dist/street-markdown/smd.d.ts

@@ -2,7 +2,11 @@ import { Founder } from "../db/types";
 import { ErrorCallbackParams, Municipality, MunicipalityWithFounder, ProcessLineCallbackParams, School, SmdError, SmdState } from "./types";
 export declare const parseOrdinanceToAddressPoints: (lines: string[], initialState?: Partial<SmdState>, onError?: (params: ErrorCallbackParams) => void, onWarning?: (params: ErrorCallbackParams) => void, onProcessedLine?: (params: ProcessLineCallbackParams) => void) => Promise<Municipality[]>;
 export declare const convertMunicipality: (municipality: MunicipalityWithFounder) => Municipality;
-export declare const getNewMunicipality: (name: string) => Promise<{
+export declare const getNewMunicipalityByName: (name: string) => Promise<{
+    municipality: MunicipalityWithFounder;
+    errors: SmdError[];
+}>;
+export declare const getNewMunicipalityByFounderId: (founderId: number) => Promise<{
     municipality: MunicipalityWithFounder;
     errors: SmdError[];
 }>;

package/dist/street-markdown/smd.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { checkStreetExists, findAddressPoints, getAddressPointById, } from "../db/address-points";
 import { disconnectKnex } from "../db/db";
-import { findFounder } from "../db/founders";
+import { findFounder, getFounderById } from "../db/founders";
 import { findSchool } from "../db/schools";
 import { founderToMunicipality } from "../db/types";
 import { getMunicipalityPartResult, getRestOfMunicipalityPart, getSwitchMunicipality, getWholeMunicipality, isMunicipalitySwitch, isRestOfMunicipalityLine, isRestOfMunicipalityPartLine, isRestWithNoStreetNameLine, isWholeMunicipality, } from "./municipality";
@@ -115,7 +115,7 @@ const processMunicipalityLine = ({ line, lineNumber, state, onError, }) => __awa
         state.currentSchool = null;
     }
     yield completeCurrentMunicipality(state);
-    const { municipality, errors } = yield getNewMunicipality(line);
+    const { municipality, errors } = yield getNewMunicipalityByName(line);
     if (errors.length > 0) {
         onError({ lineNumber, line, errors });
     }
@@ -262,16 +262,21 @@ const addRestOfMunicipalityPart = (state, municipalityPartCode, schoolIzo) => __
     });
     yield addRestToSchool(allPoints, schoolIzo, state);
 });
-export const getNewMunicipality = (name) => __awaiter(void 0, void 0, void 0, function* () {
+export const getNewMunicipalityByName = (name) => __awaiter(void 0, void 0, void 0, function* () {
     const { founder, errors } = yield findFounder(name);
-    return {
-        municipality: {
-            municipalityName: founder ? founder.name : "Neznámá obec",
-            founder,
-            schools: [],
-        },
-        errors,
-    };
+    return getNewMunicipality(founder, errors);
+});
+export const getNewMunicipalityByFounderId = (founderId) => __awaiter(void 0, void 0, void 0, function* () {
+    const { founder, errors } = yield getFounderById(founderId);
+    return getNewMunicipality(founder, errors);
+});
+const getNewMunicipality = (founder, errors) => ({
+    municipality: {
+        municipalityName: founder ? founder.name : "Neznámá obec",
+        founder,
+        schools: [],
+    },
+    errors,
 });
 export const getNewSchool = (name, founder, lineNumber, onError) => __awaiter(void 0, void 0, void 0, function* () {
     let exportSchool = {

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