diff --git a/org/eu/fr/region/FranceDepartementCode.ts b/org/eu/fr/region/FranceDepartementCode.ts index a21f28bb1a..1debb85934 100644 --- a/org/eu/fr/region/FranceDepartementCode.ts +++ b/org/eu/fr/region/FranceDepartementCode.ts @@ -2,6 +2,7 @@ export enum FranceDepartementCode { HautesAlpes = "05", AlpesMaritimes = "06", Aude = "11", + BouchesDuRhone = "13", Calvados = "14", Charente = "16", CharenteMaritime = "17", @@ -21,6 +22,7 @@ export enum FranceDepartementCode { Paris = "75", Var = "83", Vienne = "86", + Tarn = "81", TarnEtGaronne = "82", Vaucluse = "84", HautsDeSeine = "92", diff --git a/org/eu/fr/region/occ/81/Tarn.ts b/org/eu/fr/region/occ/81/Tarn.ts new file mode 100644 index 0000000000..d39931d92a --- /dev/null +++ b/org/eu/fr/region/occ/81/Tarn.ts @@ -0,0 +1,6 @@ +import { Department } from "../../../../../country/region/department/Department" +import { FranceDepartementCode } from "../../FranceDepartementCode" +import { Place } from "../../../../../../place/Place" +import { occitanie } from "../Occitanie" + +export const tarn = new Department(FranceDepartementCode.Tarn, occitanie, Place.fromDMS(`43°49′N,2°12′E`)) diff --git a/org/eu/fr/region/occ/81/TarnCities.ts b/org/eu/fr/region/occ/81/TarnCities.ts new file mode 100644 index 0000000000..7959c03e88 --- /dev/null +++ b/org/eu/fr/region/occ/81/TarnCities.ts @@ -0,0 +1,6 @@ +import { City } from "../../../../../country/region/department/city/City" +import { albi } from "./albi/Albi" + +export const tarnCities: City[] = [ + albi +] diff --git a/org/eu/fr/region/occ/81/TarnCityCode.ts b/org/eu/fr/region/occ/81/TarnCityCode.ts new file mode 100644 index 0000000000..226f29aa3a --- /dev/null +++ b/org/eu/fr/region/occ/81/TarnCityCode.ts @@ -0,0 +1,3 @@ +export enum TarnCityCode { + Albi = 81004, +} diff --git a/org/eu/fr/region/occ/81/TarnMessages.ts b/org/eu/fr/region/occ/81/TarnMessages.ts new file mode 100644 index 0000000000..490d911205 --- /dev/null +++ b/org/eu/fr/region/occ/81/TarnMessages.ts @@ -0,0 +1,12 @@ +import { DepartmentMessages } from "../../../../../country/region/department/DepartmentMessages" +import { TarnCityCode } from "./TarnCityCode" +import { albiMessages } from "./albi/AlbiMessages" +import { CityMessages } from "../../../../../country/region/department/city/CityMessages" + +export type TarnCityList = { [key in TarnCityCode]: T } + +const tarnCityMessages: TarnCityList = { + [TarnCityCode.Albi]: albiMessages +} + +export const tarnMessages = new DepartmentMessages>("Tarn", tarnCityMessages) diff --git a/org/eu/fr/region/occ/81/albi/Albi.ts b/org/eu/fr/region/occ/81/albi/Albi.ts new file mode 100644 index 0000000000..f0531c9f2d --- /dev/null +++ b/org/eu/fr/region/occ/81/albi/Albi.ts @@ -0,0 +1,5 @@ +import { franceCity } from "../../../../FranceCity" +import { Place } from "../../../../../../../place/Place" +import { TarnCityCode } from "../TarnCityCode" + +export const albi = franceCity(TarnCityCode.Albi, Place.fromDMS("43°55′44″N,2°08′47″E")) diff --git a/org/eu/fr/region/occ/81/albi/AlbiMessages.ts b/org/eu/fr/region/occ/81/albi/AlbiMessages.ts new file mode 100644 index 0000000000..ccaa6e489f --- /dev/null +++ b/org/eu/fr/region/occ/81/albi/AlbiMessages.ts @@ -0,0 +1,3 @@ +import { CityMessages } from "../../../../../../country/region/department/city/CityMessages" + +export const albiMessages = new CityMessages("Albi") diff --git a/org/eu/fr/region/occ/OccitanieCities.ts b/org/eu/fr/region/occ/OccitanieCities.ts index ac73b8508d..a6c2b83922 100644 --- a/org/eu/fr/region/occ/OccitanieCities.ts +++ b/org/eu/fr/region/occ/OccitanieCities.ts @@ -4,11 +4,13 @@ import { heraultCities } from "./34/HeraultCities" import { tarnEtGaronneCities } from "./82/TarnEtGaronneCities" import { hauteGaronneCities } from "./31/HauteGaronneCities" import { audeCities } from "./11/AudeCities" +import { tarnCities } from "./81/TarnCities" export const occitanieCities: City[] = [ ...audeCities, ...gersCities, ...hauteGaronneCities, ...heraultCities, + ...tarnCities, ...tarnEtGaronneCities ] diff --git a/org/eu/fr/region/occ/OccitanieDepartementCode.ts b/org/eu/fr/region/occ/OccitanieDepartementCode.ts index 0a15414ca8..1f43b0ef66 100644 --- a/org/eu/fr/region/occ/OccitanieDepartementCode.ts +++ b/org/eu/fr/region/occ/OccitanieDepartementCode.ts @@ -5,5 +5,6 @@ export enum OccitanieDepartementCode { Gers = FranceDepartementCode.Gers, HauteGaronne = FranceDepartementCode.HauteGaronne, Herault = FranceDepartementCode.Herault, + Tarn = FranceDepartementCode.Tarn, TarnEtGaronne = FranceDepartementCode.TarnEtGaronne, } diff --git a/org/eu/fr/region/occ/OccitanieDepartments.ts b/org/eu/fr/region/occ/OccitanieDepartments.ts index 1f09d447bc..38c31cdae5 100644 --- a/org/eu/fr/region/occ/OccitanieDepartments.ts +++ b/org/eu/fr/region/occ/OccitanieDepartments.ts @@ -4,11 +4,13 @@ import { herault } from "./34/Herault" import { tarnEtGaronne } from "./82/TarnEtGaronne" import { hauteGaronne } from "./31/HauteGaronne" import { aude } from "./11/Aude" +import { tarn } from "./81/Tarn" export const occitanieDepartments: Department[] = [ aude, gers, hauteGaronne, herault, + tarn, tarnEtGaronne ] diff --git a/org/eu/fr/region/occ/OccitanieDepartmentsMessages.ts b/org/eu/fr/region/occ/OccitanieDepartmentsMessages.ts index 34e82bf39e..06a53c18b4 100644 --- a/org/eu/fr/region/occ/OccitanieDepartmentsMessages.ts +++ b/org/eu/fr/region/occ/OccitanieDepartmentsMessages.ts @@ -5,6 +5,7 @@ import { heraultMessages } from "./34/HeraultMessages" import { tarnEtGaronneMessages } from "./82/TarnEtGaronneMessages" import { hauteGaronneMessages } from "./31/HauteGaronneMessages" import { audeMessages } from "./11/AudeMessages" +import { tarnMessages } from "./81/TarnMessages" export type OccitanieDepartmentMessagesList = { [key in OccitanieDepartementCode]: DepartmentMessages } @@ -13,5 +14,6 @@ export const occitanieDepartmentsMessages: OccitanieDepartmentMessagesList = { [OccitanieDepartementCode.Gers]: gersMessages, [OccitanieDepartementCode.HauteGaronne]: hauteGaronneMessages, [OccitanieDepartementCode.Herault]: heraultMessages, + [OccitanieDepartementCode.Tarn]: tarnMessages, [OccitanieDepartementCode.TarnEtGaronne]: tarnEtGaronneMessages } diff --git a/org/eu/fr/region/pac/13/BouchesDuRhone.ts b/org/eu/fr/region/pac/13/BouchesDuRhone.ts new file mode 100644 index 0000000000..c9db57ad1f --- /dev/null +++ b/org/eu/fr/region/pac/13/BouchesDuRhone.ts @@ -0,0 +1,6 @@ +import { Department } from "../../../../../country/region/department/Department" +import { Place } from "../../../../../../place/Place" +import { PacaDepartementCode } from "../PacaDepartementCode" +import { paca } from "../Paca" + +export let bouchesDuRhone = new Department(PacaDepartementCode.BouchesDuRhone, paca, Place.fromDMS("43°30′N,5°10′E")) diff --git a/org/eu/fr/region/pac/13/BouchesDuRhoneCities.ts b/org/eu/fr/region/pac/13/BouchesDuRhoneCities.ts new file mode 100644 index 0000000000..4c31c5ba9c --- /dev/null +++ b/org/eu/fr/region/pac/13/BouchesDuRhoneCities.ts @@ -0,0 +1,6 @@ +import { City } from "../../../../../country/region/department/city/City" +import { eyragues } from "./eyragues/Eyragues" + +export const bouchesDuRhoneCities: City[] = [ + eyragues +] diff --git a/org/eu/fr/region/pac/13/BouchesDuRhoneCityCode.ts b/org/eu/fr/region/pac/13/BouchesDuRhoneCityCode.ts new file mode 100644 index 0000000000..8aeacc7108 --- /dev/null +++ b/org/eu/fr/region/pac/13/BouchesDuRhoneCityCode.ts @@ -0,0 +1,3 @@ +export enum BouchesDuRhoneCityCode { + Eyragues = 13036, +} diff --git a/org/eu/fr/region/pac/13/BouchesDuRhoneMessages.ts b/org/eu/fr/region/pac/13/BouchesDuRhoneMessages.ts new file mode 100644 index 0000000000..f250067e65 --- /dev/null +++ b/org/eu/fr/region/pac/13/BouchesDuRhoneMessages.ts @@ -0,0 +1,13 @@ +import { eyraguesMessages } from "./eyragues/EyraguesMessages" +import { BouchesDuRhoneCityCode } from "./BouchesDuRhoneCityCode" +import { CityMessages } from "../../../../../country/region/department/city/CityMessages" +import { DepartmentMessages } from "../../../../../country/region/department/DepartmentMessages" + +export type BouchesDuRhoneCityList = { [key in BouchesDuRhoneCityCode]: T } + +export const bouchesDuRhoneCityMessages: BouchesDuRhoneCityList = { + [BouchesDuRhoneCityCode.Eyragues]: eyraguesMessages +} + +export const bouchesDuRhoneMessages = new DepartmentMessages>("Bouches-du-Rhône", + bouchesDuRhoneCityMessages) diff --git a/org/eu/fr/region/pac/13/eyragues/Eyragues.ts b/org/eu/fr/region/pac/13/eyragues/Eyragues.ts new file mode 100644 index 0000000000..4c2a0f39ca --- /dev/null +++ b/org/eu/fr/region/pac/13/eyragues/Eyragues.ts @@ -0,0 +1,5 @@ +import { franceCity } from "../../../../FranceCity" +import { Place } from "../../../../../../../place/Place" +import { BouchesDuRhoneCityCode } from "../BouchesDuRhoneCityCode" + +export const eyragues = franceCity(BouchesDuRhoneCityCode.Eyragues, Place.fromDMS("43°50′31″N,4°50′30″E")) diff --git a/org/eu/fr/region/pac/13/eyragues/EyraguesMessages.ts b/org/eu/fr/region/pac/13/eyragues/EyraguesMessages.ts new file mode 100644 index 0000000000..68f9468230 --- /dev/null +++ b/org/eu/fr/region/pac/13/eyragues/EyraguesMessages.ts @@ -0,0 +1,3 @@ +import { CityMessages } from "../../../../../../country/region/department/city/CityMessages" + +export const eyraguesMessages = new CityMessages("Eyragues") diff --git a/org/eu/fr/region/pac/PacaCities.ts b/org/eu/fr/region/pac/PacaCities.ts index 13f33f9f3e..d5f6071598 100644 --- a/org/eu/fr/region/pac/PacaCities.ts +++ b/org/eu/fr/region/pac/PacaCities.ts @@ -3,9 +3,11 @@ import { City } from "../../../../country/region/department/city/City" import { vaucluseCities } from "./84/VaucluseCities" import { alpesMaritimesCities } from "./06/AlpesMaritimesCities" import { varCities } from "./83/VarCities" +import { bouchesDuRhoneCities } from "./13/BouchesDuRhoneCities" export const pacaCities: City[] = [ ...alpesMaritimesCities, + ...bouchesDuRhoneCities, ...hautesAlpesCities, ...vaucluseCities, ...varCities diff --git a/org/eu/fr/region/pac/PacaDepartementCode.ts b/org/eu/fr/region/pac/PacaDepartementCode.ts index 0718d2efc9..234a13bfd7 100644 --- a/org/eu/fr/region/pac/PacaDepartementCode.ts +++ b/org/eu/fr/region/pac/PacaDepartementCode.ts @@ -1,8 +1,9 @@ import { FranceDepartementCode } from "../FranceDepartementCode" export enum PacaDepartementCode { - HautesAlpes = FranceDepartementCode.HautesAlpes, - Vaucluse = FranceDepartementCode.Vaucluse, AlpesMaritimes = FranceDepartementCode.AlpesMaritimes, + BouchesDuRhone = FranceDepartementCode.BouchesDuRhone, + HautesAlpes = FranceDepartementCode.HautesAlpes, Var = FranceDepartementCode.Var, + Vaucluse = FranceDepartementCode.Vaucluse, } diff --git a/org/eu/fr/region/pac/PacaDepartments.ts b/org/eu/fr/region/pac/PacaDepartments.ts index 17cfc5bf7e..a3dab1d203 100644 --- a/org/eu/fr/region/pac/PacaDepartments.ts +++ b/org/eu/fr/region/pac/PacaDepartments.ts @@ -3,9 +3,11 @@ import { vaucluse } from "./84/Vaucluse" import { Department } from "../../../../country/region/department/Department" import { alpesMaritimes } from "./06/AlpesMaritimes" import { Var } from "./83/Var" +import { bouchesDuRhone } from "./13/BouchesDuRhone" export const pacaDepartments: Department[] = [ alpesMaritimes, + bouchesDuRhone, hautesAlpes, vaucluse, Var diff --git a/org/eu/fr/region/pac/PacaMessages.ts b/org/eu/fr/region/pac/PacaMessages.ts index e433e2b427..dfac99c9b3 100644 --- a/org/eu/fr/region/pac/PacaMessages.ts +++ b/org/eu/fr/region/pac/PacaMessages.ts @@ -5,11 +5,13 @@ import { vaucluseMessages } from "./84/VaucluseMessages" import { DepartmentMessages } from "../../../../country/region/department/DepartmentMessages" import { alpesMaritimesMessages } from "./06/HautesAlpesMessages" import { varMessages } from "./83/VarMessages" +import { bouchesDuRhoneMessages } from "./13/BouchesDuRhoneMessages" export type PacaDepartmentMessagesList = { [key in PacaDepartementCode]: DepartmentMessages } export const pacaMessageList: PacaDepartmentMessagesList = { [PacaDepartementCode.AlpesMaritimes]: alpesMaritimesMessages, + [PacaDepartementCode.BouchesDuRhone]: bouchesDuRhoneMessages, [PacaDepartementCode.HautesAlpes]: hautesAlpesMessages, [PacaDepartementCode.Vaucluse]: vaucluseMessages, [PacaDepartementCode.Var]: varMessages