@janekolszak/poland 1.0.7 → 1.0.8

package/index.ts

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { parseCsv, parseLocalityCsv, parseLocalityTypeCsv } from "./src/csvparse"
+import { parseCsv, parseLocalityCsv, parseLocalityTypeCsv, parseStreetsCsv } from "./src/csvparse"
 import { compute } from "./src/compute"
 import { generate } from "./src/generate"
 
 
 (() => {
-    Promise.all([parseCsv(), parseLocalityCsv(), parseLocalityTypeCsv()])
-        .then(r => compute(r[0], r[1], r[2]))
+    Promise.all([parseCsv(), parseLocalityCsv(), parseLocalityTypeCsv(), parseStreetsCsv()])
+        .then(r => compute(r[0], r[1], r[2], r[3]))
         .then(generate)
 })();

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@janekolszak/poland",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Administrative division of Poland",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "generate": "tsc && node ./dist/index.js -o ./generated -i ./TERC_Urzedowy_2023-02-12.csv -l ./SIMC_Urzedowy_2023-02-12.csv -t ./WMRODZ_2023-02-12.csv"
+    "generate": "tsc && node ./dist/index.js -o ./generated -i ./TERC_Urzedowy_2023-02-12.csv -l ./SIMC_Urzedowy_2023-02-12.csv -t ./WMRODZ_2023-02-12.csv -s ./ULIC_Adresowy_2023-02-19.csv"
   },
   "repository": {
     "type": "git",

package/src/args.ts

@@ -3,6 +3,7 @@ import { parse } from 'ts-command-line-args';
 export interface Args {
     input: string;
     localities: string;
+    streets: string;
     types: string;
     output: string;
     help?: boolean;
@@ -12,6 +13,7 @@ export const args = parse<Args>(
     {
         input: { type: String, alias: 'i', description: 'Input TERC CSV as downloaded from https://eteryt.stat.gov.pl/eTeryt/rejestr_teryt/udostepnianie_danych/baza_teryt/uzytkownicy_indywidualni/pobieranie/pliki_pelne.aspx' },
         localities: { type: String, alias: 'l', description: 'Input SIMC CSV as downloaded from https://eteryt.stat.gov.pl/eTeryt/rejestr_teryt/udostepnianie_danych/baza_teryt/uzytkownicy_indywidualni/pobieranie/pliki_pelne.aspx' },
+        streets: { type: String, alias: 's', description: 'Input ULIC CSV as downloaded from https://eteryt.stat.gov.pl/eTeryt/rejestr_teryt/udostepnianie_danych/baza_teryt/uzytkownicy_indywidualni/pobieranie/pliki_pelne.aspx' },
         types: { type: String, alias: 't', description: 'Input WMRODZ CSV as downloaded from https://eteryt.stat.gov.pl/eTeryt/rejestr_teryt/udostepnianie_danych/baza_teryt/uzytkownicy_indywidualni/pobieranie/pliki_pelne.aspx' },
         output: { type: String, alias: 'o', description: 'Output file path' },
         help: { type: Boolean, optional: true, alias: 'h', description: 'Prints this usage guide' },

package/src/compute.ts

@@ -1,4 +1,4 @@
-import { LocalityType, Region, Locality } from "./csvparse"
+import { LocalityType, Region, Locality, Street } from "./csvparse"
 import { MultiKeyMap } from "./map"
 
 export interface NamesMap {
@@ -12,25 +12,43 @@ export interface NamesMapTwoKeys {
 export interface NamesMapThreeKeys {
     [postcode: string]: NamesMapTwoKeys
 };
+
 export interface NamesMapFourKeys {
     [postcode: string]: NamesMapThreeKeys
 };
 
+export interface NamesMapFiveKeys {
+    [postcode: string]: NamesMapFourKeys
+};
+
 export interface Computed {
     voivodeships: string[]
     counties: NamesMap
     municipalities: MultiKeyMap
     localities: MultiKeyMap
     districts: MultiKeyMap
+    streetsLocalities: MultiKeyMap
+    streetsDistricts: MultiKeyMap
 }
 
-export function compute(regions: Array<Region>, localities: Array<Locality>, localityTypes: Array<LocalityType>): Computed {
+// RODZ_GMI
+// 1 - gmina miejska,
+// 2 - gmina wiejska,
+// 3 - gmina miejsko-wiejska,
+// 4 - miasto w gminie miejsko-wiejskiej,
+// 5 - obszar wiejski w gminie miejsko-wiejskiej,
+// 8 - dzielnica w m.st. Warszawa,
+// 9 - delegatury miast: Kraków, Łódź, Poznań i Wrocław
+
+export function compute(regions: Array<Region>, localities: Array<Locality>, localityTypes: Array<LocalityType>, streets: Array<Street>): Computed {
     let out: Computed = {
         voivodeships: [],
         counties: {},
         municipalities: new MultiKeyMap(),
         localities: new MultiKeyMap(),
-        districts: new MultiKeyMap()
+        districts: new MultiKeyMap(),
+        streetsLocalities: new MultiKeyMap(),
+        streetsDistricts: new MultiKeyMap()
     }
 
     const locTypeIdMap: Map<string, string> = new Map(localityTypes.map(r => [r.name, r.id]))
@@ -72,8 +90,6 @@ export function compute(regions: Array<Region>, localities: Array<Locality>, loc
             municipalityIdMap.set([r.voivodeship, r.county, r.municipality], r.name)
         })
 
-    console.log(out.municipalities.Get2Deep())
-
     // Miejscowosci
     let localityTypeIds = [
         locTypeIdMap.get("wieś"),
@@ -104,7 +120,7 @@ export function compute(regions: Array<Region>, localities: Array<Locality>, loc
         })
 
     // Dzielnice
-    const allLocalitiesIdMap = new Map(localities.map(r => [r.localityId, r.name]))
+    const allLocalitiesIdMap = new Map(localities.map(r => [r.localityId, r]))
 
     let districtIds = [
         locTypeIdMap.get("dzielnica"),
@@ -121,7 +137,7 @@ export function compute(regions: Array<Region>, localities: Array<Locality>, loc
             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)
+            const l = allLocalitiesIdMap.get(r.baseLocalityId)?.name
 
             if (!v || !c || !m || !l) {
                 // console.error("Missing voivodeship, county, municipality or base locality for district: " + r.name + " (" + v + ", " + c + ", " + m + ", " + l + ")")
@@ -179,12 +195,105 @@ export function compute(regions: Array<Region>, localities: Array<Locality>, loc
             d = d ? d : []
             out.districts.set([v, c, m, l], [...d, name])
         })
-    // console.log(out.districts)
 
+    // Ulice w miejscowosciach
+    let districtMunicipalityIds = ["8", "9"]
+    streets
+        .filter(r => !districtMunicipalityIds.includes(r.municipalityTypeId))
+        .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.localityId)
+
+            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
+            }
+
+            const fullName = r.name + " " + r.restName
+
+            if (districtIds.includes(l.localityTypeId)) {
+                const d = out.districts.get([v, c, m, l.name])
+                if (!d) {
+                    console.error("Missing district: " + r.name)
+                    return
+                }
+
+                let s = out.streetsDistricts.get([v, c, m, l.name, d])
+                s = s ? s : []
+                if (!s.includes(fullName)) {
+                    out.streetsDistricts.set([v, c, m, l.name, d], [...s, fullName])
+                }
+            } else {
+                let s = out.streetsLocalities.get([v, c, m, l.name])
+                s = s ? s : []
+                if (!s.includes(fullName)) {
+                    out.streetsLocalities.set([v, c, m, l.name], [...s, fullName])
+                }
+            }
+        })
+
+    // Ulice w dzielnicach Warszawy
+    streets
+        .filter(r => r.municipalityTypeId === "8")
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+            const m = "Warszawa"
+            const l = "Warszawa"
+            const d = allLocalitiesIdMap.get(r.localityId)?.name
+
+
+            if (!v || !c || !m || !l || !d) {
+                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 s = out.streetsDistricts.get([v, c, m, l, d])
+            s = s ? s : []
+            const fullName = r.name + " " + r.restName
+
+            if (!s.includes(fullName)) {
+                out.streetsDistricts.set([v, c, m, l, d], [...s, fullName])
+            }
+        })
+
+    // Ulice w delegaturach miast
+    streets
+        .filter(r => r.municipalityTypeId === "9")
+        .forEach(r => {
+            const v = vivIdMap.get(r.voivodeship)
+            const c = countyIdMap.get([r.voivodeship, r.county])
+
+            const name = allLocalitiesIdMap.get(r.localityId)?.name
+            const d = name?.substring(name.indexOf('-') + 1)
+            const m = name?.substring(0, name?.indexOf('-'))
+            const l = name?.substring(0, name?.indexOf('-'))
+
+            if (!v || !c || !m || !l || !d) {
+                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 s = out.streetsDistricts.get([v, c, m, l, d])
+            s = s ? s : []
+            const fullName = r.name + " " + r.restName
+            if (!s.includes(fullName)) {
+                out.streetsDistricts.set([v, c, m, l, d], [...s, fullName])
+            }
+        })
 
+    // Sort all lists
     out.municipalities.sortValues()
     out.localities.sortValues()
     out.districts.sortValues()
+    out.streetsLocalities.sortValues()
+    out.streetsDistricts.sortValues()
+
 
     return out
 }

package/src/csvparse.ts

@@ -28,6 +28,20 @@ export type Locality = {
     date: string;
 };
 
+// WOJ;POW;GMI;RODZ_GMI;SYM;SYM_UL;CECHA;NAZWA_1;NAZWA_2;STAN_NA
+export type Street = {
+    voivodeship: string
+    county: string;
+    municipality: string;
+    municipalityTypeId: string;
+    localityId: string;
+    streenId: string;
+    characteristic: string;
+    name: string;
+    restName: string
+    date: string;
+};
+
 export type LocalityType = {
     id: string;
     name: string;
@@ -111,4 +125,28 @@ export async function parseLocalityTypeCsv() {
         });
     await finished(parser);
     return records;
+};
+
+export async function parseStreetsCsv() {
+    const records: Street[] = [];
+    const parser = fs
+        .createReadStream(args.streets)
+        .pipe(parse({
+            relax_quotes: true,
+            delimiter: ';',
+            skip_empty_lines: true,
+            record_delimiter: '\r\n',
+            columns: () => {
+                return ["voivodeship", "county", "municipality", "municipalityTypeId", "localityId", "streenId", "characteristic", "name", "restName", "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

@@ -8,6 +8,8 @@ function genJson(c: Computed) {
     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()))
+    fs.writeFileSync(args.output + "/json/streetsInLocalities.json", JSON.stringify(c.streetsLocalities.Get4Deep()))
+    fs.writeFileSync(args.output + "/json/streetsInDistricts.json", JSON.stringify(c.streetsDistricts.Get5Deep()))
 
 }
 
@@ -17,6 +19,8 @@ function genGo(c: Computed) {
     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")
+    fs.copyFileSync(args.output + "/json/streetsInLocalities.json", args.output + "/go/streetsInLocalities.json")
+    fs.copyFileSync(args.output + "/json/streetsInDistricts.json", args.output + "/go/streetsInDistricts.json")
     const data = `package poland
 import (
     "embed"

package/src/map.ts

@@ -1,4 +1,4 @@
-import { NamesMapThreeKeys, NamesMapFourKeys, NamesMapTwoKeys } from "./compute";
+import { NamesMapThreeKeys, NamesMapFourKeys, NamesMapTwoKeys, NamesMapFiveKeys } from "./compute";
 
 export class MultiKeyMap {
     private map: Record<string, any> = {};
@@ -100,4 +100,25 @@ export class MultiKeyMap {
         })
         return out
     }
+    
+    Get5Deep(): NamesMapFiveKeys {
+        var out: NamesMapFiveKeys = {}
+        this.forEach((keys, value) => {
+            const [v, c, m, l, d] = 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][d] = value
+        })
+        return out
+    }
 }