text-to-map 1.1.7 → 1.1.9

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Marek Lisy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Marek Lisy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,20 +1,20 @@
-# Text To Map
-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.
-
-## Odkazy
-- [text-to-map-frontend](https://github.com/maral/text-to-map-frontend) - mapa zobrazující výstupy této knihovny
-
-## Živě na webu
-- [Spádové oblasti - Praha](https://mareklisy.cz/spadovosti-praha/)
-
-## Návod na použití
-1. `npm install`
-2. `npm run address-points` - stažení a import adresních bodů z RÚIAN
-3. `npm run schools` - stažení a import dat o školách a zřizovatelích z rejstříku MŠMT
-4. `npm run streets` - dotažení všech ulic z RÚIAN (nepovinné, ale zmizí tím warningy o neexistujících ulicích ve vyhlášce v případech, kdy jsou ve vyhlášce ulice bez jediného adresního bodu)
-5. `npm run parse-ordinance /some/path/input.txt /path/output.json` - parsování vyhlášky a namapování adresních míst na spádové školy
-
-Pro vyzkoušení je možné použít již vyčištěné vyhlášky ze složky *examples*.
-
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E5JOMLT)
+# Text To Map
+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.
+
+## Odkazy
+- [text-to-map-frontend](https://github.com/maral/text-to-map-frontend) - mapa zobrazující výstupy této knihovny
+
+## Živě na webu
+- [Spádové oblasti - Praha](https://mareklisy.cz/spadovosti-praha/)
+
+## Návod na použití
+1. `npm install`
+2. `npm run address-points` - stažení a import adresních bodů z RÚIAN
+3. `npm run schools` - stažení a import dat o školách a zřizovatelích z rejstříku MŠMT
+4. `npm run streets` - dotažení všech ulic z RÚIAN (nepovinné, ale zmizí tím warningy o neexistujících ulicích ve vyhlášce v případech, kdy jsou ve vyhlášce ulice bez jediného adresního bodu)
+5. `npm run parse-ordinance /some/path/input.txt /path/output.json` - parsování vyhlášky a namapování adresních míst na spádové školy
+
+Pro vyzkoušení je možné použít již vyčištěné vyhlášky ze složky *examples*.
+
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E5JOMLT)

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.d.ts

@@ -1,4 +1,4 @@
-import { AddressPoint, FullStreetNumber, RangeSpec, SeriesType, SmdError, SmdLine, WholeMunicipalitySmdLine } from "../street-markdown/types";
+import { AddressPoint, FullStreetNumber, RangeSpec, SeriesType, SmdError, SmdLine } from "../street-markdown/types";
 import { Founder, Municipality } from "./types";
 export declare const Column: {
     admCode: number;
@@ -33,7 +33,27 @@ export declare const checkStreetExists: (streetName: string, founder: Founder) =
     exists: boolean;
     errors: SmdError[];
 }>;
-export declare const findAddressPoints: (smdLine: SmdLine | WholeMunicipalitySmdLine, municipality: Municipality) => Promise<AddressPoint[]>;
+export declare enum FindAddressPointsType {
+    SmdLine = 0,
+    MunicipalityPart = 1,
+    WholeMunicipality = 2,
+    WholeMunicipalityNoStreetName = 3
+}
+export type FindAddressPointsParams = {
+    type: FindAddressPointsType.SmdLine;
+    smdLine: SmdLine;
+    municipality: Municipality;
+} | {
+    type: FindAddressPointsType.MunicipalityPart;
+    municipalityPartCode: number;
+} | {
+    type: FindAddressPointsType.WholeMunicipality;
+    municipality: Municipality;
+} | {
+    type: FindAddressPointsType.WholeMunicipalityNoStreetName;
+    municipality: Municipality;
+};
+export declare const findAddressPoints: (params: FindAddressPointsParams) => Promise<AddressPoint[]>;
 export declare const isInRange: (number: number | null, letter: string | null, range: RangeSpec) => boolean;
 export declare const fitsType: (number: number | null, type: SeriesType) => boolean;
 export declare const equalsFullStreetNumber: (fullStreetNumber: FullStreetNumber, addressPoint: AddressPoint) => boolean;

package/dist/db/address-points.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { AddressPointType, createSingleLineAddress } from "czech-address";
-import { SeriesType, isNegativeSeriesSpec, isRange, isSeriesSpecArray, isWholeMunicipalitySmdLine, } from "../street-markdown/types";
+import { SeriesType, isNegativeSeriesSpec, isRange, isSeriesSpecArray, } from "../street-markdown/types";
 import { findClosestString } from "../utils/helpers";
 import jtsk2wgs84 from "../utils/jtsk2wgs84";
 import { extractKeyValuesPairs, generate2DPlaceholders, getKnexDb, insertMultipleRows, isSqlite, nonEmptyOrNull, } from "./db";
@@ -94,7 +94,8 @@ export const insertDistricts = (buffer) => __awaiter(void 0, void 0, void 0, fun
 export const insertMunicipalityParts = (buffer) => __awaiter(void 0, void 0, void 0, function* () {
     return yield insertMultipleRows(extractKeyValuesPairs(buffer, Column.municipalityPartCode, [
         Column.municipalityPartName,
-    ]), "municipality_part", ["code", "name"]);
+        Column.cityCode,
+    ]), "municipality_part", ["code", "name", "city_code"]);
 });
 export const insertPragueDistricts = (buffer) => __awaiter(void 0, void 0, void 0, function* () {
     return yield insertMultipleRows(extractKeyValuesPairs(buffer, Column.pragueDistrictCode, [
@@ -130,10 +131,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 = [];
@@ -167,7 +168,6 @@ export const checkStreetExists = (streetName, founder) => __awaiter(void 0, void
             //   `Street '${streetName}' has wrong case, correct case: '${match}'.`
             // );
         }
-        exists = true;
     }
     else {
         const closest = findClosestString(streetName, allStreets);
@@ -183,14 +183,29 @@ const getAllStreets = (cityCode) => __awaiter(void 0, void 0, void 0, function*
     const knex = getKnexDb();
     return yield knex.pluck("name").from("street").where("city_code", cityCode);
 });
-export const findAddressPoints = (smdLine, municipality) => __awaiter(void 0, void 0, void 0, function* () {
+export var FindAddressPointsType;
+(function (FindAddressPointsType) {
+    FindAddressPointsType[FindAddressPointsType["SmdLine"] = 0] = "SmdLine";
+    FindAddressPointsType[FindAddressPointsType["MunicipalityPart"] = 1] = "MunicipalityPart";
+    FindAddressPointsType[FindAddressPointsType["WholeMunicipality"] = 2] = "WholeMunicipality";
+    FindAddressPointsType[FindAddressPointsType["WholeMunicipalityNoStreetName"] = 3] = "WholeMunicipalityNoStreetName";
+})(FindAddressPointsType || (FindAddressPointsType = {}));
+export const findAddressPoints = (params) => __awaiter(void 0, void 0, void 0, function* () {
     const knex = getKnexDb();
-    const params = isWholeMunicipalitySmdLine(smdLine)
-        ? [municipality.code]
-        : [smdLine.street, municipality.code];
-    const streetJoinCondition = isWholeMunicipalitySmdLine(smdLine)
-        ? "LEFT JOIN street s ON a.street_code = s.code"
-        : `JOIN street s ON a.street_code = s.code AND s.name = ? ${isSqlite(knex) ? "COLLATE NOCASE" : ""}`;
+    const queryParams = params.type === FindAddressPointsType.SmdLine
+        ? [params.smdLine.street, params.municipality.code]
+        : params.type === FindAddressPointsType.MunicipalityPart
+            ? [params.municipalityPartCode]
+            : [params.municipality.code];
+    const streetJoinCondition = params.type === FindAddressPointsType.SmdLine
+        ? `JOIN street s ON a.street_code = s.code AND s.name = ? ${isSqlite(knex) ? "COLLATE NOCASE" : ""}`
+        : "LEFT JOIN street s ON a.street_code = s.code";
+    const whereCondition = params.type === FindAddressPointsType.MunicipalityPart
+        ? "a.municipality_part_code = ?"
+        : getMunicipalityWhere("a", params.municipality) +
+            (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,
       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,
@@ -202,13 +217,13 @@ export const findAddressPoints = (smdLine, municipality) => __awaiter(void 0, vo
     LEFT JOIN city_district d ON a.city_district_code = d.code
     LEFT JOIN municipality_part m ON a.municipality_part_code = m.code
     LEFT JOIN prague_district p ON a.prague_district_code = p.code
-    WHERE ${getMunicipalityWhere("a", municipality)}`, params);
+    WHERE ${whereCondition}`, queryParams);
     const filteredAddressPoints = queryResult.map(rowToAddressPoint);
-    if (isWholeMunicipalitySmdLine(smdLine)) {
+    if (params.type !== FindAddressPointsType.SmdLine) {
         return filteredAddressPoints;
     }
     const result = [];
-    const numberSpec = smdLine.numberSpec;
+    const numberSpec = params.smdLine.numberSpec;
     if (isSeriesSpecArray(numberSpec)) {
         numberSpec.forEach((seriesSpec) => {
             result.push(...filterAddressPointsByRanges(filteredAddressPoints, seriesSpec));

package/dist/db/founders.d.ts

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

package/dist/db/founders.js

@@ -144,18 +144,16 @@ const fixFounderProblems = (founder, municipalityCode, differingSchools, extract
             return municipalities[0].code;
         }
         else {
-            // get code and position of the closest city
-            let lowestDistance = Number.MAX_SAFE_INTEGER;
-            let municipalityCode = null;
-            for (const municipality of municipalities) {
-                let municipalityDistance = distance([municipality.lat, municipality.lng], [schoolPosition.wgs84_latitude, schoolPosition.wgs84_longitude]);
-                if (municipalityDistance < lowestDistance) {
-                    lowestDistance = municipalityDistance;
-                    municipalityCode = municipality.code;
-                }
-            }
             console.log("using the closest municipality matching the extracted name");
-            return municipalityCode;
+            return getClosestCode({
+                code: 1,
+                lat: schoolPosition.wgs84_latitude,
+                lng: schoolPosition.wgs84_longitude,
+            }, municipalities.map((municipality) => ({
+                code: municipality.code,
+                lat: municipality.lat,
+                lng: municipality.lng,
+            })));
         }
     }
     else {
@@ -174,6 +172,18 @@ const fixFounderProblems = (founder, municipalityCode, differingSchools, extract
         }
     }
 });
+const getClosestCode = (from, toList) => __awaiter(void 0, void 0, void 0, function* () {
+    let lowestDistance = Number.MAX_SAFE_INTEGER;
+    let code = null;
+    for (const place of toList) {
+        let municipalityDistance = distance([place.lat, place.lng], [from.lat, from.lng]);
+        if (municipalityDistance < lowestDistance) {
+            lowestDistance = municipalityDistance;
+            code = place.code;
+        }
+    }
+    return code;
+});
 const getCityCodeByDistrictCode = (districtCode) => __awaiter(void 0, void 0, void 0, function* () {
     var _d;
     const result = yield getKnexDb()
@@ -318,14 +328,67 @@ const getAllFounderNames = () => __awaiter(void 0, void 0, void 0, function* ()
         municipalityName: String(row.city_name ? row.city_name : row.city_district_name),
     }));
 });
-export const findMunicipalityByNameAndType = (name, type) => __awaiter(void 0, void 0, void 0, function* () {
+export const findMunicipalityPartByName = (name, founder) => __awaiter(void 0, void 0, void 0, function* () {
     const errors = [];
+    const cityCode = yield getFounderCityCode(founder);
     const result = yield getKnexDb()
         .first("code")
-        .from(type === MunicipalityType.City ? "city" : "city_district")
-        .where("name", name);
+        .from("municipality_part")
+        .where({ name, city_code: cityCode });
     if (result) {
-        return { municipality: { code: result.code, type }, errors };
+        return { municipalityPartCode: result.code, errors };
+    }
+    else {
+        const allNames = yield getAllMunicipalityPartNames(cityCode);
+        const namesList = allNames.map((row) => row.name);
+        const bestMatch = findClosestString(name, namesList);
+        errors.push({
+            message: `Obec ani městská část '${name}' neexistuje, mysleli jste '${bestMatch}'?`,
+            startOffset: 0,
+            endOffset: 0,
+        });
+        return {
+            municipalityPartCode: null,
+            errors,
+        };
+    }
+});
+export const findMunicipalityByNameAndType = (name, type, founder) => __awaiter(void 0, void 0, void 0, function* () {
+    const errors = [];
+    const result = type === MunicipalityType.City
+        ? yield getKnexDb().select("code").from("city").where("name", name)
+        : yield getKnexDb()
+            .select("code")
+            .from("city_district")
+            .where("name", name)
+            .andWhere("city_code", yield getFounderCityCode(founder));
+    if (result.length > 0) {
+        if (result.length > 1) {
+            const cityCode = yield getFounderCityCode(founder);
+            const positions = yield getKnexDb()
+                .select("city_code", "wgs84_latitude", "wgs84_longitude")
+                .from("address_point")
+                .groupBy("city_code")
+                .whereIn("city_code", result.map((row) => row.code));
+            const founderPosition = yield getKnexDb()
+                .first("wgs84_latitude", "wgs84_longitude")
+                .from("address_point")
+                .groupBy("city_code")
+                .where("city_code", cityCode);
+            const closestCode = yield getClosestCode({
+                code: cityCode,
+                lat: founderPosition.wgs84_latitude,
+                lng: founderPosition.wgs84_longitude,
+            }, positions.map((row) => ({
+                code: row.city_code,
+                lat: row.wgs84_latitude,
+                lng: row.wgs84_longitude,
+            })));
+            return { municipality: { code: closestCode, type }, errors };
+        }
+        else {
+            return { municipality: { code: result[0].code, type }, errors };
+        }
     }
     else {
         const allNames = yield getAllMunicipalityNames(type);
@@ -351,3 +414,12 @@ const getAllMunicipalityNames = (type) => __awaiter(void 0, void 0, void 0, func
         code: row.code,
     }));
 });
+const getAllMunicipalityPartNames = (cityCode) => __awaiter(void 0, void 0, void 0, function* () {
+    return (yield getKnexDb()
+        .select("name", "code")
+        .from("municipality_part")
+        .where("city_code", cityCode)).map((row) => ({
+        name: row.name,
+        code: row.code,
+    }));
+});

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

@@ -28,10 +28,6 @@ export function up(knex) {
             table_6.text("key").primary().notNullable();
             table_6.text("value").notNullable();
         });
-        yield knex.schema.createTable("municipality_part", function (table_7) {
-            table_7.integer("code").primary().notNullable();
-            table_7.text("name").notNullable();
-        });
         yield knex.schema.createTable("object_type", function (table_8) {
             table_8.integer("id").primary().notNullable();
             table_8.text("name").notNullable();
@@ -88,6 +84,15 @@ export function up(knex) {
                 .notNullable();
             table_2.text("name").notNullable();
         });
+        yield knex.schema.createTable("municipality_part", function (table_7) {
+            table_7.integer("code").primary().notNullable();
+            table_7
+                .integer("city_code")
+                .references("code")
+                .inTable("city")
+                .notNullable();
+            table_7.text("name").notNullable();
+        });
         yield knex.schema.createTable("street", function (table_15) {
             table_15.integer("code").primary().notNullable();
             table_15

package/dist/db/types.d.ts

@@ -32,6 +32,11 @@ export interface Municipality {
     code: number;
 }
 export type MunicipalityWithPosition = Municipality & Position;
+export interface PlaceWithPosition {
+    code: number;
+    lat: number;
+    lng: number;
+}
 export declare const founderToMunicipality: (founder: Founder) => Municipality;
 export interface DbfStreet {
     KOD: string;

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

@@ -1,5 +1,9 @@
-import { DbMunicipalityResult } from "./types";
+import { Founder } from "../db/types";
+import { DbMunicipalityResult, MunicipalityPartResult } from "./types";
+export declare const isMunicipalityPart: (line: string) => boolean;
+export declare const getMunicipalityPart: (line: string, founder: Founder) => Promise<MunicipalityPartResult>;
 export declare const isMunicipalitySwitch: (line: string) => boolean;
-export declare const getSwitchMunicipality: (line: string) => Promise<DbMunicipalityResult>;
+export declare const getSwitchMunicipality: (line: string, founder: Founder) => Promise<DbMunicipalityResult>;
 export declare const isWholeMunicipality: (line: string) => boolean;
-export declare const getWholeMunicipality: (line: string) => Promise<DbMunicipalityResult>;
+export declare const isNoStreetNameLine: (line: string) => boolean;
+export declare const getWholeMunicipality: (line: string, founder: Founder) => Promise<DbMunicipalityResult>;

package/dist/street-markdown/municipality.js

@@ -7,16 +7,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { findMunicipalityByNameAndType } from "../db/founders";
+import { findMunicipalityByNameAndType, findMunicipalityPartByName, } from "../db/founders";
 import { MunicipalityType } from "../db/types";
+const municipalityPartPattern = /^část (?<type>obce|města) (?<name>.+)$/;
 const municipalitySwitchStartPattern = /^navíc ulice /;
 const municipalitySwitchPattern = /^navíc ulice (z )?(?<type>městské části|městského obvodu|obce|města) (?<name>.+):$/;
 const wholeMunicipalityStartPattern = /^území /;
 const wholeMunicipalityPattern = /^území (?<type>městské části|městského obvodu|obce|města) (?<name>.+)$/;
+const noStreetNamePattern = /^všechny ostatní budovy bez názvu ulice\s*$/;
+export const isMunicipalityPart = (line) => {
+    return municipalityPartPattern.test(line);
+};
+export const getMunicipalityPart = (line, founder) => __awaiter(void 0, void 0, void 0, function* () {
+    const match = municipalityPartPattern.exec(line);
+    if (match === null) {
+        return {
+            errors: [
+                {
+                    message: "Neplatný zápis pro přidání části obce. Správný zápis je: části <obce/města> <název části obce>. Např.: 'části obce Kladno' (název části obce musí být v 1. pádě).",
+                    startOffset: 0,
+                    endOffset: line.length + 1,
+                },
+            ],
+            municipalityPartCode: null,
+        };
+    }
+    const { name } = match.groups;
+    return yield getMunicipalityPartResult(cleanName(name), line, founder);
+});
 export const isMunicipalitySwitch = (line) => {
     return municipalitySwitchStartPattern.test(line);
 };
-export const getSwitchMunicipality = (line) => __awaiter(void 0, void 0, void 0, function* () {
+export const getSwitchMunicipality = (line, founder) => __awaiter(void 0, void 0, void 0, function* () {
     const match = municipalitySwitchPattern.exec(line);
     if (match === null) {
         return {
@@ -31,12 +53,15 @@ export const getSwitchMunicipality = (line) => __awaiter(void 0, void 0, void 0,
         };
     }
     const { type, name } = match.groups;
-    return yield getMunicipalityResult(type, name, line);
+    return yield getMunicipalityResult(type, cleanName(name), line, founder);
 });
 export const isWholeMunicipality = (line) => {
     return wholeMunicipalityStartPattern.test(line);
 };
-export const getWholeMunicipality = (line) => __awaiter(void 0, void 0, void 0, function* () {
+export const isNoStreetNameLine = (line) => {
+    return noStreetNamePattern.test(line);
+};
+export const getWholeMunicipality = (line, founder) => __awaiter(void 0, void 0, void 0, function* () {
     const match = wholeMunicipalityPattern.exec(line);
     if (match === null) {
         return {
@@ -51,11 +76,11 @@ export const getWholeMunicipality = (line) => __awaiter(void 0, void 0, void 0,
         };
     }
     const { type, name } = match.groups;
-    return yield getMunicipalityResult(type, name, line);
+    return yield getMunicipalityResult(type, cleanName(name), line, founder);
 });
-const getMunicipalityResult = (type, name, line) => __awaiter(void 0, void 0, void 0, function* () {
+const getMunicipalityResult = (type, name, line, founder) => __awaiter(void 0, void 0, void 0, function* () {
     const typeValue = getMunicipalityType(type);
-    const { municipality, errors } = yield findMunicipalityByNameAndType(name, typeValue);
+    const { municipality, errors } = yield findMunicipalityByNameAndType(name, typeValue, founder);
     const startOffset = line.indexOf(name);
     const endOffset = startOffset + name.length + 1;
     return {
@@ -64,6 +89,16 @@ const getMunicipalityResult = (type, name, line) => __awaiter(void 0, void 0, vo
             endOffset }))),
     };
 });
+const getMunicipalityPartResult = (name, line, founder) => __awaiter(void 0, void 0, void 0, function* () {
+    const { municipalityPartCode, errors } = yield findMunicipalityPartByName(name, founder);
+    const startOffset = line.indexOf(name);
+    const endOffset = startOffset + name.length + 1;
+    return {
+        municipalityPartCode,
+        errors: errors.map((error) => (Object.assign(Object.assign({}, error), { startOffset,
+            endOffset }))),
+    };
+});
 const getMunicipalityType = (type) => {
     switch (type) {
         case "městské části":
@@ -74,3 +109,6 @@ const getMunicipalityType = (type) => {
             return MunicipalityType.City;
     }
 };
+const cleanName = (name) => {
+    return name.trim();
+};

package/dist/street-markdown/smd.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { checkStreetExists, findAddressPoints, getAddressPointById, } from "../db/address-points";
+import { FindAddressPointsType, checkStreetExists, findAddressPoints, getAddressPointById, } from "../db/address-points";
 import { disconnectKnex } from "../db/db";
 import { findFounder } from "../db/founders";
 import { findSchool } from "../db/schools";
 import { founderToMunicipality } from "../db/types";
-import { getSwitchMunicipality, getWholeMunicipality, isMunicipalitySwitch, isWholeMunicipality, } from "./municipality";
+import { getMunicipalityPart, getSwitchMunicipality, getWholeMunicipality, isMunicipalityPart, isMunicipalitySwitch, isNoStreetNameLine, isWholeMunicipality, } from "./municipality";
 import { parseLine } from "./smd-line-parser";
 import { isAddressPoint, } from "./types";
 export const parseOrdinanceToAddressPoints = (lines, initialState = {}, onError = () => { }, onWarning = () => { }, onProcessedLine = () => { }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const state = Object.assign({ currentMunicipality: null, currentFilterMunicipality: null, currentSchool: null, municipalities: [] }, initialState);
+        const state = Object.assign({ currentMunicipality: null, currentFilterMunicipality: null, currentSchool: null, noStreetNameSchoolIzo: null, municipalities: [] }, initialState);
         let lineNumber = 1;
         for (const rawLine of lines) {
             const line = cleanLine(rawLine);
@@ -38,6 +38,9 @@ export const parseOrdinanceToAddressPoints = (lines, initialState = {}, onError
             state.currentMunicipality.schools.push(mapSchoolForExport(state.currentSchool));
         }
         if (state.currentMunicipality != null) {
+            if (state.noStreetNameSchoolIzo) {
+                yield addNoStreetNameToSchool(state);
+            }
             state.municipalities.push(convertMunicipality(state.currentMunicipality));
         }
         return state.municipalities;
@@ -79,25 +82,37 @@ const processOneLine = (params) => __awaiter(void 0, void 0, void 0, function* (
         yield processSchoolLine(params);
         return;
     }
-    if (isMunicipalitySwitch(line)) {
+    if (isMunicipalityPart(line)) {
+        yield processMunicipalityPartLine(params);
+    }
+    else if (isMunicipalitySwitch(line)) {
         processMunicipalitySwitchLine(params);
     }
     else if (isWholeMunicipality(line)) {
         yield processWholeMunicipalityLine(params);
     }
+    else if (isNoStreetNameLine(line)) {
+        state.noStreetNameSchoolIzo = state.currentSchool.izo;
+    }
     else {
         yield processAddressPointLine(params);
     }
 });
-const processMunicipalityLine = ({ line, state, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
+const processMunicipalityLine = ({ line, lineNumber, state, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (state.currentSchool !== null) {
         state.currentMunicipality.schools.push(state.currentSchool);
         state.currentSchool = null;
     }
     if (state.currentMunicipality !== null) {
+        if (state.noStreetNameSchoolIzo) {
+            yield addNoStreetNameToSchool(state);
+        }
         state.municipalities.push(convertMunicipality(state.currentMunicipality));
     }
     const { municipality, errors } = yield getNewMunicipality(line);
+    if (errors.length > 0) {
+        onError({ lineNumber, line, errors });
+    }
     state.currentMunicipality = municipality;
     state.currentFilterMunicipality = founderToMunicipality(state.currentMunicipality.founder);
     state.currentSchool = null;
@@ -122,8 +137,21 @@ const processSchoolLine = ({ line, lineNumber, state, onError, }) => __awaiter(v
     state.currentSchool = yield getNewSchool(line, state.currentMunicipality.founder, lineNumber, onError);
     state.currentFilterMunicipality = founderToMunicipality(state.currentMunicipality.founder);
 });
+const processMunicipalityPartLine = ({ line, state, lineNumber, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const { municipalityPartCode, errors } = yield getMunicipalityPart(line, state.currentMunicipality.founder);
+    if (errors.length > 0) {
+        onError({ lineNumber, line, errors });
+    }
+    else {
+        const addressPoints = yield findAddressPoints({
+            type: FindAddressPointsType.MunicipalityPart,
+            municipalityPartCode,
+        });
+        state.currentSchool.addresses.push(...filterOutSchoolAddressPoint(addressPoints, state.currentSchool).map(mapAddressPointForExport));
+    }
+});
 const processMunicipalitySwitchLine = ({ line, state, lineNumber, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const { municipality, errors } = yield getSwitchMunicipality(line);
+    const { municipality, errors } = yield getSwitchMunicipality(line, state.currentMunicipality.founder);
     if (errors.length > 0) {
         onError({ lineNumber, line, errors });
     }
@@ -132,12 +160,15 @@ const processMunicipalitySwitchLine = ({ line, state, lineNumber, onError, }) =>
     }
 });
 const processWholeMunicipalityLine = ({ line, state, lineNumber, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const { municipality, errors } = yield getWholeMunicipality(line);
+    const { municipality, errors } = yield getWholeMunicipality(line, state.currentMunicipality.founder);
     if (errors.length > 0) {
         onError({ lineNumber, line, errors });
     }
     else {
-        const addressPoints = yield findAddressPoints({ wholeMunicipality: true, street: "", numberSpec: [] }, municipality);
+        const addressPoints = yield findAddressPoints({
+            type: FindAddressPointsType.WholeMunicipality,
+            municipality,
+        });
         state.currentSchool.addresses.push(...filterOutSchoolAddressPoint(addressPoints, state.currentSchool).map(mapAddressPointForExport));
     }
 });
@@ -153,12 +184,33 @@ const processAddressPointLine = ({ line, state, lineNumber, onError, onWarning,
                 onWarning({ lineNumber, line, errors });
             }
             if (exists) {
-                let addressPoints = yield findAddressPoints(smdLine, state.currentFilterMunicipality);
+                let addressPoints = yield findAddressPoints({
+                    type: FindAddressPointsType.SmdLine,
+                    smdLine,
+                    municipality: state.currentFilterMunicipality,
+                });
                 state.currentSchool.addresses.push(...filterOutSchoolAddressPoint(addressPoints, state.currentSchool).map(mapAddressPointForExport));
             }
         }
     }
 });
+const addNoStreetNameToSchool = (state) => __awaiter(void 0, void 0, void 0, function* () {
+    const addressPoints = state.currentMunicipality.schools.flatMap((school) => school.addresses);
+    // get all address points without street name for current municipality
+    const pointsNoStreetName = yield findAddressPoints({
+        type: FindAddressPointsType.WholeMunicipalityNoStreetName,
+        municipality: {
+            code: state.currentMunicipality.founder.cityOrDistrictCode,
+            type: state.currentMunicipality.founder.municipalityType,
+        },
+    });
+    // filter out address points already present
+    const remainingPoints = pointsNoStreetName.filter((point) => !addressPoints.some((ap) => ap.address === point.address));
+    // find the right school and add the remaining address points
+    const schoolIndex = state.currentMunicipality.schools.findIndex((school) => school.izo === state.noStreetNameSchoolIzo);
+    state.currentMunicipality.schools[schoolIndex].addresses.push(...remainingPoints);
+    state.noStreetNameSchoolIzo = null;
+});
 export const getNewMunicipality = (name) => __awaiter(void 0, void 0, void 0, function* () {
     const { founder, errors } = yield findFounder(name);
     return {

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

@@ -8,12 +8,6 @@ export interface SmdLine {
     street: string;
     numberSpec: SeriesSpec[] | NegativeSeriesSpec;
 }
-export interface WholeMunicipalitySmdLine extends SmdLine {
-    wholeMunicipality: true;
-    street: string;
-    numberSpec: SeriesSpec[] | NegativeSeriesSpec;
-}
-export declare const isWholeMunicipalitySmdLine: (something: SmdLine | WholeMunicipalitySmdLine) => something is WholeMunicipalitySmdLine;
 export interface SeriesSpec {
     type: SeriesType;
     ranges: (RangeSpec | FullStreetNumber)[];
@@ -69,6 +63,10 @@ export interface DbMunicipalityResult {
     municipality: DbMunicipality;
     errors: SmdError[];
 }
+export interface MunicipalityPartResult {
+    municipalityPartCode: number;
+    errors: SmdError[];
+}
 export interface MunicipalityWithFounder extends Municipality {
     founder: Founder | null;
 }
@@ -76,6 +74,7 @@ export interface SmdState {
     currentMunicipality: MunicipalityWithFounder;
     currentFilterMunicipality: DbMunicipality;
     currentSchool: School;
+    noStreetNameSchoolIzo: string;
     municipalities: Municipality[];
 }
 export interface ProcessLineCallbackParams {

package/dist/street-markdown/types.js

@@ -1,4 +1,3 @@
-export const isWholeMunicipalitySmdLine = (something) => something.hasOwnProperty("wholeMunicipality");
 export const isSeriesSpecArray = (something) => Array.isArray(something);
 export const isNegativeSeriesSpec = (something) => something.hasOwnProperty("negative");
 export const isFullStreetNumber = (something) => something.hasOwnProperty("orientationNumber");

package/package.json

@@ -1,87 +1,87 @@
-{
-  "type": "module",
-  "dependencies": {
-    "@turf/distance": "^6.5.0",
-    "adm-zip": "^0.5.9",
-    "better-sqlite3": "^8.0.1",
-    "chevrotain": "^10.4.2",
-    "csv-parse": "^5.3.3",
-    "czech-address": "^1.0.1",
-    "dotenv": "^16.3.1",
-    "feedparser": "^2.2.10",
-    "iconv-lite": "^0.6.3",
-    "knex": "^2.4.2",
-    "node-fetch": "^3.3.0",
-    "parsedbf": "^1.1.1",
-    "pg": "^8.11.1",
-    "sax": "^1.2.4",
-    "typescript": "^4.9.4"
-  },
-  "devDependencies": {
-    "@chevrotain/types": "^10.5.0",
-    "@jest/globals": "^29.5.0",
-    "@types/adm-zip": "^0.5.0",
-    "@types/better-sqlite3": "^7.6.3",
-    "@types/feedparser": "^2.2.5",
-    "@types/node": "^18.11.17",
-    "copyfiles": "^2.4.1",
-    "jest": "^29.5.0",
-    "npm-run-all": "^1.7.0",
-    "rimraf": "^5.0.1",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1"
-  },
-  "scripts": {
-    "sync-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/sync-all.ts",
-    "address-points": "ts-node --experimental-specifier-resolution=node --esm src/bin/address-points.ts",
-    "regions": "ts-node --experimental-specifier-resolution=node --esm src/bin/regions.ts",
-    "schools": "ts-node --experimental-specifier-resolution=node --esm src/bin/schools.ts",
-    "streets": "ts-node --experimental-specifier-resolution=node --esm src/bin/streets.ts",
-    "diagrams": "ts-node --experimental-specifier-resolution=node --esm src/bin/generate-syntax-diagrams.ts",
-    "clear-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/clear-all.ts",
-    "init-db": "ts-node --experimental-specifier-resolution=node --esm src/bin/init-db.ts",
-    "parse-ordinance": "ts-node --experimental-specifier-resolution=node --esm src/bin/parse-ordinance.ts",
-    "knex": "ts-node --experimental-specifier-resolution=node --esm src/bin/knex.ts",
-    "test": "node --experimental-vm-modules --no-warnings node_modules/jest/bin/jest.js -c=jest-esm.config.mjs --no-cache",
-    "ordinance-to-csv-rules": "node src/smd-to-csv/ordinance-to-csv-rules.js",
-    "clean": "rimraf dist",
-    "copyfiles": "copyfiles -u 1 src/address_points_init.db dist",
-    "build": "npm-run-all clean -p copyfiles build:*",
-    "build:types": "tsc --declaration --emitDeclarationOnly --outDir dist -p tsconfig.declarations.json",
-    "build:js": "tsc --outDir dist",
-    "prepare": "npm run build"
-  },
-  "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.7",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/**/*",
-    "LICENSE",
-    "README.md"
-  ],
-  "directories": {
-    "example": "examples",
-    "test": "tests"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/maral/text-to-map.git"
-  },
-  "keywords": [
-    "streets",
-    "catchment areas",
-    "schools",
-    "map",
-    "geodata",
-    "address points",
-    "polygons"
-  ],
-  "author": "Marek Lisý",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/maral/text-to-map/issues"
-  },
-  "homepage": "https://github.com/maral/text-to-map#readme"
-}
+{
+  "type": "module",
+  "dependencies": {
+    "@turf/distance": "^6.5.0",
+    "adm-zip": "^0.5.9",
+    "better-sqlite3": "^8.0.1",
+    "chevrotain": "^10.4.2",
+    "csv-parse": "^5.3.3",
+    "czech-address": "^1.0.1",
+    "dotenv": "^16.3.1",
+    "feedparser": "^2.2.10",
+    "iconv-lite": "^0.6.3",
+    "knex": "^2.4.2",
+    "node-fetch": "^3.3.0",
+    "parsedbf": "^1.1.1",
+    "pg": "^8.11.1",
+    "sax": "^1.2.4",
+    "typescript": "^4.9.4"
+  },
+  "devDependencies": {
+    "@chevrotain/types": "^10.5.0",
+    "@jest/globals": "^29.5.0",
+    "@types/adm-zip": "^0.5.0",
+    "@types/better-sqlite3": "^7.6.3",
+    "@types/feedparser": "^2.2.5",
+    "@types/node": "^18.11.17",
+    "copyfiles": "^2.4.1",
+    "jest": "^29.5.0",
+    "npm-run-all": "^1.7.0",
+    "rimraf": "^5.0.1",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1"
+  },
+  "scripts": {
+    "sync-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/sync-all.ts",
+    "address-points": "ts-node --experimental-specifier-resolution=node --esm src/bin/address-points.ts",
+    "regions": "ts-node --experimental-specifier-resolution=node --esm src/bin/regions.ts",
+    "schools": "ts-node --experimental-specifier-resolution=node --esm src/bin/schools.ts",
+    "streets": "ts-node --experimental-specifier-resolution=node --esm src/bin/streets.ts",
+    "diagrams": "ts-node --experimental-specifier-resolution=node --esm src/bin/generate-syntax-diagrams.ts",
+    "clear-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/clear-all.ts",
+    "init-db": "ts-node --experimental-specifier-resolution=node --esm src/bin/init-db.ts",
+    "parse-ordinance": "ts-node --experimental-specifier-resolution=node --esm src/bin/parse-ordinance.ts",
+    "knex": "ts-node --experimental-specifier-resolution=node --esm src/bin/knex.ts",
+    "test": "node --experimental-vm-modules --no-warnings node_modules/jest/bin/jest.js -c=jest-esm.config.mjs --no-cache",
+    "ordinance-to-csv-rules": "node src/smd-to-csv/ordinance-to-csv-rules.js",
+    "clean": "rimraf dist",
+    "copyfiles": "copyfiles -u 1 src/address_points_init.db dist",
+    "build": "npm-run-all clean -p copyfiles build:*",
+    "build:types": "tsc --declaration --emitDeclarationOnly --outDir dist -p tsconfig.declarations.json",
+    "build:js": "tsc --outDir dist",
+    "prepare": "npm run build"
+  },
+  "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.9",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*",
+    "LICENSE",
+    "README.md"
+  ],
+  "directories": {
+    "example": "examples",
+    "test": "tests"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/maral/text-to-map.git"
+  },
+  "keywords": [
+    "streets",
+    "catchment areas",
+    "schools",
+    "map",
+    "geodata",
+    "address points",
+    "polygons"
+  ],
+  "author": "Marek Lisý",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/maral/text-to-map/issues"
+  },
+  "homepage": "https://github.com/maral/text-to-map#readme"
+}