@rr0/cms 0.1.24 → 0.2.0

package/dist/time/datasource/rr0/index.js

@@ -5,4 +5,3 @@ export * from "./RR0CaseMapping.js";
 export * from "./RR0CaseSummary.js";
 export * from "./RR0CaseSummaryMapper.js";
 export * from "./RR0Mapping.js";
-export * from "./NamedPlace.js";

package/dist/time/datasource/sceau/SceauCaseSummaryRR0Mapper.js

@@ -1,5 +1,6 @@
 import assert from "assert";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 /**
  * Maps SCEAU cases to RR0 cases.
  */
@@ -15,17 +16,18 @@ export class SceauCaseSummaryRR0Mapper {
         const source = {
             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: new EdtfDate({ year: sourceTime.getFullYear(), month: sourceTime.getMonth(), day: sourceTime.getDate(), hour: sourceTime.getHours(), minute: sourceTime.getSeconds() }) }
         };
         const cityName = sourceCase.ville;
         const city = this.cityService.find(context, cityName, undefined);
         assert.ok(city, `Could not find city "${cityName}" for case ${id} at ${sourceCase.dateCas}`);
-        const place = { name: city.getTitle(context), place: city.places[0] };
+        const place = new OrganizationPlace(city);
         return {
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             events: [],
             id,
-            time: TimeContext.fromString(sourceCase.dateCas),
+            time: EdtfDate.fromString(sourceCase.dateCas),
             place,
             description: this.getDescription(sourceCase),
             sources: [source]

package/dist/time/datasource/sceau/SceauDatasource.test.d.ts

@@ -1,9 +1,10 @@
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
 import { SceauCaseMapping } from "./SceauCaseMapping.js";
 import { SceauDatasource } from "./SceauDatasource.js";
-import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
+import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper";
+import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
 export declare class SceauTestDatasource extends SceauDatasource {
     timeTextBuilder: TimeTextBuilder;
     constructor();
@@ -12,6 +13,6 @@ export declare class SceauTestDatasource extends SceauDatasource {
 export declare class SceauTestMapping implements SceauCaseMapping {
     readonly actions: ChronologyReplacerActions;
     readonly datasource: import("./SceauHttpDatasource.js").SceauHttpDatasource;
-    readonly mapper: import("./SceauCaseSummaryRR0Mapper.js").SceauCaseSummaryRR0Mapper;
-    constructor(actions: ChronologyReplacerActions);
+    readonly mapper: SceauCaseSummaryRR0Mapper;
+    constructor(actions?: ChronologyReplacerActions);
 }

package/dist/time/datasource/sceau/SceauDatasource.test.js

@@ -1,12 +1,13 @@
 import { beforeEach, describe, test } from "@javarome/testscript";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { HtmlTag } from "../../../util/index.js";
 import { SceauDatasource } from "./SceauDatasource.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { rr0TestUtil } from "../../../test/index.js";
-import { sceauDatasource, sceauRR0Mapper } from "./SceauRR0Mapping.js";
+import { sceauDatasource } from "./SceauRR0Mapping.js";
 import { sceauTestCases } from "./SceauTestCases.js";
+import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper";
 export class SceauTestDatasource extends SceauDatasource {
     constructor() {
         super();
@@ -17,10 +18,10 @@ export class SceauTestDatasource extends SceauDatasource {
     }
 }
 export class SceauTestMapping {
-    constructor(actions) {
+    constructor(actions = { read: ["fetch"], write: ["backup"] }) {
         this.actions = actions;
         this.datasource = sceauDatasource; // new SceauTestDatasource()
-        this.mapper = sceauRR0Mapper;
+        this.mapper = new SceauCaseSummaryRR0Mapper(rr0TestUtil.cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
     }
 }
 describe("SCEAUCaseSource", () => {
@@ -29,7 +30,7 @@ describe("SCEAUCaseSource", () => {
             super(mapping, sourceCases);
         }
         getTime(c) {
-            return TimeContext.fromString(c.dateCas);
+            return EdtfDate.fromString(c.dateCas);
         }
         sortComparator(c1, c2) {
             const c1Time = this.getTime(c1);
@@ -56,7 +57,7 @@ describe("SCEAUCaseSource", () => {
                     }
                     if (publication.time) {
                         const sourceContext = context.clone();
-                        sourceContext.time = source.publication.time;
+                        sourceContext.time.date = source.publication.time;
                         const timeStr = this.timeTextBuilder.build(sourceContext);
                         sourceItems.push(timeStr);
                     }

package/dist/time/datasource/sceau/SceauRR0Mapping.d.ts

@@ -1,7 +1,13 @@
 import { SceauHttpDatasource } from "./SceauHttpDatasource.js";
 import { RR0CaseMapping } from "../rr0/index.js";
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
+import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";
+import { CityService } from "../../../org";
 export declare const sceauDatasource: SceauHttpDatasource;
-export declare const sceauRR0Mapper: SceauCaseSummaryRR0Mapper;
-export declare const sceauRR0Mapping: RR0CaseMapping<SceauCaseSummary>;
+export declare class SceauRR0Mapping implements RR0CaseMapping<SceauCaseSummary> {
+    readonly actions: ChronologyReplacerActions;
+    datasource: SceauHttpDatasource;
+    mapper: SceauCaseSummaryRR0Mapper;
+    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+}

package/dist/time/datasource/sceau/SceauRR0Mapping.js

@@ -1,11 +1,10 @@
 import { SceauHttpDatasource } from "./SceauHttpDatasource.js";
-import { cityService } from "../../../org/index.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";
 export const sceauDatasource = new SceauHttpDatasource(new URL("https://sceau-archives-ovni.org"));
-export const sceauRR0Mapper = new SceauCaseSummaryRR0Mapper(cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const sceauRR0Mapping = {
-    datasource: sceauDatasource,
-    mapper: sceauRR0Mapper,
-    actions
-};
+export class SceauRR0Mapping {
+    constructor(cityService, actions) {
+        this.actions = actions;
+        this.datasource = sceauDatasource;
+        this.mapper = new SceauCaseSummaryRR0Mapper(cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
+    }
+}

package/dist/time/datasource/ufo-search/UfoSearchCase.d.ts

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export declare enum UfoSearchCaseType {
     letter = "letter",
     researchGroup = "research group",
@@ -94,7 +94,7 @@ export type UfoSearchCaseKeyValues = {
 export interface UfoSearchCase {
     id: string;
     url?: string;
-    time: TimeContext;
+    time: EdtfDate;
     location?: string;
     desc: string;
     key_vals: UfoSearchCaseKeyValues;

package/dist/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.d.ts

@@ -1,8 +1,9 @@
 import { CaseMapper } from "../CaseMapper.js";
 import { UfoSearchCase } from "./UfoSearchCase.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
-import { NamedPlace, RR0CaseSummary } from "../rr0/index.js";
+import { RR0CaseSummary } from "../rr0/index.js";
 import { CityService } from "../../../org/index.js";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 export declare class UfoSearchCaseRR0Mapper implements CaseMapper<HtmlRR0Context, UfoSearchCase, RR0CaseSummary> {
     protected cityService: CityService;
     readonly baseUrl: string;
@@ -11,5 +12,5 @@ export declare class UfoSearchCaseRR0Mapper implements CaseMapper<HtmlRR0Context
     constructor(cityService: CityService, baseUrl: string, copyright: string, authors: string[]);
     getDescription(c: UfoSearchCase): string;
     map(context: HtmlRR0Context, sourceCase: UfoSearchCase, sourceTime: Date): RR0CaseSummary;
-    protected getPlace(context: HtmlRR0Context, placeName: string): NamedPlace;
+    protected getPlace(context: HtmlRR0Context, placeName: string): OrganizationPlace;
 }

package/dist/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.js

@@ -1,5 +1,6 @@
 import assert from "assert";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 export class UfoSearchCaseRR0Mapper {
     constructor(cityService, baseUrl, copyright, authors) {
         this.cityService = cityService;
@@ -15,13 +16,14 @@ export class UfoSearchCaseRR0Mapper {
         const authors = this.authors;
         const url = sourceCase.url;
         const title = "cas n° " + sourceCase.id;
-        const publication = { publisher: this.copyright, time: TimeContext.fromDate(sourceTime) };
+        const publication = { publisher: this.copyright, time: EdtfDate.fromDate(sourceTime) };
         const caseSource = { url, title, authors, publication, events: [], previousSourceRefs: [] };
         const placeName = sourceCase.location;
         const place = placeName ? this.getPlace(context, placeName) : undefined;
         return {
             id: sourceCase.id,
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             url,
             events: [],
             time: sourceCase.time,
@@ -33,6 +35,6 @@ export class UfoSearchCaseRR0Mapper {
     getPlace(context, placeName) {
         const org = this.cityService.find(context, placeName, undefined);
         assert.ok(org, `Could not find place "${placeName}"`);
-        return { name: org.getMessages(context).toTitle(context, org, { parent: true }), org, place: org.places[0] };
+        return new OrganizationPlace(org);
     }
 }

package/dist/time/datasource/ufo-search/UfoSearchDatasource.test.js

@@ -2,8 +2,9 @@ import { beforeEach, describe, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { ufoSearchTestCases } from "./UfoSearchTestCases.js";
-import { ufoSearchRR0Mapping } from "./UfoSearchMapping.js";
+import { UfoSearchRR0Mapping } from "./UfoSearchMapping";
 describe("UfoSearchCaseSource", () => {
+    const ufoSearchRR0Mapping = new UfoSearchRR0Mapping(rr0TestUtil.cityService, { read: ["fetch"], write: ["backup"] });
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/ufo-search/UfoSearchFileDatasource.d.ts

@@ -1,18 +1,19 @@
 import { HtmlRR0Context } from "../../../RR0Context.js";
-import { Datasource } from "../Datasource.js";
 import { UfoSearchDatasource } from "./UfoSearchDatasource.js";
 import { JsonMapper } from "../JsonMapper.js";
 import { UfoSearchCase } from "./UfoSearchCase.js";
 import { UfoSearchCaseRR0Mapper } from "./UfoSearchCaseRR0Mapper.js";
+import { FileDatasource } from "../FileDatasource";
 declare class FileMapper extends JsonMapper<UfoSearchCase> {
     protected mapper: UfoSearchCaseRR0Mapper;
     constructor(mapper: UfoSearchCaseRR0Mapper);
     parse(context: HtmlRR0Context, data: string): UfoSearchCase[];
 }
-export declare class UfoSearchFileDatasource extends UfoSearchDatasource implements Datasource<UfoSearchCase> {
+export declare class UfoSearchFileDatasource extends UfoSearchDatasource implements FileDatasource<UfoSearchCase> {
     readonly fileName: string;
     readonly fileMapper: FileMapper;
     constructor(fileName: string, mapper: UfoSearchCaseRR0Mapper);
     protected readCases(context: HtmlRR0Context): Promise<UfoSearchCase[]>;
+    save(context: HtmlRR0Context, fetched: any[], fetchTime: Date): void;
 }
 export {};

package/dist/time/datasource/ufo-search/UfoSearchFileDatasource.js

@@ -21,4 +21,7 @@ export class UfoSearchFileDatasource extends UfoSearchDatasource {
         const file = FileContents.read(this.fileName, "utf-8");
         return this.fileMapper.parse(context, file.contents);
     }
+    save(context, fetched, fetchTime) {
+        throw new Error("Not implemented");
+    }
 }

package/dist/time/datasource/ufo-search/UfoSearchHttpDatasource.js

@@ -101,7 +101,7 @@ export class UfoSearchHttpDatasource extends UfoSearchDatasource {
         let href = url.href;
         return {
             id: caseNumber,
-            time,
+            time: time.date,
             url: href,
             location,
             desc: type,

package/dist/time/datasource/ufo-search/UfoSearchMapping.d.ts

@@ -2,11 +2,14 @@ import { UfoSearchHttpDatasource } from "./UfoSearchHttpDatasource.js";
 import { UfoSearchFileDatasource } from "./UfoSearchFileDatasource.js";
 import { UfoSearchCaseRR0Mapper } from "./UfoSearchCaseRR0Mapper.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
+import { RR0CaseMapping } from "../rr0";
+import { UfoSearchCase } from "./UfoSearchCase";
+import { CityService } from "../../../org";
 export declare const ufoSearchHttpDatasource: UfoSearchHttpDatasource;
-export declare const ufoSearchCaseRR0Mapper: UfoSearchCaseRR0Mapper;
-export declare const ufoSearchFileDatasource: UfoSearchFileDatasource;
-export declare const ufoSearchRR0Mapping: {
+export declare class UfoSearchRR0Mapping implements RR0CaseMapping<UfoSearchCase> {
+    readonly actions: ChronologyReplacerActions;
     datasource: UfoSearchHttpDatasource;
+    backupDatasource: UfoSearchFileDatasource;
     mapper: UfoSearchCaseRR0Mapper;
-    actions: ChronologyReplacerActions;
-};
+    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+}

package/dist/time/datasource/ufo-search/UfoSearchMapping.js

@@ -1,9 +1,12 @@
 import { UfoSearchHttpDatasource } from "./UfoSearchHttpDatasource.js";
 import { UfoSearchFileDatasource } from "./UfoSearchFileDatasource.js";
 import { UfoSearchCaseRR0Mapper } from "./UfoSearchCaseRR0Mapper.js";
-import { cityService } from "../../../org/index.js";
 export const ufoSearchHttpDatasource = new UfoSearchHttpDatasource("https://www.ufo-search.com", "timeline/search.html");
-export const ufoSearchCaseRR0Mapper = new UfoSearchCaseRR0Mapper(cityService, ufoSearchHttpDatasource.baseUrl, ufoSearchHttpDatasource.copyright, ufoSearchHttpDatasource.authors);
-export const ufoSearchFileDatasource = new UfoSearchFileDatasource("time/datasource/ufo-search/majestic.json", ufoSearchCaseRR0Mapper);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const ufoSearchRR0Mapping = { datasource: ufoSearchHttpDatasource, mapper: ufoSearchCaseRR0Mapper, actions };
+export class UfoSearchRR0Mapping {
+    constructor(cityService, actions) {
+        this.actions = actions;
+        this.datasource = ufoSearchHttpDatasource;
+        this.mapper = new UfoSearchCaseRR0Mapper(cityService, ufoSearchHttpDatasource.baseUrl, ufoSearchHttpDatasource.copyright, ufoSearchHttpDatasource.authors);
+        this.backupDatasource = new UfoSearchFileDatasource("time/datasource/ufo-search/majestic.json", this.mapper);
+    }
+}

package/dist/time/datasource/ufo-search/UfoSearchTestCases.js

@@ -1,9 +1,9 @@
 import { UfoSearchCaseType } from "./UfoSearchCase.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export const ufoSearchTestCases = [
     {
         id: "979AEFAA",
-        time: new TimeContext(0),
+        time: new EdtfDate({ year: 0 }),
         desc: "Greek and Roman records of UFO's",
         key_vals: {
             url: `<a href="timeline.html#979AEFAA">0's #0</a>`
@@ -16,7 +16,7 @@ export const ufoSearchTestCases = [
     },
     {
         id: "F91D10A9",
-        time: new TimeContext(34, 4),
+        time: new EdtfDate({ year: 34, month: 4 }),
         desc: "A white, round object, accompanied by 10 small stars, flew overhead. The pattern suggests the stars might have been in formation with the main object, making it an unusual possible meteor event.",
         key_vals: {
             url: `<a href="timeline.html#F91D10A9">4/34 #1</a>`

package/dist/time/datasource/urecat/UrecatCase.d.ts

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export type UrecatCaseHistoryRedaction = {
     mainAuthor: string;
     contributors: string;
@@ -37,7 +37,7 @@ export type UrecatBasicBaseInfo = {
      * "URECAT-000448"
      */
     caseNumber?: string;
-    sightingDate: TimeContext;
+    sightingDate: EdtfDate;
     firstReportTime?: Date | string;
     reportDelay?: string;
     testimonyOrigin?: string;
@@ -109,7 +109,7 @@ export type UrecatCaseIssue = {
 };
 export interface UrecatCase {
     id: string;
-    time: TimeContext;
+    time: EdtfDate;
     url: string;
     title: string;
     summary?: string;

package/dist/time/datasource/urecat/UrecatDatasource.test.js

@@ -1,9 +1,10 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
-import { urecatRR0Mapping } from "./UrecatRR0Mapping.js";
 import { urecatTestCases } from "./UrecatTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
+import { UrecatRR0Mapping } from "./UrecatRR0Mapping";
 describe("UrecatCaseSource", () => {
+    const urecatRR0Mapping = new UrecatRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.countryService, { read: ["fetch"], write: ["backup"] });
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/urecat/UrecatHttpDatasource.js

@@ -4,6 +4,7 @@ import { ObjectUtil, UrlUtil } from "../../../util/index.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { MessageUtils } from "../../../lang/index.js";
 import { UrecatDatasource } from "./UrecatDatasource.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export class UrecatHttpDatasource extends UrecatDatasource {
     constructor(baseUrl, searchPath = "ce3") {
         super(["Gross, Patrick"], "URECAT");
@@ -89,16 +90,14 @@ export class UrecatHttpDatasource extends UrecatDatasource {
         const timeStr = caseLink.pathname.substring(this.searchPath.length + 2);
         const dateFields = UrecatHttpDatasource.urlDateFormat.exec(timeStr);
         const itemContext = context.clone();
-        const dateTime = itemContext.time;
-        dateTime.setYear(parseInt(dateFields[1], 10));
+        const timeContext = itemContext.time;
         const monthField = dateFields[2];
-        if (monthField) {
-            dateTime.setMonth(parseInt(monthField, 10));
-            const dayOfMonth = dateFields[3];
-            if (dayOfMonth) {
-                dateTime.setDayOfMonth(dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined);
-            }
-        }
+        const dayOfMonth = dateFields[3];
+        timeContext.date = new EdtfDate({
+            year: parseInt(dateFields[1], 10),
+            month: monthField ? parseInt(monthField, 10) : undefined,
+            day: dayOfMonth ? dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined : undefined
+        });
         return itemContext;
     }
     getLink(linkCol) {
@@ -118,7 +117,7 @@ export class UrecatHttpDatasource extends UrecatDatasource {
             hour: "2-digit",
             minute: "2-digit"
         });
-        const sightingDate = caseContext.time;
+        const sightingDate = caseContext.time.date;
         const countStr = ObjectUtil.keyFromValue(UrecatHttpDatasource.wordToCount, witnesses.length);
         const title = `${timeStr}, ${placeName}, ${departmentOrState}, ${country}, ${countStr} ${MessageUtils.pluralWord(witnesses.length, "personne")}`.toUpperCase();
         const id = url.pathname.substring(this.searchPath.length + 2);

package/dist/time/datasource/urecat/UrecatRR0Mapper.js

@@ -1,5 +1,6 @@
 import assert from "assert";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 export class UrecatRR0Mapper {
     constructor(cityService, countryService, baseUrl, copyright, authors) {
         this.cityService = cityService;
@@ -16,7 +17,7 @@ export class UrecatRR0Mapper {
         const caseSource = {
             events: [], previousSourceRefs: [],
             url: sourceCase.url, title: "cas n° " + sourceCase.id, authors: this.authors,
-            publication: { publisher: this.copyright, time: TimeContext.fromDate(sourceTime) }
+            publication: { publisher: this.copyright, time: EdtfDate.fromDate(sourceTime) }
         };
         const location = sourceCase.basicInfo.base.location;
         let sourceCountry = location.country;
@@ -31,9 +32,10 @@ export class UrecatRR0Mapper {
         const placeName = placeItems[1];
         const city = this.cityService.find(context, placeName, undefined);
         assert.ok(city, `Could not find city of name "${placeName}" in state "${location.departmentOrState}" of country "${sourceCountry}"`);
-        const place = { name: city.getTitle(context), place: city.places[0] };
+        const place = new OrganizationPlace(city);
         return {
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             id: sourceCase.id,
             url: sourceCase.url,
             events: [],

package/dist/time/datasource/urecat/UrecatRR0Mapping.d.ts

@@ -1,10 +1,13 @@
 import { UrecatRR0Mapper } from "./UrecatRR0Mapper.js";
 import { UrecatHttpDatasource } from "./UrecatHttpDatasource.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
+import { RR0CaseMapping } from "../rr0";
+import { UrecatCase } from "./UrecatCase";
+import { CityService, CountryService } from "../../../org";
 export declare const urecatDatasource: UrecatHttpDatasource;
-export declare const urecatRR0Mapper: UrecatRR0Mapper;
-export declare const urecatRR0Mapping: {
+export declare class UrecatRR0Mapping implements RR0CaseMapping<UrecatCase> {
+    readonly actions: ChronologyReplacerActions;
     datasource: UrecatHttpDatasource;
     mapper: UrecatRR0Mapper;
-    actions: ChronologyReplacerActions;
-};
+    constructor(cityService: CityService, countryService: CountryService, actions: ChronologyReplacerActions);
+}

package/dist/time/datasource/urecat/UrecatRR0Mapping.js

@@ -1,8 +1,10 @@
 import { UrecatRR0Mapper } from "./UrecatRR0Mapper.js";
 import { UrecatHttpDatasource } from "./UrecatHttpDatasource.js";
-import { cityService } from "../../../org/Cities.js";
-import { countryService } from "../../../org/country/CountryService.js";
 export const urecatDatasource = new UrecatHttpDatasource(new URL("https://ufologie.patrickgross.org"), "ce3");
-export const urecatRR0Mapper = new UrecatRR0Mapper(cityService, countryService, urecatDatasource.baseUrl, urecatDatasource.copyright, urecatDatasource.authors);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const urecatRR0Mapping = { datasource: urecatDatasource, mapper: urecatRR0Mapper, actions };
+export class UrecatRR0Mapping {
+    constructor(cityService, countryService, actions) {
+        this.actions = actions;
+        this.datasource = urecatDatasource;
+        this.mapper = new UrecatRR0Mapper(cityService, countryService, urecatDatasource.baseUrl, urecatDatasource.copyright, urecatDatasource.authors);
+    }
+}

package/dist/time/datasource/urecat/UrecatTestCases.js

@@ -1,17 +1,17 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { rr0TestUtil } from "../../../test/index.js";
 const noWeekdayOptions = { ...rr0TestUtil.intlOptions };
 noWeekdayOptions.weekday = undefined;
 export const urecatTestCases = [
     {
         id: "1977-03-12-nzealand-gisbornef.htm",
-        time: new TimeContext(1977, 3, 12),
+        time: new EdtfDate({ year: 1977, month: 3, day: 12 }),
         url: "https://ufologie.patrickgross.org/ce3/1977-03-12-nzealand-gisbornef.htm",
         // title: "12 MARS 1977, GISBORNE, GISBORNE DISTRICT COUNCIL, NOUVELLE ZELANDE, TROIS FEMMES",
         title: "12 MARS 1977, GISBORNE, GISBORNE DISTRICT COUNCIL, NOUVELLE ZÉLANDE, TROIS PERSONNES",
         basicInfo: {
             base: {
-                sightingDate: new TimeContext(1977, 3, 12),
+                sightingDate: new EdtfDate({ year: 1977, month: 3, day: 12 }),
                 location: {
                     placeName: "Gisborne",
                     country: "Nouvelle Zélande",
@@ -27,13 +27,13 @@ export const urecatTestCases = [
     },
     {
         id: "1977-03-04-canada-sundownf.htm",
-        time: new TimeContext(1977, 3, 4),
+        time: new EdtfDate({ year: 1977, month: 3, day: 4 }),
         url: "https://ufologie.patrickgross.org/ce3/1977-03-04-canada-sundownf.htm",
         //    title: "4 MARS 1977, SUNDOWN, MANITOBA, CANADA, UN HOMME",
         title: "4 MARS 1977, SUNDOWN, MANITOBA, CANADA, UNE PERSONNE",
         basicInfo: {
             base: {
-                sightingDate: new TimeContext(1977, 3, 4),
+                sightingDate: new EdtfDate({ year: 1977, month: 3, day: 4 }),
                 location: {
                     placeName: "Sundown",
                     country: "Canada",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.1.24",
+  "version": "0.2.0",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,19 +20,19 @@
   ],
   "scripts": {
     "prebuild": "npm install",
+    "preview": "vite preview --host",
     "build": "rm -Rf dist && tsc --project tsconfig.prod.json",
     "prepublishOnly": "npm run build",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/RR0Context.test.ts",
+    "test-one": "rm -Rf out && tsx src/time/datasource/CsvMapper.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
-    "@googlemaps/google-maps-services-js": "^3.4.0",
     "@rr0/common": "^1.1.3",
     "@rr0/lang": "^0.1.12",
-    "@rr0/time": "^0.8.5",
-    "@rr0/place": "^0.3.2",
-    "@rr0/data": "^0.1.2",
+    "@rr0/time": "^0.9.1",
+    "@rr0/place": "^0.5.0",
+    "@rr0/data": "^0.2.0",
     "@javarome/fileutil": "^0.3.6",
     "ssg-api": "^1.16.12",
     "canvas": "^2.11.2",
@@ -47,7 +47,8 @@
     "typescript": "^5.6.3",
     "@types/node": "^22.7.4",
     "tsx": "4.17.0",
-    "@javarome/testscript": "^0.13.1"
+    "@javarome/testscript": "^0.13.1",
+    "vite": "^6.1.0"
   },
   "keywords": [
     "cms",

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

@@ -1,3 +0,0 @@
-import { Place } from "../../../../place/Place.js";
-import { Organization } from "../../../Organization.js";
-export declare function franceCity(code: number, place: Place): Organization;

package/dist/org/eu/fr/region/FranceCity.js

@@ -1,9 +0,0 @@
-import { departmentService } from "../../../country/region/department/DepartmentService.js";
-import assert from "assert";
-import { City } from "../../../country/index.js";
-export function franceCity(code, place) {
-    const depCode = String(Math.floor(code / 1000)).padStart(2, "0");
-    const dep = departmentService.get(depCode, undefined);
-    assert.ok(dep, `Could not find department with code "${code}"`);
-    return City.create(String(code), dep, place);
-}

package/dist/org/eu/fr/region/idf/75/ParisCities.js

@@ -1,4 +0,0 @@
-import { paris75 } from "./paris/Paris.js";
-export const parisCities = [
-    paris75
-];

package/dist/org/eu/fr/region/idf/75/ParisMessages.js

@@ -1,7 +0,0 @@
-import { ParisCityCode } from "./ParisCityCode.js";
-import { paris75Messages } from "./paris/ParisMessages.js";
-import { DepartmentMessages } from "../../../../../country/region/department/DepartmentMessages.js";
-const parisCityMessages = {
-    [ParisCityCode.Paris]: paris75Messages
-};
-export const parisMessages = DepartmentMessages.create("Paris", parisCityMessages);

package/dist/org/eu/fr/region/naq/64/Magne/Magne.d.ts

@@ -1 +0,0 @@
-export declare const magne: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;

package/dist/org/eu/fr/region/naq/64/Magne/Magne.js

@@ -1,4 +0,0 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
-import { PyreneesAtlantiquesCityCode } from "../PyreneesAtlantiquesCityCode.js";
-export const magne = franceCity(PyreneesAtlantiquesCityCode.Magne, Place.fromDMS("46° 21′ 28″N, 0° 23′ 37″E"));

package/dist/org/eu/fr/region/naq/86/Magne/Magne.d.ts

@@ -1 +0,0 @@
-export declare const magne: import("../../../../../../Organization.js").Organization<import("../../../../../../OrganizationMessages.js").OrganizationMessages>;

package/dist/org/eu/fr/region/naq/86/Magne/Magne.js

@@ -1,4 +0,0 @@
-import { franceCity } from "../../../FranceCity.js";
-import { Place } from "../../../../../../../place/index.js";
-import { VienneCityCode } from "../VienneCityCode.js";
-export const magne = franceCity(VienneCityCode.Magne, Place.fromDMS("46° 21′ 28″N, 0° 23′ 37″E"));

package/dist/place/GooglePlaceService.d.ts

@@ -1,13 +0,0 @@
-import { Elevation } from "./Place.js";
-import { PlaceService } from "./PlaceService.js";
-import { PlaceLocation } from "@rr0/place";
-export declare class GooglePlaceService extends PlaceService {
-    protected apiKey: string;
-    private readonly client;
-    constructor(rootDir: string, apiKey: string);
-    protected getElevation(location: PlaceLocation): Promise<Elevation | undefined>;
-    protected geocode(address: string): Promise<{
-        location: PlaceLocation;
-        data: any;
-    } | undefined>;
-}