@janekolszak/poland 1.0.3 → 1.0.6

package/src/compute.ts

@@ -1,22 +1,43 @@
-import { Region } from "./csvparse"
+import { LocalityType, Region, Locality } from "./csvparse"
+import { MultiKeyMap } from "./map"
 
 export interface NamesMap {
     [postcode: string]: Array<string>
 };
 
+export interface NamesMapTwoKeys {
+    [postcode: string]: NamesMap
+};
+
+export interface NamesMapThreeKeys {
+    [postcode: string]: NamesMapTwoKeys
+};
+export interface NamesMapFourKeys {
+    [postcode: string]: NamesMapThreeKeys
+};
+
 export interface Computed {
     voivodeships: string[]
     counties: NamesMap
-    municipalities: NamesMap
+    municipalities: MultiKeyMap
+    localities: MultiKeyMap
+    districts: MultiKeyMap
 }
 
-export function compute(regions: Array<Region>): Computed {
+export function compute(regions: Array<Region>, localities: Array<Locality>, localityTypes: Array<LocalityType>): Computed {
     let out: Computed = {
         voivodeships: [],
         counties: {},
-        municipalities: {},
+        municipalities: new MultiKeyMap(),
+        localities: new MultiKeyMap(),
+        districts: new MultiKeyMap()
     }
 
+    const locTypeIdMap: Map<string, string> = new Map(localityTypes.map(r => [r.name, r.id]))
+
+    const countyIdMap = new MultiKeyMap();
+    const municipalityIdMap = new MultiKeyMap();
+
     // Województwa
     out.voivodeships = regions.filter(r => r.type === "województwo").map(r => r.name)
 
@@ -28,32 +49,141 @@ export function compute(regions: Array<Region>): Computed {
             let d = out.counties[v!]
             d = d ? d : []
             out.counties[v!] = [...d, r.name]
+
+            countyIdMap.set([r.voivodeship, r.county], r.name)
         })
 
     // Gminy
-    out.voivodeships.forEach(voivodeship => {
-        const countiesIdMap: Map<string, string> = new Map(
-            regions
-                .filter(r => vivIdMap.get(r.voivodeship) === voivodeship)
-                .filter(r => r.type === "powiat" || r.type.indexOf("na prawach powiatu") >= 0)
-                .map(r => [r.county, r.name])
-        )
-        regions
-            .filter(r => vivIdMap.get(r.voivodeship) === voivodeship)
-            .filter(r => r.municipality !== "")
-            .filter(r => r.type !== "województwo")
-            .filter(r => r.type !== "powiat")
-            .filter(r => r.type.indexOf("na prawach powiatu") === -1)
-            .forEach(r => {
-                const v = countiesIdMap.get(r.county)
-                let d = out.municipalities[v!]
-                d = d ? d : []
-                if (d.includes(r.name)) {
-                    return
-                }
-                out.municipalities[v!] = [...d, r.name]
-            })
-    })
+    regions
+        .filter(r => r.voivodeship !== "")
+        .filter(r => r.county !== "")
+        .filter(r => r.municipality !== "")
+        .filter(r => r.type.startsWith("gmina"))
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+
+            let d = out.municipalities.get([v, c]) as Array<string>
+            d = d ? d : []
+            if (!d.includes(r.name)) {
+                out.municipalities.set([v, c], [...d, r.name])
+            }
+
+            municipalityIdMap.set([r.voivodeship, r.county, r.municipality], r.name)
+        })
+
+
+    // Miejscowosci
+    let localityTypeIds = [
+        locTypeIdMap.get("wieś"),
+        locTypeIdMap.get("kolonia"),
+        locTypeIdMap.get("osada"),
+        locTypeIdMap.get("osada leśna"),
+        locTypeIdMap.get("miasto")
+    ]
+
+    localities
+        .filter(r => localityTypeIds.includes(r.localityTypeId))
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+            const m = municipalityIdMap.get([r.voivodeship, r.county, r.municipality])
+
+            if (!v || !c || !m) {
+                console.error("Missing voivodeship, county or municipality for locality: " + r.name + " (" + r.voivodeship + ", " + r.county + ", " + r.municipality + ")")
+                return
+            }
+
+            let d = out.localities.get([v, c, m]) as Array<string>
+            d = d ? d : []
+            if (!d.includes(r.name)) {
+                out.localities.set([v, c, m], [...d, r.name])
+                out.districts.set([v, c, m, r.name], [])
+            }
+        })
+
+    // Dzielnice
+    const allLocalitiesIdMap = new Map(localities.map(r => [r.localityId, r.name]))
+
+    let districtIds = [
+        locTypeIdMap.get("dzielnica"),
+        locTypeIdMap.get("delegatura"),
+        locTypeIdMap.get("część miasta"),
+    ]
+
+    // let a = new Map(localities.map(r => [r.localityTypeId, true]))
+    // console.log(a)
+
+    localities
+        .filter(r => districtIds.includes(r.localityTypeId))
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+            const m = municipalityIdMap.get([r.voivodeship, r.county, r.municipality])
+            const l = allLocalitiesIdMap.get(r.baseLocalityId)
+
+            if (!v || !c || !m || !l) {
+                // console.error("Missing voivodeship, county, municipality or base locality for district: " + r.name + " (" + v + ", " + c + ", " + m + ", " + l + ")")
+                // console.error(r.voivodeship, r.county, r.municipality)
+                return
+            }
+
+            let d = out.districts.get([v, c, m, l]) as Array<string>
+            d = d ? d : []
+            if (r.baseLocalityId === r.localityId) {
+                out.districts.set([v, c, m, l], [...d])
+            } else if (!d.includes(r.name)) {
+                out.districts.set([v, c, m, l], [...d, r.name])
+            }
+        })
+
+    // Dzielnice Warszawy
+    regions
+        .filter(r => r.typeId === "8")
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+            const m = "Warszawa"
+            const l = "Warszawa"
+
+            if (!v || !c || !m || !l) {
+                console.error("4 Missing voivodeship, county, municipality or base locality for district: " + r.name + " (" + v + ", " + c + ", " + m + ", " + l + ")")
+                console.error(r.voivodeship, r.county, r.municipality)
+                return
+            }
+
+            let d = out.districts.get([v, c, m, l]) as Array<string>
+            d = d ? d : []
+            out.districts.set([v, c, m, l], [...d, r.name])
+        })
+
+
+    // 9 - delegatury miast: Kraków, Łódź, Poznań i Wrocław
+    regions
+        .filter(r => r.typeId === "9")
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+            const m = r.name.substring(0, r.name.indexOf('-'))
+            const l = r.name.substring(0, r.name.indexOf('-'))
+            const name = r.name.substring(r.name.indexOf('-') + 1)
+
+            if (!v || !c || !m || !l) {
+                console.error("4 Missing voivodeship, county, municipality or base locality for district: " + r.name + " (" + v + ", " + c + ", " + m + ", " + l + ")")
+                console.error(r.voivodeship, r.county, r.municipality)
+                return
+            }
+
+            let d = out.districts.get([v, c, m, l]) as Array<string>
+            d = d ? d : []
+            out.districts.set([v, c, m, l], [...d, name])
+        })
+    // console.log(out.districts)
+
+
+    out.municipalities.sortValues()
+    out.localities.sortValues()
+    out.districts.sortValues()
 
     return out
 }

package/src/csvparse.ts

@@ -8,9 +8,29 @@ export type Region = {
     county: string;
     municipality: string;
     type: string;
-    typeId: number;
+    typeId: string;
     name: string;
     date: string;
+    localityId: string;
+    baseLocalityId: string;
+};
+
+export type Locality = {
+    voivodeship: string
+    county: string;
+    municipality: string;
+    municipalityTypeId: string;
+    localityTypeId: string;
+    isLocalName: string;
+    name: string;
+    localityId: string;
+    baseLocalityId: string;
+    date: string;
+};
+
+export type LocalityType = {
+    id: string;
+    name: string;
 };
 
 function toTitleCase(str: String) {
@@ -44,3 +64,51 @@ export async function parseCsv() {
     await finished(parser);
     return records;
 };
+
+export async function parseLocalityCsv() {
+    const records: Locality[] = [];
+    const parser = fs
+        .createReadStream(args.localities)
+        .pipe(parse({
+            relax_quotes: true,
+            delimiter: ';',
+            skip_empty_lines: true,
+            record_delimiter: '\r\n',
+            columns: () => {
+                return ["voivodeship", "county", "municipality", "municipalityTypeId", "localityTypeId", "isLocalName", "name", "localityId", "baseLocalityId", "date"]
+            },
+        }))
+        .on('readable', function () {
+            let record; while ((record = parser.read()) !== null) {
+                // Work with each record
+                record.name = toTitleCase(record.name)
+                records.push(record);
+            }
+        });
+    await finished(parser);
+    return records;
+};
+
+export async function parseLocalityTypeCsv() {
+    const records: LocalityType[] = [];
+    const parser = fs
+        .createReadStream(args.types)
+        .pipe(parse({
+            relax_quotes: true,
+            delimiter: ';',
+            skip_empty_lines: true,
+            record_delimiter: '\r\n',
+            columns: () => {
+                return ["id", "name", "date"]
+            },
+        }))
+        .on('readable', function () {
+            let record; while ((record = parser.read()) !== null) {
+                // Work with each record
+                // record.name = toTitleCase(record.name)
+                records.push(record);
+            }
+        });
+    await finished(parser);
+    return records;
+};

package/src/generate.ts

@@ -5,33 +5,36 @@ import fs from 'fs';
 function genJson(c: Computed) {
     fs.writeFileSync(args.output + "/json/voivodeships.json", JSON.stringify(c.voivodeships))
     fs.writeFileSync(args.output + "/json/counties.json", JSON.stringify(c.counties))
-    fs.writeFileSync(args.output + "/json/municipalities.json", JSON.stringify(c.municipalities))
+    fs.writeFileSync(args.output + "/json/municipalities.json", JSON.stringify(c.municipalities.Get2Deep()))
+    fs.writeFileSync(args.output + "/json/localities.json", JSON.stringify(c.localities.Get3Deep()))
+    fs.writeFileSync(args.output + "/json/districts.json", JSON.stringify(c.districts.Get4Deep()))
+
 }
 
 function genGo(c: Computed) {
-    const voivodeships = c.voivodeships.map(v => `"${v}"`).join(",")
-    const counties = JSON.stringify(c.counties).replace(/[\[]+/g, "{").replace(/[\]']+/g, "}")
-    const municipalities = JSON.stringify(c.municipalities).replace(/[\[]+/g, "{").replace(/[\]']+/g, "}")
-
+    fs.copyFileSync(args.output + "/json/voivodeships.json", args.output + "/go/voivodeships.json")
+    fs.copyFileSync(args.output + "/json/counties.json", args.output + "/go/counties.json")
+    fs.copyFileSync(args.output + "/json/municipalities.json", args.output + "/go/municipalities.json")
+    fs.copyFileSync(args.output + "/json/localities.json", args.output + "/go/localities.json")
+    fs.copyFileSync(args.output + "/json/districts.json", args.output + "/go/districts.json")
     const data = `package poland
-
-var (
-    Voivodeships = []string{${voivodeships}}
-    Counties = map[string][]string${counties}
-    Municipalities = map[string][]string${municipalities}
-)`
-    fs.writeFileSync(args.output + "/go/data.go", data)
+import (
+    "embed"
+)
+    
+//go:embed *.json
+var FS embed.FS
+`
+    fs.writeFileSync(args.output + "/go/root.go", data)
 }
 
 function genTypescript(c: Computed) {
     const voivodeships = JSON.stringify(c.voivodeships)
     const counties = Object.entries(c.counties).map(data => `["${data[0]}", ${JSON.stringify(data[1])}]`).join(",")
-    const municipalities = Object.entries(c.municipalities).map(data => `["${data[0]}", ${JSON.stringify(data[1])}]`).join(",")
 
     const data = `
 export const voivodeships: Array<string> = ${voivodeships}
 export const counties = new Map<string,Array<string>>([${counties}])
-export const municipalities = new Map<string,Array<string>>([${municipalities}])
 `
     fs.writeFileSync(args.output + "/typescript/data.ts", data)
 }

package/src/map.ts

@@ -0,0 +1,112 @@
+import { NamesMapThreeKeys, NamesMapFourKeys, NamesMapTwoKeys } from "./compute";
+
+export class MultiKeyMap {
+    private map: Record<string, any> = {};
+
+    private getKey(key: string[]): string {
+        return key.join('|');
+    }
+
+    set(key: string[], value: any): void {
+        const strKey = this.getKey(key);
+        this.map[strKey] = value;
+    }
+
+    get(key: string[]): any | undefined {
+        const strKey = this.getKey(key);
+        return this.map[strKey];
+    }
+
+    delete(key: string[]): boolean {
+        const strKey = this.getKey(key);
+
+        if (strKey in this.map) {
+            delete this.map[strKey];
+            return true;
+        }
+
+        return false;
+    }
+
+    has(key: string[]): boolean {
+        const strKey = this.getKey(key);
+        return strKey in this.map;
+    }
+
+    get size(): number {
+        return Object.keys(this.map).length;
+    }
+
+    clear(): void {
+        this.map = {};
+    }
+
+    sortValues(): void {
+        for (const strKey in this.map) {
+            let value = this.map[strKey];
+            value.sort()
+        }
+    }
+
+    forEach(callbackfn: (keys: string[], value: any, map: MultiKeyMap) => void): void {
+        for (const strKey in this.map) {
+            const value = this.map[strKey];
+            const keys = strKey.split('|');
+            callbackfn(keys, value, this);
+        }
+    }
+
+    Get2Deep(): NamesMapTwoKeys {
+        var out: NamesMapTwoKeys = {}
+        this.forEach((keys, value) => {
+            const [v, c] = keys
+            if (!out[v]) {
+                out[v] = {}
+            }
+            if (!out[v][c]) {
+                out[v][c] = []
+            }
+            out[v][c].push(value)
+        })
+        return out
+    }
+
+    Get3Deep(): NamesMapThreeKeys {
+        var out: NamesMapThreeKeys = {}
+        this.forEach((keys, value) => {
+            const [v, c, m] = keys
+            if (!out[v]) {
+                out[v] = {}
+            }
+            if (!out[v][c]) {
+                out[v][c] = {}
+            }
+            if (!out[v][c][m]) {
+                out[v][c][m] = []
+            }
+            out[v][c][m].push(value)
+        })
+        return out
+    }
+
+    Get4Deep(): NamesMapFourKeys {
+        var out: NamesMapFourKeys = {}
+        this.forEach((keys, value) => {
+            const [v, c, m, l] = keys
+            if (!out[v]) {
+                out[v] = {}
+            }
+            if (!out[v][c]) {
+                out[v][c] = {}
+            }
+            if (!out[v][c][m]) {
+                out[v][c][m] = {}
+            }
+            if (!out[v][c][m][l]) {
+                out[v][c][m][l] = []
+            }
+            out[v][c][m][l].push(value)
+        })
+        return out
+    }
+}

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
@@ -27,7 +27,7 @@
     /* Modules */
     "module": "CommonJS",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -48,8 +48,8 @@
     // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    // "outFile": "./out.js",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */