text-to-map 1.0.3 → 1.0.5

package/dist/bin/address-points.js

@@ -1,6 +1,6 @@
-import { downloadAndImportAllLatestAddressPoints } from "../open-data-sync/address-points";
+import { downloadAndImportAddressPoints } from "../open-data-sync/address-points";
 console.time("downloadAndImportAllLatestAddressPoints");
-downloadAndImportAllLatestAddressPoints()
+downloadAndImportAddressPoints()
     .then(() => {
     console.timeEnd("downloadAndImportAllLatestAddressPoints");
 })

package/dist/bin/schools.js

@@ -1,5 +1,5 @@
-import { downloadAndImportAllSchools } from "../open-data-sync/schools";
-downloadAndImportAllSchools({ tmpDir: "tmp" })
+import { downloadAndImportSchools } from "../open-data-sync/schools";
+downloadAndImportSchools({ tmpDir: "tmp" })
     .then(() => {
     console.log("Completed");
 })

package/dist/bin/streets.js

@@ -1,6 +1,6 @@
-import { downloadAndImportAllStreets } from "../open-data-sync/streets";
+import { downloadAndImportStreets } from "../open-data-sync/streets";
 console.time("downloadAndImportAllStreets");
-downloadAndImportAllStreets({})
+downloadAndImportStreets({})
     .then(() => {
     console.timeEnd("downloadAndImportAllStreets");
 })

package/dist/db/address-points.js

@@ -1,4 +1,4 @@
-import jtsk2wgs84 from "@arodax/jtsk2wgs84";
+import jtsk2wgs84 from "../utils/jtsk2wgs84";
 import { AddressPointType, createSingleLineAddress } from "czech-address";
 import { SeriesType, isNegativeSeriesSpec, isRange, isSeriesSpecArray, isWholeMunicipalitySmdLine, } from "../street-markdown/types";
 import { findClosestString } from "../utils/helpers";
@@ -216,7 +216,7 @@ const filterAddressPointsByRanges = (addressPoints, seriesSpec) => {
             var _a;
             if (isRange(range)) {
                 const number = getNumberByType(seriesSpec.type, addressPoint);
-                return (isInRange(number, seriesSpec.type !== SeriesType.Descriptive
+                return (isInRange(number, seriesSpec.type !== SeriesType.Description
                     ? (_a = addressPoint.orientationalNumberLetter) !== null && _a !== void 0 ? _a : null
                     : null, range) && fitsType(number, seriesSpec.type));
             }
@@ -252,13 +252,13 @@ export const isInRange = (number, letter, range) => {
     return satisfiesFrom && satisfiesTo;
 };
 export const fitsType = (number, type) => {
-    return (type === SeriesType.Descriptive ||
+    return (type === SeriesType.Description ||
         type === SeriesType.All ||
         (type === SeriesType.Odd && number % 2 === 1) ||
         (type === SeriesType.Even && number % 2 === 0));
 };
 export const equalsFullStreetNumber = (fullStreetNumber, addressPoint) => {
-    return (fullStreetNumber.descriptiveNumber.number === addressPoint.houseNumber &&
+    return (fullStreetNumber.descriptionNumber.number === addressPoint.houseNumber &&
         fullStreetNumber.orientationalNumber.number ===
             addressPoint.orientationalNumber &&
         ((!fullStreetNumber.orientationalNumber.letter &&
@@ -268,7 +268,7 @@ export const equalsFullStreetNumber = (fullStreetNumber, addressPoint) => {
 };
 const getNumberByType = (type, addressPoint) => {
     var _a;
-    return type === SeriesType.Descriptive
+    return type === SeriesType.Description
         ? addressPoint.houseNumber
         : (_a = addressPoint.orientationalNumber) !== null && _a !== void 0 ? _a : null;
 };
@@ -303,7 +303,7 @@ const rowToAddressPoint = (row) => {
     if (row.district_name !== null) {
         point.district = row.district_name;
     }
-    if (row.prague_district !== null) {
+    if (row.prague_district_name !== null) {
         point.pragueDistrict = row.prague_district_name;
     }
     point.address = createSingleLineAddress(point);

package/dist/index.d.ts

@@ -1,4 +1,20 @@
-export { downloadAndImportAllLatestAddressPoints, importAllLatestAddressPoints, deleteDb } from "./open-data-sync/address-points";
-export { downloadAndImportAllSchools, deleteSchoolsXmlFile } from "./open-data-sync/schools";
-export { downloadAndImportAllStreets } from "./open-data-sync/streets";
-export { parseOrdinanceToAddressPoints } from "./street-markdown/smd";
+import { downloadAndImportAddressPoints, deleteDb } from "./open-data-sync/address-points";
+import { downloadAndImportRegions } from "./open-data-sync/regions";
+import { downloadAndImportSchools } from "./open-data-sync/schools";
+import { downloadAndImportStreets } from "./open-data-sync/streets";
+import { parseOrdinanceToAddressPoints } from "./street-markdown/smd";
+import { OpenDataSyncOptions } from "./utils/helpers";
+export * from "./street-markdown/types";
+/**
+ * Download and import all open data to SQLite DB. The DB file will be located
+ * in the `dataDir` folder.
+ * @param options Options for the sync
+ * @param syncStreets Streets sync takes around 1 hour, so it might be skipped.
+ * ```typescript
+ * import { downloadAndImportEverything } from "text-to-map";
+ *
+ * await downloadAndImportEverything({ tmpDir: "./tmp", dataDir: "./data" });
+ * ```
+ */
+export declare function downloadAndImportEverything(options?: OpenDataSyncOptions, syncStreets?: boolean): Promise<void>;
+export { downloadAndImportAddressPoints, deleteDb, downloadAndImportSchools, downloadAndImportStreets, downloadAndImportRegions, parseOrdinanceToAddressPoints, };

package/dist/index.js

@@ -1,4 +1,37 @@
-export { downloadAndImportAllLatestAddressPoints, importAllLatestAddressPoints, deleteDb } from "./open-data-sync/address-points";
-export { downloadAndImportAllSchools, deleteSchoolsXmlFile } from "./open-data-sync/schools";
-export { downloadAndImportAllStreets } from "./open-data-sync/streets";
-export { parseOrdinanceToAddressPoints } from "./street-markdown/smd";
+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 { downloadAndImportAddressPoints, deleteDb, } from "./open-data-sync/address-points";
+import { downloadAndImportRegions } from "./open-data-sync/regions";
+import { downloadAndImportSchools } from "./open-data-sync/schools";
+import { downloadAndImportStreets } from "./open-data-sync/streets";
+import { parseOrdinanceToAddressPoints } from "./street-markdown/smd";
+export * from "./street-markdown/types";
+/**
+ * Download and import all open data to SQLite DB. The DB file will be located
+ * in the `dataDir` folder.
+ * @param options Options for the sync
+ * @param syncStreets Streets sync takes around 1 hour, so it might be skipped.
+ * ```typescript
+ * import { downloadAndImportEverything } from "text-to-map";
+ *
+ * await downloadAndImportEverything({ tmpDir: "./tmp", dataDir: "./data" });
+ * ```
+ */
+export function downloadAndImportEverything(options = {}, syncStreets = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield downloadAndImportAddressPoints(options);
+        yield downloadAndImportSchools(options);
+        yield downloadAndImportRegions(options);
+        if (syncStreets) {
+            yield downloadAndImportStreets(options);
+        }
+    });
+}
+export { downloadAndImportAddressPoints, deleteDb, downloadAndImportSchools, downloadAndImportStreets, downloadAndImportRegions, parseOrdinanceToAddressPoints, };

package/dist/open-data-sync/address-points.d.ts

@@ -1,4 +1,3 @@
 import { OpenDataSyncOptions } from "../utils/helpers";
-export declare const downloadAndImportAllLatestAddressPoints: (options?: OpenDataSyncOptions) => Promise<void>;
-export declare const importAllLatestAddressPoints: (options?: OpenDataSyncOptions) => Promise<void>;
+export declare const downloadAndImportAddressPoints: (options?: OpenDataSyncOptions) => Promise<void>;
 export declare const deleteDb: (options?: OpenDataSyncOptions) => void;

package/dist/open-data-sync/address-points.js

@@ -54,17 +54,13 @@ const importDataToDb = (options) => __awaiter(void 0, void 0, void 0, function*
     console.log(`Import completed. Total imported rows: ${total}`);
 });
 const getExtractionFolder = (options) => join(options.tmpDir, options.addressPointsCsvFolderName);
-export const downloadAndImportAllLatestAddressPoints = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+export const downloadAndImportAddressPoints = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const completeOptions = prepareOptions(options);
     const datasetFeedLink = yield getLatestUrlFromAtomFeed(completeOptions.addressPointsAtomUrl);
     const zipUrl = yield getLatestUrlFromAtomFeed(datasetFeedLink);
     yield downloadAndUnzip(zipUrl, completeOptions);
     yield importDataToDb(completeOptions);
 });
-export const importAllLatestAddressPoints = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const completeOptions = prepareOptions(options);
-    yield importDataToDb(completeOptions);
-});
 export const deleteDb = (options = {}) => {
     const completeOptions = prepareOptions(options);
     if (existsSync(completeOptions.dbFilePath)) {

package/dist/open-data-sync/schools.d.ts

@@ -1,3 +1,3 @@
 import { OpenDataSyncOptions } from "../utils/helpers";
-export declare const downloadAndImportAllSchools: (options: OpenDataSyncOptions) => Promise<void>;
+export declare const downloadAndImportSchools: (options: OpenDataSyncOptions) => Promise<void>;
 export declare const deleteSchoolsXmlFile: (options?: OpenDataSyncOptions) => void;

package/dist/open-data-sync/schools.js

@@ -303,7 +303,7 @@ const importDataToDb = (options, saveFoundersToCsv = false, saveSchoolsWithoutRu
 const getXmlFilePath = (options) => {
     return join(options.tmpDir, options.schoolsXmlFileName);
 };
-export const downloadAndImportAllSchools = (options) => __awaiter(void 0, void 0, void 0, function* () {
+export const downloadAndImportSchools = (options) => __awaiter(void 0, void 0, void 0, function* () {
     const runOptions = prepareOptions(options);
     yield downloadXml(runOptions);
     yield importDataToDb(runOptions, false, true);

package/dist/open-data-sync/streets.d.ts

@@ -1,2 +1,2 @@
 import { OpenDataSyncOptions } from "../utils/helpers";
-export declare const downloadAndImportAllStreets: (options: OpenDataSyncOptions) => Promise<void>;
+export declare const downloadAndImportStreets: (options: OpenDataSyncOptions) => Promise<void>;

package/dist/open-data-sync/streets.js

@@ -45,7 +45,8 @@ const importDataToDb = (data) => __awaiter(void 0, void 0, void 0, function* ()
     }
     insertStreetsFromDbf(data);
 });
-export const downloadAndImportAllStreets = (options) => __awaiter(void 0, void 0, void 0, function* () {
+export const downloadAndImportStreets = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log("Starting to download and import streets. This takes up to 1 hour.");
     const completeOptions = prepareOptions(options);
     initDb(completeOptions);
     prepareFolders(completeOptions);

package/dist/street-markdown/smd-parser.js

@@ -178,7 +178,7 @@ export class SmdParser extends EmbeddedActionsParser {
                 {
                     ALT: () => {
                         this.CONSUME3(DescriptiveType);
-                        type = SeriesType.Descriptive;
+                        type = SeriesType.Description;
                     },
                 },
             ]);
@@ -265,7 +265,7 @@ export class SmdParser extends EmbeddedActionsParser {
                     },
                     {
                         ALT: () => {
-                            type = SeriesType.Descriptive;
+                            type = SeriesType.Description;
                             this.CONSUME(DescriptiveType);
                         },
                     },
@@ -308,7 +308,7 @@ export class SmdParser extends EmbeddedActionsParser {
                     },
                     {
                         ALT: () => {
-                            type = SeriesType.Descriptive;
+                            type = SeriesType.Description;
                             this.CONSUME(DescriptiveType);
                         },
                     },
@@ -321,7 +321,7 @@ export class SmdParser extends EmbeddedActionsParser {
             const descriptiveNumber = parseRichNumber(this.CONSUME(Number).image);
             this.CONSUME(Slash);
             const orientationNumber = parseRichNumber(this.CONSUME2(Number).image);
-            return { descriptiveNumber, orientationalNumber: orientationNumber };
+            return { descriptionNumber: descriptiveNumber, orientationalNumber: orientationNumber };
         });
         this.performSelfAnalysis();
     }

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

@@ -32,7 +32,7 @@ export interface RichNumber {
     letter?: string;
 }
 export interface FullStreetNumber {
-    descriptiveNumber: RichNumber;
+    descriptionNumber: RichNumber;
     orientationalNumber: RichNumber;
 }
 export declare const isFullStreetNumber: (something: RangeSpec | FullStreetNumber) => something is FullStreetNumber;
@@ -41,7 +41,7 @@ export declare enum SeriesType {
     Even = 0,
     Odd = 1,
     All = 2,
-    Descriptive = 3
+    Description = 3
 }
 export interface AddressPoint extends CzechAddressPoint {
     id: number;

package/dist/street-markdown/types.js

@@ -8,6 +8,6 @@ export var SeriesType;
     SeriesType[SeriesType["Even"] = 0] = "Even";
     SeriesType[SeriesType["Odd"] = 1] = "Odd";
     SeriesType[SeriesType["All"] = 2] = "All";
-    SeriesType[SeriesType["Descriptive"] = 3] = "Descriptive";
+    SeriesType[SeriesType["Description"] = 3] = "Description";
 })(SeriesType || (SeriesType = {}));
 export const isAddressPoint = (something) => something.hasOwnProperty("id");

package/dist/utils/jtsk2wgs84.d.ts

@@ -0,0 +1,17 @@
+export interface ConversionResult {
+    jtsk_x: number;
+    jtsk_y: number;
+    lat: number;
+    lon: number;
+    altitude: number;
+}
+/**
+ * Convert JTSK to WGS84 - taken from @arodax/jtsk2wgs84 package that had some
+ * import issues.
+ *
+ * @param x
+ * @param y
+ * @param h
+ * @return {{jtsk_x: number, jtsk_y: number, lon: number, lat: number, altitude: number}}
+ */
+export default function jtsk2wgs84(x: number, y: number, h?: number): ConversionResult;

package/dist/utils/jtsk2wgs84.js

@@ -0,0 +1,80 @@
+/**
+ * Convert JTSK to WGS84 - taken from @arodax/jtsk2wgs84 package that had some
+ * import issues.
+ *
+ * @param x
+ * @param y
+ * @param h
+ * @return {{jtsk_x: number, jtsk_y: number, lon: number, lat: number, altitude: number}}
+ */
+export default function jtsk2wgs84(x, y, h = 200) {
+    const originalX = x;
+    const originalY = y;
+    let a = 6377397.15508;
+    let e = 0.081696831215303;
+    let n = 0.97992470462083;
+    let uRo = 12310230.12797036;
+    let sinUQ = 0.863499969506341;
+    let cosUQ = 0.504348889819882;
+    let sinVQ = 0.420215144586493;
+    let cosVQ = 0.907424504992097;
+    let alpha = 1.000597498371542;
+    let k = 1.003419163966575;
+    let ro = Math.sqrt(x * x + y * y);
+    let epsilon = 2 * Math.atan(y / (ro + x));
+    let D = epsilon / n;
+    let S = 2 * Math.atan(Math.exp((1 / n) * Math.log(uRo / ro))) - Math.PI / 2;
+    let sinS = Math.sin(S);
+    let cosS = Math.cos(S);
+    let sinU = sinUQ * sinS - cosUQ * cosS * Math.cos(D);
+    let cosU = Math.sqrt(1 - sinU * sinU);
+    let sinDV = (Math.sin(D) * cosS) / cosU;
+    let cosDV = Math.sqrt(1 - sinDV * sinDV);
+    let sinV = sinVQ * cosDV - cosVQ * sinDV;
+    let cosV = cosVQ * cosDV + sinVQ * sinDV;
+    let lJtsk = (2 * Math.atan(sinV / (1 + cosV))) / alpha;
+    let t = Math.exp((2 / alpha) * Math.log((1 + sinU) / cosU / k));
+    let pom = (t - 1) / (t + 1);
+    let sinB = pom;
+    do {
+        sinB = pom;
+        pom = t * Math.exp(e * Math.log((1 + e * sinB) / (1 - e * sinB)));
+        pom = (pom - 1) / (pom + 1);
+    } while (Math.abs(pom - sinB) > 1e-15);
+    let bJtsk = Math.atan(pom / Math.sqrt(1 - pom * pom));
+    let f1 = 299.152812853;
+    let e2 = 1 - (1 - 1 / f1) * (1 - 1 / f1);
+    ro = a / Math.sqrt(1 - e2 * Math.sin(bJtsk) * Math.sin(bJtsk));
+    x = (ro + h) * Math.cos(bJtsk) * Math.cos(lJtsk);
+    y = (ro + h) * Math.cos(bJtsk) * Math.sin(lJtsk);
+    let z = ((1 - e2) * ro + h) * Math.sin(bJtsk);
+    let dx = 570.69;
+    let dy = 85.69;
+    let dz = 462.84;
+    let wz = ((-5.2611 / 3600) * Math.PI) / 180;
+    let wy = ((-1.58676 / 3600) * Math.PI) / 180;
+    let wx = ((-4.99821 / 3600) * Math.PI) / 180;
+    let m = 3.543e-6;
+    let xn = dx + (1 + m) * (x + wz * y - wy * z);
+    let yn = dy + (1 + m) * (-wz * x + y + wx * z);
+    let zn = dz + (1 + m) * (wy * x - wx * y + z);
+    a = 6378137.0;
+    f1 = 298.257223563;
+    let aB = f1 / (f1 - 1);
+    let p = Math.sqrt(xn * xn + yn * yn);
+    e2 = 1 - (1 - 1 / f1) * (1 - 1 / f1);
+    let theta = Math.atan((zn * aB) / p);
+    let st = Math.sin(theta);
+    let ct = Math.cos(theta);
+    t = (zn + e2 * aB * a * st * st * st) / (p - e2 * a * ct * ct * ct);
+    let B = Math.atan(t);
+    let L = 2 * Math.atan(yn / (p + xn));
+    h = Math.sqrt(1 + t * t) * (p - a / Math.sqrt(1 + (1 - e2) * t * t));
+    return {
+        jtsk_x: originalX,
+        jtsk_y: originalY,
+        lat: (B / Math.PI) * 180,
+        lon: (L / Math.PI) * 180,
+        altitude: Math.round(h * 100) / 100,
+    };
+}

package/package.json

@@ -1,7 +1,6 @@
 {
   "type": "module",
   "dependencies": {
-    "@arodax/jtsk2wgs84": "^1.0.2",
     "@turf/distance": "^6.5.0",
     "adm-zip": "^0.5.9",
     "better-sqlite3": "^8.0.1",
@@ -31,7 +30,6 @@
   },
   "scripts": {
     "address-points": "ts-node --experimental-specifier-resolution=node --esm src/bin/address-points.ts",
-    "address-points-import-only": "ts-node --experimental-specifier-resolution=node --esm src/bin/address-points-import-only.ts",
     "schools": "ts-node --experimental-specifier-resolution=node --esm src/bin/schools.ts",
     "clear-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/clear-all.ts",
     "parse-ordinance": "ts-node --experimental-specifier-resolution=node --esm src/bin/parse-ordinance.ts",
@@ -39,7 +37,7 @@
     "streets": "ts-node --experimental-specifier-resolution=node --esm src/bin/streets.ts",
     "regions": "ts-node --experimental-specifier-resolution=node --esm src/bin/regions.ts",
     "dbf": "ts-node --experimental-specifier-resolution=node --esm src/bin/dbf.ts",
-    "test": "jest",
+    "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",
@@ -50,7 +48,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.0.3",
+  "version": "1.0.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [

package/dist/bin/address-points-import-only.d.ts

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

package/dist/bin/address-points-import-only.js

@@ -1,14 +0,0 @@
-import { importAllLatestAddressPoints } from "../open-data-sync/address-points";
-console.time("importOnly");
-importAllLatestAddressPoints({})
-    .then(() => {
-    console.timeEnd("importOnly");
-})
-    .catch((error) => {
-    if (error.hasOwnProperty("stack")) {
-        console.log(error, error.stack);
-    }
-    else {
-        console.log(error);
-    }
-});