@rr0/cms 0.1.23 → 0.2.0

package/dist/org/eu/fi/region/p/nwp/Nwp.js

@@ -1,5 +1,5 @@
 import { Department } from "../../../../../country/region/department/Department.js";
 import { FinlandDepartementCode } from "../../FinlandDepartementCode.js";
 import { pirkanmaa } from "../Pirkanmaa.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export const nwp = Department.create(FinlandDepartementCode.nwp, pirkanmaa, Place.fromDMS("63°27′24″N,29°40′05″E"));

package/dist/org/eu/fi/region/p/nwp/NwpCity.d.ts

@@ -1,3 +1,3 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { City } from "../../../../../country/region/department/city/City.js";
 export declare function createCity(zipCode: string, place: Place): City;

package/dist/org/eu/fi/region/p/nwp/parkano/Parkano.js

@@ -1,4 +1,4 @@
 import { createCity } from "../NwpCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { NwpCityCode } from "../NwpCityCode.js";
 export let parkano = createCity(NwpCityCode.Parkano, Place.fromDMS("62°00′30″N,23°01′30″E"));

package/dist/org/eu/fi/region/ss/Pieksamaki/Pieksamaki/Pieksamaki.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { PieksamakiCityCode } from "../PieksamakiCityCode.js";
 import { City } from "../../../../../../country/index.js";
 import { pieksamakiDep } from "../PieksamakiDep.js";

package/dist/org/eu/fi/region/ss/Pieksamaki/PieksamakiDep.js

@@ -1,5 +1,5 @@
 import { Department } from "../../../../../country/region/department/Department.js";
 import { southSavo } from "../SouthSavo.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { SouthSavoDepartmentCode } from "../SouthSavoDepartmentCode.js";
 export const pieksamakiDep = Department.create(SouthSavoDepartmentCode.Pieksamaki, southSavo, Place.fromDMS("63°27′24″N,29°40′05″E"));

package/dist/org/eu/fi/region/ss/SouthSavo.js

@@ -1,4 +1,4 @@
 import { finlandRegion } from "../FinlandRegion.js";
 import { FinlandRegionCode } from "../FinlandRegionCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export const southSavo = finlandRegion(FinlandRegionCode.ss, Place.fromDMS("62°0′N 27°30′E"));

package/dist/org/eu/fr/France_en.js

@@ -10,13 +10,13 @@ import { hautsDeFranceMessages } from "./region/hdf/HautsDeFranceMessages.js";
 import { grandEstMessages } from "./region/ges/GrandEstMessages.js";
 import { normandieMessages_en } from "./region/nor/NormandieMessages_en.js";
 import { laReunionRegion_en } from "./region/lre/LaReunionRegion_en.js";
-import { OrganizationKind } from "../../Organization.js";
 import { centreValDeLoireMessages } from "./region/cvl/CentreValDeLoireMessages.js";
 import { guadeloupeRegion_en } from "./region/gua/GuadeloupeRegion_en.js";
 import { bretagneMessages_en } from "./region/bre/BretagneMessages_en.js";
 import { FranceRegionCode } from "./region/FranceRegionCode.js";
 import { martiniqueRegionMessage } from "./region/mtq/MartiniqueRegionMessage.js";
 import { collectiviteOutreMerMessage_en } from "./region/com/CollectiviteOutreMerMessage_en.js";
+import { OrganizationKind } from "../../OrganizationKind";
 export const france_en = new FranceMessages(["France"]);
 france_en[OrganizationKind.region] = {
     ara: auvergneRhoneAlpesMessages,

package/dist/org/eu/fr/France_fr.js

@@ -10,13 +10,13 @@ import { hautsDeFranceMessages } from "./region/hdf/HautsDeFranceMessages.js";
 import { normandieMessages_fr } from "./region/nor/NormandieMessages_fr.js";
 import { grandEstMessages } from "./region/ges/GrandEstMessages.js";
 import { laReunionRegion_fr } from "./region/lre/LaReunionRegion_fr.js";
-import { OrganizationKind } from "../../Organization.js";
 import { centreValDeLoireMessages } from "./region/cvl/CentreValDeLoireMessages.js";
 import { guadeloupeRegion_fr } from "./region/gua/GuadeloupeRegion_fr.js";
 import { bretagneMessages_fr } from "./region/bre/BretagneMessages_fr.js";
 import { martiniqueRegionMessage } from "./region/mtq/MartiniqueRegionMessage.js";
 import { FranceRegionCode } from "./region/FranceRegionCode.js";
 import { collectiviteOutreMerMessage_fr } from "./region/com/CollectiviteOutreMerMessage_fr.js";
+import { OrganizationKind } from "../../OrganizationKind";
 export const france_fr = new FranceMessages(["France"]);
 france_fr[OrganizationKind.region] = {
     ara: auvergneRhoneAlpesMessages,

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanCaseSummary.d.ts

@@ -4,7 +4,7 @@ import { GeipanZoneType } from "./GeipanCase.js";
 import { FranceDepartementCode } from "../../../region/FranceDepartementCode.js";
 import { FranceRegionCode } from "../../../region/FranceRegionCode.js";
 import { CountryCode } from "../../../../../country/index.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export type GeipanZoneCode = FranceDepartementCode | FranceRegionCode | CountryCode.fr;
 /**
  * caseNumber is like "AAAA-MM-number"
@@ -12,11 +12,11 @@ export type GeipanZoneCode = FranceDepartementCode | FranceRegionCode | CountryC
 export interface GeipanCaseSummary {
     id: string;
     url: string;
-    time: TimeContext;
+    time: EdtfDate;
     sightingType?: GeipanSightingType;
     city: string;
     zoneCode?: GeipanZoneCode;
     zoneType?: GeipanZoneType;
-    postTime: TimeContext;
+    postTime: EdtfDate;
     classification?: GeipanCaseClassification_calc;
 }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanCaseSummaryRR0Mapper.d.ts

@@ -1,7 +1,8 @@
 import { GeipanCaseSummary } from "./GeipanCaseSummary.js";
-import { CaseMapper, NamedPlace, RR0CaseSummary } from "../../../../../../time/index.js";
+import { CaseMapper, RR0CaseSummary } from "../../../../../../time/index.js";
 import { HtmlRR0Context } from "../../../../../../RR0Context.js";
 import { CityService } from "../../../../../country/index.js";
+import { Place } from "@rr0/place";
 export declare class GeipanCaseSummaryRR0Mapper implements CaseMapper<HtmlRR0Context, GeipanCaseSummary, RR0CaseSummary> {
     protected cityService: CityService;
     readonly baseUrl: URL;
@@ -10,5 +11,5 @@ export declare class GeipanCaseSummaryRR0Mapper implements CaseMapper<HtmlRR0Con
     constructor(cityService: CityService, baseUrl: URL, copyright: string, authors: string[]);
     getDescription(c: GeipanCaseSummary): string;
     map(context: HtmlRR0Context, sourceCase: GeipanCaseSummary, sourceTime: Date): RR0CaseSummary;
-    protected getPlace(context: HtmlRR0Context, sourceCase: GeipanCaseSummary): NamedPlace;
+    protected getPlace(context: HtmlRR0Context, sourceCase: GeipanCaseSummary): Place;
 }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanCaseSummaryRR0Mapper.js

@@ -1,7 +1,7 @@
 import assert from "assert";
 import { GeipanCaseClassification } from "./GeipanCaseClassification.js";
 import { france } from "../../../France.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export class GeipanCaseSummaryRR0Mapper {
     constructor(cityService, baseUrl, copyright, authors) {
         this.cityService = cityService;
@@ -37,11 +37,12 @@ export class GeipanCaseSummaryRR0Mapper {
         const caseSource = {
             previousSourceRefs: [],
             events: [], url: sourceCase.url, title: "cas n° " + id, authors: this.authors,
-            publication: { publisher: this.copyright, time: TimeContext.fromDate(sourceTime) }
+            publication: { publisher: this.copyright, time: EdtfDate.fromDate(sourceTime) }
         };
         const place = this.getPlace(context, sourceCase);
         return {
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             events: [],
             id,
             time: sourceCase.time,
@@ -65,6 +66,6 @@ export class GeipanCaseSummaryRR0Mapper {
             org = this.cityService.find(context, placeName, undefined);
             assert.ok(org, `Could not find city "${placeName}" in department "${depCode}" nor department with this name in country "${france.id}"`);
         }
-        return { name: org.getMessages(context).toTitle(context, org, { parent: true }), org, place: org.places[0] };
+        return org.places[0];
     }
 }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanCaseToSummaryMapper.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 /**
  * Maps a GEIPAN CSV case to a GEIPAN summary case.
  */
@@ -28,8 +28,8 @@ export class GeipanCaseToSummaryMapper {
             city,
             zoneType: csvCase.cas_zone_type,
             zoneCode: csvCase.cas_zone_code,
-            time: new TimeContext(sightingYear, sightingMonth, sightingDayOfMonth),
-            postTime: new TimeContext(postYear, postMonth, postDayOfMonth),
+            time: new EdtfDate({ year: sightingYear, month: sightingMonth, day: sightingDayOfMonth }),
+            postTime: new EdtfDate({ year: postYear, month: postMonth, day: postDayOfMonth }),
             classification
         };
     }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanDatasource.test.js

@@ -1,9 +1,11 @@
 import { beforeEach, describe, test } from "@javarome/testscript";
 import { geipanTestCaseSummaries } from "./GeipanTestCases.js";
-import { geipanRR0Mapping } from "./GeipanRR0Mapping.js";
+import { GeipanRR0Mapping } from "./GeipanRR0Mapping.js";
 import { DatasourceTestCase } from "../../../../../../time/datasource/DatasourceTestCase.js";
 import { rr0TestUtil } from "../../../../../../test/index.js";
 describe("GeipanCaseSource", () => {
+    const actions = { read: ["backup", "fetch"], write: ["backup", "pages"] };
+    const geipanRR0Mapping = new GeipanRR0Mapping(rr0TestUtil.cityService, actions);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanHttpDatasource.d.ts

@@ -2,7 +2,7 @@ import { GeipanCaseSummary } from "./GeipanCaseSummary.js";
 import { GeipanDatasource } from "./GeipanDatasource.js";
 import { HttpSource } from "../../../../../../time/index.js";
 import { RR0Context } from "../../../../../../RR0Context.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 /**
  * This datasource will issue queries like
  * https://geipan.fr/fr/recherche/cas?field_agregation_index_value=&field_departement_target_id=&field_type_de_cas_target_id=All&field_phenomene_target_id=&field_date_d_observation_value%5Bmin%5D=2019%2F07%2F01&field_date_d_observation_value%5Bmax%5D=2019%2F12%2F31&field_document_existe_ou_pas_value=All&select-category-export=nothing
@@ -16,5 +16,5 @@ export declare class GeipanHttpDatasource extends GeipanDatasource {
     constructor(baseUrl: URL, searchPath: string);
     protected readCases(context: RR0Context): Promise<GeipanCaseSummary[]>;
     protected getFromRow(context: RR0Context, row: Element): GeipanCaseSummary;
-    protected getTime(context: RR0Context, fields: RegExpExecArray, index: number): TimeContext;
+    protected getTime(context: RR0Context, fields: RegExpExecArray, index: number): EdtfDate;
 }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanHttpDatasource.js

@@ -3,6 +3,7 @@ import { GeipanCaseClassification, GeipanCaseClassification_minus } from "./Geip
 import { GeipanDatasource } from "./GeipanDatasource.js";
 import { HttpSource } from "../../../../../../time/index.js";
 import { ObjectUtil, UrlUtil } from "../../../../../../util/index.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
 /**
  * This datasource will issue queries like
  * https://geipan.fr/fr/recherche/cas?field_agregation_index_value=&field_departement_target_id=&field_type_de_cas_target_id=All&field_phenomene_target_id=&field_date_d_observation_value%5Bmin%5D=2019%2F07%2F01&field_date_d_observation_value%5Bmax%5D=2019%2F12%2F31&field_document_existe_ou_pas_value=All&select-category-export=nothing
@@ -92,13 +93,12 @@ export class GeipanHttpDatasource extends GeipanDatasource {
         };
     }
     getTime(context, fields, index) {
-        const itemContext = context.clone();
-        const dateTime = itemContext.time;
-        dateTime.setYear(parseInt(fields[index], 10));
-        dateTime.setMonth(parseInt(fields[index - 1], 10));
         const dayOfMonth = fields[index - 2];
-        dateTime.setDayOfMonth(dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined);
-        return dateTime;
+        return new EdtfDate({
+            year: parseInt(fields[index], 10),
+            month: parseInt(fields[index - 1], 10),
+            day: dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined
+        });
     }
 }
 GeipanHttpDatasource.caseFormat = /(.+?)\s*\(([\d-AB]+)\)\s+(\d+)(?:.(\d+)(?:.(\d+))?)?/;

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.d.ts

@@ -3,14 +3,13 @@ import { GeipanCaseSummaryRR0Mapper } from "./GeipanCaseSummaryRR0Mapper.js";
 import { GeipanFileDatasource } from "./GeipanFileDatasource.js";
 import { GeipanCaseSummary } from "./GeipanCaseSummary.js";
 import { ChronologyReplacerActions, RR0CaseMapping } from "../../../../../../time/index.js";
+import { CityService } from "../../../../../country";
 export declare const geipanHttpDatasource: GeipanHttpDatasource;
 export declare const geipanFileDatasource: GeipanFileDatasource;
-export declare const geipanRR0Mapper: GeipanCaseSummaryRR0Mapper;
 export declare class GeipanRR0Mapping implements RR0CaseMapping<GeipanCaseSummary> {
     readonly actions: ChronologyReplacerActions;
-    datasource: GeipanHttpDatasource;
-    backupDatasource: GeipanFileDatasource;
-    mapper: GeipanCaseSummaryRR0Mapper;
-    constructor(actions: ChronologyReplacerActions);
+    readonly datasource: GeipanHttpDatasource;
+    readonly backupDatasource: GeipanFileDatasource;
+    readonly mapper: GeipanCaseSummaryRR0Mapper;
+    constructor(cityService: CityService, actions: ChronologyReplacerActions);
 }
-export declare const geipanRR0Mapping: GeipanRR0Mapping;

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.js

@@ -1,17 +1,13 @@
 import { GeipanHttpDatasource } from "./GeipanHttpDatasource.js";
 import { GeipanCaseSummaryRR0Mapper } from "./GeipanCaseSummaryRR0Mapper.js";
 import { GeipanFileDatasource } from "./GeipanFileDatasource.js";
-import { cityService } from "../../../../../Cities.js";
 export const geipanHttpDatasource = new GeipanHttpDatasource(new URL("https://geipan.fr"), "fr/recherche/cas");
 export const geipanFileDatasource = new GeipanFileDatasource("org/eu/fr/cnes/geipan/export_cas_pub_20210219111412.csv", "latin1");
-export const geipanRR0Mapper = new GeipanCaseSummaryRR0Mapper(cityService, geipanHttpDatasource.baseUrl, geipanHttpDatasource.copyright, geipanHttpDatasource.authors);
 export class GeipanRR0Mapping {
-    constructor(actions) {
+    constructor(cityService, actions) {
         this.actions = actions;
         this.datasource = geipanHttpDatasource;
         this.backupDatasource = geipanFileDatasource;
-        this.mapper = geipanRR0Mapper;
+        this.mapper = new GeipanCaseSummaryRR0Mapper(cityService, geipanHttpDatasource.baseUrl, geipanHttpDatasource.copyright, geipanHttpDatasource.authors);
     }
 }
-const actions = { read: ["backup", "fetch"], write: ["backup", "pages"] };
-export const geipanRR0Mapping = new GeipanRR0Mapping(actions);

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanSummaryToCaseMapper.js

@@ -8,11 +8,11 @@ export class GeipanSummaryToCaseMapper {
         this.authors = authors;
     }
     map(context, csvCase, sourceTime) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const caseNumber = csvCase.id;
-        const sightingYear = csvCase.time.getYear().toString();
-        const sightingMonth = (_b = (_a = csvCase.time.getMonth()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "--";
-        const sightingDayOfMonth = (_d = (_c = csvCase.time.getDayOfMonth()) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : "--";
+        const sightingYear = (_a = csvCase.time.year) === null || _a === void 0 ? void 0 : _a.toString();
+        const sightingMonth = (_c = (_b = csvCase.time.month) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : "--";
+        const sightingDayOfMonth = (_e = (_d = csvCase.time.day) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : "--";
         return {
             cas_classification: csvCase.classification,
             cas_consistance_calc: 0,

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanTestCases.js

@@ -2,7 +2,7 @@ import { geipanHttpDatasource } from "./GeipanRR0Mapping.js";
 import { GeipanCaseClassification } from "./GeipanCaseClassification.js";
 import { GeipanZoneType } from "./GeipanCase.js";
 import { FranceDepartementCode } from "../../../region/FranceDepartementCode.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export const geipanTestCaseSummaries = [
     {
         id: "1977-03-00399",
@@ -10,8 +10,8 @@ export const geipanTestCaseSummaries = [
         city: "BELLEVILLE-SUR-SAONE",
         zoneType: GeipanZoneType.Department,
         zoneCode: FranceDepartementCode.Rhone,
-        time: new TimeContext(1977, 3, 19),
-        postTime: new TimeContext(2010, 8, 6),
+        time: new EdtfDate({ year: 1977, month: 3, day: 19 }),
+        postTime: new EdtfDate({ year: 2010, month: 8, day: 6 }),
         classification: GeipanCaseClassification.MissingInfo
     },
     {
@@ -20,8 +20,8 @@ export const geipanTestCaseSummaries = [
         city: "ESTANG",
         zoneType: GeipanZoneType.Department,
         zoneCode: FranceDepartementCode.Gers,
-        time: new TimeContext(1977, 3),
-        postTime: new TimeContext(2011, 5, 18),
+        time: new EdtfDate({ year: 1977, month: 3 }),
+        postTime: new EdtfDate({ year: 2011, month: 5, day: 18 }),
         classification: GeipanCaseClassification.Identified
     }
 ];

package/dist/org/eu/fr/region/FranceDepartments.d.ts

@@ -1,6 +1,6 @@
 import { Department } from "../../../country/region/department/Department.js";
 import { FranceDepartementCode } from "./FranceDepartementCode.js";
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { Region } from "../../../country/index.js";
 export declare const franceDepartments: Department[];
 export declare function franceDepartment(code: FranceDepartementCode, region: Region, place: Place): Department;

package/dist/org/eu/fr/region/FranceRegion.d.ts

@@ -1,3 +1,3 @@
 import { FranceRegionCode } from "./FranceRegionCode.js";
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export declare function franceRegion(code: FranceRegionCode, place: Place): import("../../../index.js").Region<import("../../../index.js").RegionMessages<any>, import("../../EuropeRegionCode.js").EuropeRegionCode>;

package/dist/org/eu/fr/region/ara/01/Ain.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const ain = Department.create(FranceDepartementCode.Ain, auvergneRhoneAlpes, Place.fromDMS("46°05′00″N,5°20′00″E"));

package/dist/org/eu/fr/region/ara/01/HautevilleLompnes/HautevilleLompnes.d.ts

@@ -1 +1,2 @@
-export declare const hautevilleLompnes: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const hautevilleLompnes: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/01/HautevilleLompnes/HautevilleLompnes.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { AinCityCode } from "../AinCityCode.js";
-export const hautevilleLompnes = franceCity(AinCityCode.HautevilleLompnes, Place.fromDMS("45°58′45″N,5°36′19″E"));
+import { ain } from "../Ain";
+import { City } from "../../../../../../country";
+export const hautevilleLompnes = City.create(String(AinCityCode.HautevilleLompnes), ain, Place.fromDMS("45°58′45″N,5°36′19″E"));

package/dist/org/eu/fr/region/ara/03/Allier.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const allier = Department.create(FranceDepartementCode.Allier, auvergneRhoneAlpes, Place.fromDMS("46°25′N,3°10′E"));

package/dist/org/eu/fr/region/ara/03/montmarault/Montmarault.d.ts

@@ -1 +1,2 @@
-export declare const montmarault: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const montmarault: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/03/montmarault/Montmarault.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { AllierCityCode } from "../AllierCityCode.js";
-export const montmarault = franceCity(AllierCityCode.Montmarault, Place.fromDMS("46°19′06″N,2°57′20″E"));
+import { allier } from "../Allier";
+import { City } from "../../../../../../country";
+export const montmarault = City.create(String(AllierCityCode.Montmarault), allier, Place.fromDMS("46°19′06″N,2°57′20″E"));

package/dist/org/eu/fr/region/ara/03/valonensully/VallonEnSully.d.ts

@@ -1 +1,2 @@
-export declare const vallonEnSully: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const vallonEnSully: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/03/valonensully/VallonEnSully.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { AllierCityCode } from "../AllierCityCode.js";
-export const vallonEnSully = franceCity(AllierCityCode.VallonEnSully, Place.fromDMS("46°32′13″N,2°36′32″E"));
+import { allier } from "../Allier";
+import { City } from "../../../../../../country";
+export const vallonEnSully = City.create(String(AllierCityCode.VallonEnSully), allier, Place.fromDMS("46°32′13″N,2°36′32″E"));

package/dist/org/eu/fr/region/ara/07/Ardeche.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const ardeche = Department.create(FranceDepartementCode.Ardeche, auvergneRhoneAlpes, Place.fromDMS("44°40′N,4°25′E"));

package/dist/org/eu/fr/region/ara/07/Coux/Coux.d.ts

@@ -1 +1,2 @@
-export declare const coux: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const coux: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/07/Coux/Coux.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { ArdecheCityCode } from "../ArdecheCityCode.js";
-export const coux = franceCity(ArdecheCityCode.Coux, Place.fromDMS("44°44′06″N,4°37′16″E"));
+import { ardeche } from "../Ardeche";
+import { City } from "../../../../../../country";
+export const coux = City.create(String(ArdecheCityCode.Coux), ardeche, Place.fromDMS("44°44′06″N,4°37′16″E"));

package/dist/org/eu/fr/region/ara/07/Largentiere/Largentiere.d.ts

@@ -1 +1,2 @@
-export declare const largentiere: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const largentiere: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/07/Largentiere/Largentiere.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { ArdecheCityCode } from "../ArdecheCityCode.js";
-export const largentiere = franceCity(ArdecheCityCode.Largentiere, Place.fromDMS("44°32′37″N,4°17′39″E"));
+import { ardeche } from "../Ardeche";
+import { City } from "../../../../../../country";
+export const largentiere = City.create(String(ArdecheCityCode.Largentiere), ardeche, Place.fromDMS("44°32′37″N,4°17′39″E"));

package/dist/org/eu/fr/region/ara/07/VernouxEnVivarais/VernouxEnVivarais.d.ts

@@ -1 +1,2 @@
-export declare const vernouxEnVivarais: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const vernouxEnVivarais: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/07/VernouxEnVivarais/VernouxEnVivarais.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { ArdecheCityCode } from "../ArdecheCityCode.js";
-export const vernouxEnVivarais = franceCity(ArdecheCityCode.VernouxEnVivarais, Place.fromDMS("44°53′47″N,4°38′46″E"));
+import { ardeche } from "../Ardeche";
+import { City } from "../../../../../../country";
+export const vernouxEnVivarais = City.create(String(ArdecheCityCode.VernouxEnVivarais), ardeche, Place.fromDMS("44°53′47″N,4°38′46″E"));

package/dist/org/eu/fr/region/ara/15/Cantal.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const cantal = Department.create(FranceDepartementCode.Cantal, auvergneRhoneAlpes, Place.fromDMS("45°02′00″N,3°06′00″E"));

package/dist/org/eu/fr/region/ara/15/mauriac/Mauriac.d.ts

@@ -1 +1,2 @@
-export declare const mauriac: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const mauriac: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/15/mauriac/Mauriac.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { CantalCityCode } from "../CantalCityCode.js";
-export const mauriac = franceCity(CantalCityCode.Mauriac, Place.fromDMS("45°13′11″N,2°20′03″E"));
+import { cantal } from "../Cantal";
+import { City } from "../../../../../../country";
+export const mauriac = City.create(String(CantalCityCode.Mauriac), cantal, Place.fromDMS("45°13′11″N,2°20′03″E"));

package/dist/org/eu/fr/region/ara/15/pierrefort/Pierrefort.d.ts

@@ -1 +1,2 @@
-export declare const pierrefort: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const pierrefort: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/15/pierrefort/Pierrefort.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { CantalCityCode } from "../CantalCityCode.js";
-export const pierrefort = franceCity(CantalCityCode.Pierrefort, Place.fromDMS("44°55′21″N,2°50′19″E"));
+import { cantal } from "../Cantal";
+import { City } from "../../../../../../country";
+export const pierrefort = City.create(String(CantalCityCode.Pierrefort), cantal, Place.fromDMS("44°55′21″N,2°50′19″E"));

package/dist/org/eu/fr/region/ara/26/Chateaudouble/Chateaudouble.d.ts

@@ -1 +1,2 @@
-export declare const chateaudouble: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const chateaudouble: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/26/Chateaudouble/Chateaudouble.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { DromeCityCode } from "../DromeCityCode.js";
-export const chateaudouble = franceCity(DromeCityCode.Chateaudouble, Place.fromDMS("44°54′01″N,5°05′46″E"));
+import { drome } from "../Drome";
+import { City } from "../../../../../../country";
+export const chateaudouble = City.create(String(DromeCityCode.Chateaudouble), drome, Place.fromDMS("44°54′01″N,5°05′46″E"));

package/dist/org/eu/fr/region/ara/26/Drome.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const drome = Department.create(FranceDepartementCode.Drome, auvergneRhoneAlpes, Place.fromDMS("44°45′N,5°10′E"));

package/dist/org/eu/fr/region/ara/38/Allevard/Allevard.d.ts

@@ -1 +1,2 @@
-export declare const allevard: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const allevard: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/38/Allevard/Allevard.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { IsereCityCode } from "../IsereCityCode.js";
-export const allevard = franceCity(IsereCityCode.Allevard, Place.fromDMS("45° 23′ 40″N, 6° 04′ 29″E"));
+import { isere } from "../Isere";
+import { City } from "../../../../../../country";
+export const allevard = City.create(String(IsereCityCode.Allevard), isere, Place.fromDMS("45° 23′ 40″N, 6° 04′ 29″E"));

package/dist/org/eu/fr/region/ara/38/Chirens/Chirens.d.ts

@@ -1 +1,2 @@
-export declare const chirens: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const chirens: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/38/Chirens/Chirens.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { IsereCityCode } from "../IsereCityCode.js";
-export const chirens = franceCity(IsereCityCode.Chirens, Place.fromDMS("45° 24′ 50″N, 5° 33′ 21″E"));
+import { isere } from "../Isere";
+import { City } from "../../../../../../country";
+export const chirens = City.create(String(IsereCityCode.Chirens), isere, Place.fromDMS("45° 24′ 50″N, 5° 33′ 21″E"));

package/dist/org/eu/fr/region/ara/38/Domene/Domene.d.ts

@@ -1 +1,2 @@
-export declare const domene: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;
+import { City } from "../../../../../../country";
+export declare const domene: City<import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/eu/fr/region/ara/38/Domene/Domene.js

@@ -1,4 +1,5 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
+import { Place } from "@rr0/place";
 import { IsereCityCode } from "../IsereCityCode.js";
-export const domene = franceCity(IsereCityCode.Domene, Place.fromDMS("45°12′12″N,5°50′23″E"));
+import { isere } from "../Isere";
+import { City } from "../../../../../../country";
+export const domene = City.create(String(IsereCityCode.Domene), isere, Place.fromDMS("45°12′12″N,5°50′23″E"));

package/dist/org/eu/fr/region/ara/38/Isere.js

@@ -1,5 +1,5 @@
 import { FranceDepartementCode } from "../../FranceDepartementCode.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { auvergneRhoneAlpes } from "../AuvergneRhoneAlpes.js";
 import { Department } from "../../../../../country/region/department/Department.js";
 export const isere = Department.create(FranceDepartementCode.Isere, auvergneRhoneAlpes, Place.fromDMS("45°20′N,5°30′E"));