Update scripts

Carlinhos027-patch-1
freearhey 3 months ago
parent ac6c2c37f6
commit bc729b47e8

@ -99,6 +99,7 @@ export class DataProcessor {
.withCities(citiesGroupedBySubdivisionCode) .withCities(citiesGroupedBySubdivisionCode)
.withCountry(countriesKeyByCode) .withCountry(countriesKeyByCode)
.withRegions(regions) .withRegions(regions)
.withParent(subdivisionsKeyByCode)
) )
subdivisionsKeyByCode = subdivisions.keyBy((subdivision: Subdivision) => subdivision.code) subdivisionsKeyByCode = subdivisions.keyBy((subdivision: Subdivision) => subdivision.code)
subdivisionsGroupedByCountryCode = subdivisions.groupBy( subdivisionsGroupedByCountryCode = subdivisions.groupBy(

@ -31,6 +31,10 @@ export class BroadcastArea {
const city: City = citiesKeyByCode.get(code) const city: City = citiesKeyByCode.get(code)
if (!city) return if (!city) return
citiesIncluded.add(city) citiesIncluded.add(city)
if (city.subdivision) subdivisionsIncluded.add(city.subdivision)
if (city.subdivision && city.subdivision.parent)
subdivisionsIncluded.add(city.subdivision.parent)
if (city.country) countriesIncluded.add(city.country)
regionsIncluded = regionsIncluded.concat(city.getRegions()) regionsIncluded = regionsIncluded.concat(city.getRegions())
break break
} }
@ -38,6 +42,7 @@ export class BroadcastArea {
const subdivision: Subdivision = subdivisionsKeyByCode.get(code) const subdivision: Subdivision = subdivisionsKeyByCode.get(code)
if (!subdivision) return if (!subdivision) return
subdivisionsIncluded.add(subdivision) subdivisionsIncluded.add(subdivision)
if (subdivision.country) countriesIncluded.add(subdivision.country)
regionsIncluded = regionsIncluded.concat(subdivision.getRegions()) regionsIncluded = regionsIncluded.concat(subdivision.getRegions())
break break
} }

@ -8,6 +8,7 @@ export class Subdivision {
countryCode: string countryCode: string
country?: Country country?: Country
parentCode?: string parentCode?: string
parent?: Subdivision
regions?: Collection regions?: Collection
cities?: Collection cities?: Collection
@ -40,6 +41,14 @@ export class Subdivision {
return this return this
} }
withParent(subdivisionsKeyByCode: Dictionary): this {
if (!this.parentCode) return this
this.parent = subdivisionsKeyByCode.get(this.parentCode)
return this
}
getRegions(): Collection { getRegions(): Collection {
if (!this.regions) return new Collection() if (!this.regions) return new Collection()

Loading…
Cancel
Save