text-to-map 1.1.26 → 1.1.28

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

@@ -1,4 +1,4 @@
 import { Municipality } from "./types";
 import { FeatureCollection, MultiPolygon, Polygon } from "@turf/helpers";
 export declare const municipalityToPolygons: (municipality: Municipality) => Promise<FeatureCollection>;
-export declare const createPolygons: (municipality: Municipality, cityPolygons: FeatureCollection<Polygon | MultiPolygon>[]) => FeatureCollection;
+export declare const createPolygons: (municipality: Municipality, cityPolygons: Record<number, FeatureCollection<Polygon | MultiPolygon>>) => FeatureCollection;

package/dist/street-markdown/polygons.js

@@ -14,13 +14,12 @@ import { toMercator, toWgs84 } from "@turf/projection";
 import union from "@turf/union";
 import { getCityPolygonGeojsons } from "../db/cities";
 import truncate from "@turf/truncate";
-const unmappedIzo = "unmapped";
 export const municipalityToPolygons = (municipality) => __awaiter(void 0, void 0, void 0, function* () {
     const cityPolygons = yield getCityPolygonGeojsons(municipality.cityCodes);
-    return createPolygons(municipality, Object.values(cityPolygons));
+    return createPolygons(municipality, cityPolygons);
 });
 export const createPolygons = (municipality, cityPolygons) => {
-    const citiesMultipolygon = createCitiesMultipolygon(cityPolygons);
+    const citiesMultipolygon = createCitiesMultipolygon(Object.values(cityPolygons));
     const uniquePoints = new Map();
     for (const school of municipality.schools) {
         for (const point of school.addresses) {
@@ -32,9 +31,6 @@ export const createPolygons = (municipality, cityPolygons) => {
             }
         }
     }
-    for (const point of municipality.unmappedPoints) {
-        addPoint(uniquePoints, point, unmappedIzo);
-    }
     const points = {
         type: "FeatureCollection",
         features: Array.from(uniquePoints.values()),
@@ -42,8 +38,12 @@ export const createPolygons = (municipality, cityPolygons) => {
     const polygons = d3DelaunayVoronoi(points);
     const unitedPolygons = [];
     let colorIndex = 0;
-    for (const school of [...municipality.schools, { izo: unmappedIzo }]) {
+    for (const school of municipality.schools) {
         const schoolPolygons = polygons.features.filter((polygon) => polygon.properties.schools.includes(school.izo));
+        if (school.isWholeMunicipality) {
+            // TODO: in future add support for districts
+            schoolPolygons.push(...cityPolygons[municipality.cityOrDistrictCode].features);
+        }
         if (schoolPolygons.length === 0) {
             continue;
         }
@@ -52,7 +52,7 @@ export const createPolygons = (municipality, cityPolygons) => {
             : schoolPolygons[0], citiesMultipolygon);
         unitedPolygons.push(Object.assign(Object.assign({}, schoolPolygon), { properties: {
                 schoolIzo: school.izo,
-                colorIndex: school.izo === unmappedIzo ? -1 : colorIndex,
+                colorIndex,
             } }));
         colorIndex++;
     }
@@ -86,15 +86,15 @@ const d3DelaunayVoronoi = (points) => {
     const voronoi = delaunay.voronoi(bbox);
     return {
         type: "FeatureCollection",
-        features: Array.from(voronoi.cellPolygons()).map((polygon, i) => ({
+        features: Array.from(voronoi.cellPolygons()).map((polygon) => ({
             type: "Feature",
             geometry: {
                 type: "Polygon",
                 coordinates: [polygon.map((p) => toWgs84(p))],
             },
             properties: {
-                schools: points.features[i].properties.schools,
-                index: i,
+                schools: points.features[polygon.index].properties.schools,
+                index: polygon.index,
                 neighbors: new Set(voronoi.neighbors(polygon.index)),
             },
         })),

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

@@ -1,5 +1,5 @@
 import { Founder } from "../db/types";
-import { ErrorCallbackParams, IntermediateMunicipality, IntermediateSchool, Municipality, IntermediateMunicipalityResult, ProcessLineCallbackParams, SmdError, SmdState } from "./types";
+import { ErrorCallbackParams, IntermediateMunicipality, IntermediateMunicipalityResult, IntermediateSchool, Municipality, ProcessLineCallbackParams, SmdError, SmdState } from "./types";
 interface ParseOrdinanceProps {
     lines: string[];
     initialState?: Partial<SmdState>;

package/dist/street-markdown/smd.js

@@ -66,11 +66,17 @@ export const convertMunicipality = (municipality) => {
                 name: school.name,
                 izo: school.izo,
                 addresses: Array.from(school.addressMap.values()).filter((point) => point.lat !== 0 && point.lng !== 0),
+                isWholeMunicipality: school.isWholeMunicipality,
                 position: school.position,
             };
         }),
+        cityOrDistrictCode: municipality.founder.cityOrDistrictCode,
+        municipalityType: municipality.founder.municipalityType === MunicipalityType.City
+            ? "city"
+            : "district",
         cityCodes: [...new Set(municipality.cityCodes)],
         districtCodes: [...new Set(municipality.districtCodes)],
+        wholeMunicipalityPoints: municipality.wholeMunicipalityPoints,
         unmappedPoints: municipality.unmappedPoints.filter((point) => point.lat !== 0 && point.lng !== 0),
     };
 };
@@ -194,11 +200,26 @@ const processWholeMunicipalityLine = ({ line, state, lineNumber, onError, }) =>
         else {
             state.currentMunicipality.districtCodes.push(municipality.code);
         }
-        const addressPoints = yield findAddressPoints({
-            type: "wholeMunicipality",
-            municipality,
-        });
-        addAddressPointsToSchool(state.currentSchool, addressPoints, lineNumber);
+        if (state.currentMunicipality.founder.cityOrDistrictCode ===
+            municipality.code &&
+            state.currentMunicipality.founder.municipalityType === municipality.type) {
+            // whole municipality, since there is higher likelyhood of multiple schools having
+            // the whole municipality area, we will add the address points to the municipality
+            if (state.currentMunicipality.wholeMunicipalityPoints.length === 0) {
+                state.currentMunicipality.wholeMunicipalityPoints = (yield findAddressPoints({
+                    type: "wholeMunicipality",
+                    municipality,
+                })).map((point) => mapAddressPointForExport(point));
+            }
+            state.currentSchool.isWholeMunicipality = true;
+        }
+        else {
+            const addressPoints = yield findAddressPoints({
+                type: "wholeMunicipality",
+                municipality,
+            });
+            addAddressPointsToSchool(state.currentSchool, addressPoints, lineNumber);
+        }
     }
 });
 const addAddressPointsToSchool = (school, addressPoints, lineNumber) => {
@@ -293,6 +314,9 @@ const addRestOfMunicipalityToUnmappedPoints = (state) => __awaiter(void 0, void
     state.currentMunicipality.unmappedPoints = (yield getRestOfMunicipality(state)).map((point) => mapAddressPointForExport(point));
 });
 const getRestOfMunicipality = (state) => __awaiter(void 0, void 0, void 0, function* () {
+    if (state.currentMunicipality.wholeMunicipalityPoints.length > 0) {
+        return [];
+    }
     // get all address points for current municipality
     const allPoints = yield findAddressPoints({
         type: "wholeMunicipality",
@@ -326,12 +350,15 @@ const getNewMunicipality = (founder, errors) => ({
         municipalityName: founder ? founder.name : "Neznámá obec",
         founder,
         schools: [],
+        cityOrDistrictCode: founder ? founder.cityOrDistrictCode : 0,
+        municipalityType: founder.municipalityType === MunicipalityType.City ? "city" : "district",
         cityCodes: founder.municipalityType === MunicipalityType.City
             ? [founder.cityOrDistrictCode]
             : [],
         districtCodes: founder.municipalityType === MunicipalityType.District
             ? [founder.cityOrDistrictCode]
             : [],
+        wholeMunicipalityPoints: [],
         unmappedPoints: [],
     },
     errors,
@@ -340,6 +367,7 @@ export const getNewSchool = (name, founder, lineNumber, onError) => __awaiter(vo
     let exportSchool = {
         name,
         izo: "",
+        isWholeMunicipality: false,
         addresses: [],
     };
     if (founder !== null) {
@@ -353,7 +381,7 @@ export const getNewSchool = (name, founder, lineNumber, onError) => __awaiter(vo
             if (school.locations.length > 0) {
                 const position = yield getAddressPointById(school.locations[0].addressPointId);
                 if (position !== null) {
-                    exportSchool.position = position;
+                    exportSchool.position = mapAddressPointForExport(position);
                 }
             }
         }

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

@@ -60,6 +60,7 @@ export interface School {
     name: string;
     izo: string;
     position?: AddressPoint | ExportAddressPoint;
+    isWholeMunicipality: boolean;
     addresses: ExportAddressPoint[];
 }
 export interface IntermediateSchool extends School {
@@ -67,9 +68,12 @@ export interface IntermediateSchool extends School {
 }
 export interface Municipality {
     municipalityName: string;
+    cityOrDistrictCode: number;
+    municipalityType: "city" | "district";
     cityCodes: number[];
     districtCodes: number[];
     schools: School[];
+    wholeMunicipalityPoints: ExportAddressPoint[];
     unmappedPoints: ExportAddressPoint[];
 }
 export interface DbMunicipalityResult {

package/package.json

@@ -43,21 +43,21 @@
     "npm-run-all": "^1.7.0",
     "rimraf": "^5.0.1",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1"
+    "tsx": "^4.7.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",
-    "cities": "ts-node --experimental-specifier-resolution=node --esm src/bin/cities.ts",
-    "polygons": "ts-node --experimental-specifier-resolution=node --esm src/bin/polygons.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",
+    "sync-all": "tsx src/bin/sync-all.ts",
+    "address-points": "tsx src/bin/address-points.ts",
+    "regions": "tsx src/bin/regions.ts",
+    "cities": "tsx src/bin/cities.ts",
+    "polygons": "tsx src/bin/polygons.ts",
+    "schools": "tsx src/bin/schools.ts",
+    "streets": "tsx src/bin/streets.ts",
+    "diagrams": "tsx src/bin/generate-syntax-diagrams.ts",
+    "clear-all": "tsx src/bin/clear-all.ts",
+    "init-db": "tsx src/bin/init-db.ts",
+    "parse-ordinance": "tsx src/bin/parse-ordinance.ts",
+    "knex": "tsx 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",
@@ -69,7 +69,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.26",
+  "version": "1.1.28",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [